GitHub
87e0c403
Combat System - Critter/CritterSO scripts refactor using state machine capabilities and adding config SO ( #325 )
* Critter refactor using state machine capabilities and adding config SO
* Fixes following DeivSky's review
* Optimized NavMeshAgent null check
* Added abstractions between Critter script and ConfigSO
* Corrections following Amel review
* Split transition tables - move to fsm chasing and roaming settings
* Fixes on transition table
4 年前
GitHub
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
4 年前
Yohann Puyhaubert
a5261cf1
Combat System - Added player getting hit and killed states
4 年前
Smurjo
df03afb9
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
4 年前
Ciro Continisio
1690f35f
PigChef jump fixes, particles on jump liftoff
4 年前
Yohann Puyhaubert
ed7d963f
Added Player Cane Hit variant and enabling attack based on animation events
4 年前
Ciro Continisio
3d4ab5fa
Merge branch 'feature/combat-player-get-hit' of https://github.com/treivize/open-project-1 into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
# UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab
# UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab
4 年前
Ciro Continisio
7ea6bfdf
Merge branch 'feature/player-cane-hit-anim-variant' of https://github.com/treivize/open-project-1 into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_False_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_True_OnEnter.asset.meta
4 年前
Ciro Continisio
28d4d3bb
Attack system overhaul
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
Yohann Puyhaubert
bf1a236b
Added pathway NPC movement strategy
4 年前
Yohann Puyhaubert
023c872d
Push missing FSM updates
4 年前
Amel Negra
67e5ce82
Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
GitHub
0e084a6f
[Bugfix] New condition prevents Critter from attacking when dialogue on ( #420 )
* New condition prevents Critter from attacking when dialogue on
* Remove test temp clutter
* Undo changes to testing ground
4 年前
uChema
6ddc6d14
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
4 年前
Amel Negra
c094f333
Merge branch 'main' into AmelMain
4 年前
Amel Negra
d77d34d4
Now we have 2 face protagonist actions specific to NPC and critters
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
bf0ea70e
Fixed plant critter attack rotation
4 年前
Amel
a42be588
Moving slime critter specific actions and states in separate folders
3 年前
Amel
1ab16620
Adding new snooze state with its actions and conditions for rock critter
3 年前
Amel
73a43775
Critters state machines adjustments
3 年前
Amel
9be5ccca
Removed unneeded transition from slime critter state machine
3 年前
uChema
ad0bf614
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
6bf9cfe1
Merge remote-tracking branch 'tech-mkt/main'
3 年前
Ciro Continisio
47ed0d6a
Merge branch 'main' into worldbuilding
3 年前
GitHub
9fd51f47
Add camera shake on protagonist hit. ( #454 )
* Add camera shake on protagonist hit.
* add cam shake on critters hit
3 年前
uChema
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
uChema
d7205d06
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
3 年前
Ciro Continisio
056f6536
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_1.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_2.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_4.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Ayud.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.pr...
3 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
Amel Negra
f6c9e887
Rock critter snooze state tweaking after animation integration
3 年前
uChema
3faf99a1
Use the state machine to change Game State to and from Combat
3 年前
Greg Solo
73b4e5d8
Set game to combat state when critter detects player
4 年前
uChema
1d6b8128
Use Game States In State Machine
3 年前
uChema
1ce93bca
Small fixes in Game State System
3 年前
uChema
0a1c31a0
Add healthbar
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 年前
uChema
0e1137be
Adding Icons + New Interaction system
3 年前
Ciro Continisio
6b104b55
Mega code cleanup
3 年前
Ciro Continisio
8bfcef97
StateAction and StateMachine improvements
Added a description to StateMachine's StateAction SOs
State Machine editor now displays descriptions for StateActions
Reorganised Protagonist's StateActions into folders
3 年前