treivize
|
bb0dafff
|
Added Slime Critter and new Toon shader to add Fresnel effect on it
|
4 年前 |
treivize
|
d21bf195
|
Fix prefabs and FBX import
|
4 年前 |
Ciro Continisio
|
648aa035
|
First setup
|
4 年前 |
Dan Young
|
268ab82e
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
4 年前 |
Amel Negra
|
370a7993
|
Merge remote-tracking branch 'origin/main' into interaction
|
4 年前 |
Dan Young
|
7ce66d74
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
4 年前 |
Amel Negra
|
a3fdb227
|
Merge branch 'main' into whiteboxing
|
4 年前 |
lpchow
|
9946260e
|
Add anims for slimecritter, create animcontroller, update its prefab with latest rig
|
4 年前 |
GitHub
|
d0298f3d
|
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
|
4 年前 |
Ciro Continisio
|
1cd999fc
|
Merge branch 'art-assets' of https://github.com/lpchow/open-project-1 into pr-bash
|
4 年前 |
Ciro Continisio
|
9429e445
|
Imported SlimeCritter animations
|
4 年前 |
Ciro Continisio
|
49f39298
|
Imported new animations
|
4 年前 |
Ciro Continisio
|
6e1104f0
|
Merge branch 'pr-bash' into main
|
4 年前 |
uChema
|
c28d9833
|
Merge branch 'main' into QuestSystem
|
4 年前 |
Dan Young
|
eb670224
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
4 年前 |
GitHub
|
faf70fc8
|
Slime critter propel attack (#315)
|
4 年前 |
Ciro Continisio
|
c691552b
|
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
|
4 年前 |
Dane Byrd
|
c6beedc4
|
Merge branch 'art-assets' into ground_shader
|
4 年前 |
uChema
|
0f397e96
|
Merge branch 'main' into QuestSystem
|
4 年前 |
Yohann Puyhaubert
|
ed7d963f
|
Added Player Cane Hit variant and enabling attack based on animation events
|
4 年前 |
Ciro Continisio
|
7ea6bfdf
|
Merge branch 'feature/player-cane-hit-anim-variant' of https://github.com/treivize/open-project-1 into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_False_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_True_OnEnter.asset.meta
|
4 年前 |
uChema
|
7ece782e
|
Merge branch 'main' into QuestSystem
|
4 年前 |
GitHub
|
b5417125
|
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
|
4 年前 |
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
4 年前 |
Amel Negra
|
6bb088d5
|
Attack animation works
|
3 年前 |
Amel Negra
|
348c8c14
|
Merge branch 'AmelMain' into main
|
3 年前 |
uChema
|
c24dd21f
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
Amel
|
2897f987
|
Added revive trigger for Animator Controller to fit snooze state for Rock Critter
|
3 年前 |
Amel
|
73a43775
|
Critters state machines adjustments
|
3 年前 |
Amel
|
901da185
|
Renaming critter states to fit both slime and rock critters
|
3 年前 |
uChema
|
ad0bf614
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
Ciro Continisio
|
6bf9cfe1
|
Merge remote-tracking branch 'tech-mkt/main'
|
3 年前 |
Ciro Continisio
|
47ed0d6a
|
Merge branch 'main' into worldbuilding
|
3 年前 |
Amel
|
973f4804
|
Adding audio events to slime critter fbx
|
3 年前 |
Amel Negra
|
7654f9e8
|
Merge remote-tracking branch 'amel-unity/main' into main
|
3 年前 |
uChema
|
d0523373
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
Ciro Continisio
|
85c5bf58
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
|
3 年前 |