Ciro Continisio
|
bbca6fd1
|
Imported rigged Phoenix Chick + 2 animations
|
4 年前 |
Ciro Continisio
|
b5de134f
|
New art demo scene
|
4 年前 |
treivize
|
0728a4c6
|
Merge branch 'art-assets' into feature/art/pant_critter
|
4 年前 |
GitHub
|
14e737cc
|
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
|
4 年前 |
treivize
|
df2ab2a2
|
Merge branch 'art-assets' into feature/art/slime_critter
|
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
|
8d75ed88
|
Phoenix Chick Animator Controller
|
4 年前 |
Amel Negra
|
0b4f451f
|
Merge branch 'AmelMain' into main
|
4 年前 |
uChema
|
aa88e701
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
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
|
4 年前 |
Amel Negra
|
cdba81f2
|
Pushing animations, ACs and prefabs tweaked for cutscenes
|
4 年前 |
Ciro Continisio
|
984180df
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/61ff26a351934...
|
4 年前 |
Amel Negra
|
42e6bd08
|
Adding phoenix chick nibbling and sneezing animations
|
3 年前 |
uChema
|
dc07bb35
|
Merge remote-tracking branch 'upstream/main' into main
|
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 年前 |