Ciro Continisio
|
443b4a6c
|
New FryKing animations and prefab
|
4 年前 |
|
Ciro Continisio
|
e7b2e446
|
New art assets
|
4 年前 |
|
Ciro Continisio
|
1645ed7d
|
Added BardHare and FryKing animations
|
4 年前 |
Amel Negra
|
c444c501
|
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
|
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 年前 |
|
Ciro Continisio
|
01f30d5a
|
Imported animations and art
|
4 年前 |
GitHub
|
762d050f
|
Merge pull request #6 from UnityTechnologies/main
Updating my branch
|
4 年前 |
Smurjo
|
df03afb9
|
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
|
4 年前 |
|
uChema
|
7ece782e
|
Merge branch 'main' into QuestSystem
|
4 年前 |
|
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
4 年前 |
|
Amel Negra
|
ef760f6d
|
Fry King Animator controller done
|
3 年前 |
|
Amel Negra
|
0b4f451f
|
Merge branch 'AmelMain' into main
|
3 年前 |
|
uChema
|
aa88e701
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Ciro Continisio
|
72d88c0d
|
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/AddressableAssetsData/OSX/addressables_content_state.bin.meta
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity.meta
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
# UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta
|
3 年前 |
|
Amel Negra
|
50f5eeab
|
Adding animation events for audio
|
3 年前 |
Amel
|
29cb354f
|
Legendary Chef now talk as long as the animation plays
|
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 年前 |
|
uChema
|
eab4c107
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Amel
|
c426ce61
|
Keeping only one event called for sfx during talk animations
|
3 年前 |
|
uChema
|
dc07bb35
|
Merge remote-tracking branch 'upstream/main' into main
|
3 年前 |
|
Ciro Continisio
|
c62d8542
|
Renamed all FryKing assets to LegendaryChef
|
3 年前 |
