Ciro Continisio
|
0bcdfe44
|
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
|
4 年前 |
|
Ciro Continisio
|
e7bdd126
|
[Bot] Automated dotnet-format update
|
4 年前 |
|
Ciro Continisio
|
8329a39a
|
Removed meta
|
4 年前 |
|
Ciro Continisio
|
cd97a760
|
Removed warnings
|
4 年前 |
|
Ciro Continisio
|
3e2ad7f2
|
Integrated dust particles
|
4 年前 |
|
Ciro Continisio
|
9c929491
|
Merge branch 'main' of https://github.com/erizzoalbuquerque/open-project-1 into pr-bashing
|
4 年前 |
|
Ciro Continisio
|
12f2649c
|
Talk animation re-implemented
|
4 年前 |
|
Ciro Continisio
|
ee1d998c
|
AnimatorParameterActionSO and refactoring
|
4 年前 |
|
Ciro Continisio
|
7afb5af0
|
StateMachine serialisation fix
|
4 年前 |
|
Ciro Continisio
|
72550bc5
|
Merge branch 'add-sliding-to-jump-descending-transition' of https://github.com/mtakac/open-project-1 into pr-bashing
# Conflicts:
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Idle.asset
|
4 年前 |
kgc00
|
bd56bebf
|
removed call to base.onenter in CC button to simplify selection logic
|
4 年前 |
rainaldisatria
|
a0293eb3
|
Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system
|
4 年前 |
Zakhar Ipatov
|
badd647a
|
Editor window event fix
|
4 年前 |
|
Ciro Continisio
|
58d65aa2
|
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
|
4 年前 |
|
kgc00
|
a23c841c
|
updated readme
|
4 年前 |
|
rainaldisatria
|
f7791e6d
|
Update BranchingExamples.unity
|
4 年前 |
|
Ciro Continisio
|
7f5780ce
|
[Bot] Automated dotnet-format update
|
4 年前 |
|
kgc00
|
8c299774
|
menu prefab into scene
|
4 年前 |
|
rainaldisatria
|
430d537b
|
Update InputReader.cs to safely invoke the event
|
4 年前 |
Chema Damak
|
9bfb88e2
|
[Bot] Automated dotnet-format update
|
4 年前 |
|
Ciro Continisio
|
3db2e782
|
Added the ability to talk
|
4 年前 |
|
kgc00
|
20efc354
|
readme
|
4 年前 |
|
rainaldisatria
|
85be34a1
|
Update DialogueManager.cs to support showing DialogueData and branching
|
4 年前 |
|
Chema Damak
|
3aaa37cc
|
Add UI system, Inventory UI and update Inventory System
|
4 年前 |
Marek Takac
|
c91c9d5b
|
Added Sliding to JumpDescending protagonist transition
|
4 年前 |
|
Ciro Continisio
|
383e85b3
|
Renamed variable in all Conditions and Actions
|
4 年前 |
|
kgc00
|
46aadc33
|
removed action asset reference in event system on prefab
|
4 年前 |
|
rainaldisatria
|
b0513472
|
Adjust DialogueManager.cs to support branching
|
4 年前 |
|
Chema Damak
|
464fd3cf
|
Merge branch 'pr/130' into Inventory
|
4 年前 |
|
Chema Damak
|
d9519898
|
[Bot] Automated dotnet-format update
|
4 年前 |
|
Ciro Continisio
|
7be88cca
|
Removed script Character, moved StateMachine SOs
|
4 年前 |
|
kgc00
|
c1a6983d
|
merged in main, added menu prefab to asset database
|
4 年前 |
|
rainaldisatria
|
d74551dd
|
Create DialogueTrigger.cs
|
4 年前 |
treivize
|
e9e05bd8
|
Updated Alert animation and clean up branch
|
4 年前 |
|
Chema Damak
|
093779d0
|
Fix cutscenes
|
4 年前 |
andytouch
|
6da421fe
|
Art: Added RandomPositionTint Shader Graph.
|
4 年前 |
|
Ciro Continisio
|
d14b0e45
|
Cleanup
|
4 年前 |
|
kgc00
|
7b04a609
|
Merge branch 'main' into simple-menu-controls
|
4 年前 |
|
rainaldisatria
|
8df7066a
|
Move and rename example scene name
|
4 年前 |
|
treivize
|
896fc63a
|
Removed eyes from Plant Critter and set up a proper animator
|
4 年前 |
|
treivize
|
ec0e4787
|
Fixed Slime inner movement to be Object UV based and clamp direct specular
|
4 年前 |
|
Chema Damak
|
597b3f7b
|
Merge branch 'localization' into main
|
4 年前 |
|
andytouch
|
a397d578
|
Art: Added Detail Masks for Main Characters. Added DetailMaskTint Shader Graph.
|
4 年前 |
|
Ciro Continisio
|
77c86ba9
|
Merge remote-tracking branch 'tech-mkt/state-machine-improvements' into main
|
4 年前 |
|
kgc00
|
253b73a3
|
Merge remote-tracking branch 'upstream/main' into main
|
4 年前 |
|
rainaldisatria
|
0ec96c10
|
Create choice button prefab
|
4 年前 |
|
treivize
|
93d46d23
|
Added spawning, injured and faint animations to plant critter
|
4 年前 |
|
treivize
|
d21bf195
|
Fix prefabs and FBX import
|
4 年前 |
|
Ciro Continisio
|
1c3786bc
|
[Bot] Automated dotnet-format update
|
4 年前 |
|
rainaldisatria
|
40613066
|
Push more uncommited changes
|
4 年前 |
