Ciro Continisio
|
1645ed7d
|
Added BardHare and FryKing 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 年前 |
Ciro Continisio
|
5ca74ffe
|
Beach and Glade midboxing
|
4 年前 |
Ciro Continisio
|
a30ece4a
|
Merge branch 'pr-bash' into art-assets
|
4 年前 |
GitHub
|
81481d8b
|
Merge pull request #4 from UnityTechnologies/main
update my local branch
|
4 年前 |
Ciro Continisio
|
01f30d5a
|
Imported animations and art
|
4 年前 |
Ciro Continisio
|
e633636d
|
More animations
|
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 年前 |
Ciro Continisio
|
ff1bfdd1
|
Imported new animations
|
4 年前 |
Yohann Puyhaubert
|
0b3da4fa
|
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
|
4 年前 |
Ciro Continisio
|
475acb43
|
Revised animations
|
4 年前 |
Ciro Continisio
|
16e743f5
|
Merge remote-tracking branch 'tech-mkt/main' into main
|
4 年前 |
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
4 年前 |
Amel
|
7b1ed2b2
|
Merge branch 'main' into UI
|
4 年前 |
Amel Negra
|
f71fd525
|
wip bard hare animator
|
4 年前 |
Amel Negra
|
b770e356
|
bard hare animator controller
|
4 年前 |
Amel Negra
|
21715b8e
|
bard hare animator controller
|
4 年前 |
Amel
|
30038c42
|
Bard hare Animator controller and Prefab update
|
4 年前 |
Amel
|
811a6012
|
Bard hare state machine wip
|
4 年前 |
Amel Negra
|
ce10fdea
|
Bard hare state machine working
|
4 年前 |
Amel Negra
|
8ff69edb
|
Bard hare animator controller tweaking
|
4 年前 |
uChema
|
127bd54d
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Ciro Continisio
|
350159af
|
Merge branch 'main' into whiteboxing
|
4 年前 |
Amel Negra
|
a83290a1
|
Bard Hare Animator Controller separating jump up and down from talk
|
4 年前 |
uChema
|
75076141
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Ciro Continisio
|
e6dcfc27
|
Merge branch 'main' into whiteboxing
|
4 年前 |
Amel Negra
|
50f5eeab
|
Adding animation events for audio
|
3 年前 |
Amel
|
050b37e4
|
Updating bard hare with sing short and long sfx SOs and updated FBXs
|
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 年前 |
Ciro Continisio
|
d2ffcb9e
|
Added IK and new animations for BardHare
Adeed IK to the legs
Created new Sing_Sitting and Sing_Sitting2 sing variations
Created a new Listening animation starting from a talk one
|
3 年前 |
uChema
|
b768a7dc
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
Amel Negra
|
cdba81f2
|
Pushing animations, ACs and prefabs tweaked for cutscenes
|
3 年前 |
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...
|
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
|
b74f3140
|
More Runtime Anchor refactoring, other SO additions
Also fixed bug with RuntimeAnchors
Fixed BardHare state machine (error on Animator parameter)
|
3 年前 |