Ciro Continisio
|
c28c6bc6
|
New Pig and RockCritter 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 年前 |
|
Ciro Continisio
|
c691552b
|
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
|
4 年前 |
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
4 年前 |
Amel Negra
|
203ad8de
|
Renamed ''idle 2'' RockCritter animation to ''Alert ''
|
4 年前 |
|
uChema
|
167ca847
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
|
Amel Negra
|
ddcc378c
|
Merge branch 'main' into AmelMain
|
4 年前 |
|
Amel Negra
|
abfb3081
|
Rock Critter Animator Override Controller
|
4 年前 |
|
Amel Negra
|
db4289a0
|
removing old rock critter controller
|
4 年前 |
|
Amel Negra
|
5552969c
|
adding attack in place anim to test for rock critter
|
4 年前 |
|
Amel Negra
|
a1965f75
|
added events to attack anim
|
4 年前 |
|
Amel Negra
|
4d800711
|
replace with new attack anim on rock critter override controller
|
4 年前 |
|
Amel Negra
|
99871ed8
|
temporarily using the idle animation for the rock critter faint
|
4 年前 |
|
Amel Negra
|
0f2334d3
|
removing broken attack in place anim
|
4 年前 |
|
Amel Negra
|
6bb088d5
|
Attack animation works
|
4 年前 |
|
Amel Negra
|
348c8c14
|
Merge branch 'AmelMain' into main
|
4 年前 |
|
uChema
|
c24dd21f
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
|
Amel Negra
|
c0a90df6
|
Rock critter keeps walk animation on alert
|
4 年前 |
|
uChema
|
52a617fe
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Amel
|
90c6c12d
|
Adding attack event for rock critter on animation (not fbx) since it's made in Unity
|
3 年前 |
|
Amel
|
681e36ce
|
Adding audio events to fbxs on rock critter
|
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 年前 |
|
Amel Negra
|
e611f40c
|
Adding rock critter snooze animation
|
3 年前 |
|
Amel Negra
|
f6c9e887
|
Rock critter snooze state tweaking after animation integration
|
3 年前 |
|
GitHub
|
c0237ad9
|
Merge branch 'UnityTechnologies:main' into main
|
3 年前 |
|
uChema
|
378fc807
|
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
|
3 年前 |
