Ciro Continisio
3d347e8f
Slime droplets adjustments
4 年前
Ciro Continisio
19c74b30
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
761001e0
Merge branch 'art/slime-critter-droplet' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
28d4d3bb
Attack system overhaul
4 年前
Ciro Continisio
5ad8ad04
Cameramanager fix
4 年前
Ciro Continisio
277b6fc2
Merge branch 'main' of https://github.com/vjs22334/open-project-1 into pr-bash
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 年前
vjs22334
53886896
Removed _spawnDistanceFromPlayer
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 年前
vjs22334
7cbd38cc
added field for camera spawn distance from player
4 年前
Ciro Continisio
b7e86dc9
Merge branch 'main' of https://github.com/AlexandreGheraibia/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/Pig/Interaction.prefab
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
4 年前
vjs22334
7b32be0f
fixed vcam lerp on loading new location
4 年前
Ciro Continisio
0d4b9d8a
Refactoring, moved items
4 年前
Ciro Continisio
c0c06250
Merge branch 'minor-sm-changes' of https://github.com/DeivSky/open-project-1 into pr-bash
4 年前
Ciro Continisio
e85967c7
Refined PigChef walk animation
4 年前
Ciro Continisio
4557ca49
Merge branch 'bugfix/water-crispy-white-outline' of https://github.com/treivize/open-project-1 into main
4 年前
Yohann Puyhaubert
ed7d963f
Added Player Cane Hit variant and enabling attack based on animation events
4 年前
Ciro Continisio
1690f35f
PigChef jump fixes, particles on jump liftoff
4 年前
Yohann Puyhaubert
a5261cf1
Combat System - Added player getting hit and killed states
4 年前
Ciro Continisio
2fec19c4
Update to 2019.4.19f1
4 年前
Yohann Puyhaubert
7418c9cd
[Bot] Automated dotnet-format update
4 年前
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 年前
Ciro Continisio
38827f46
Merge remote-tracking branch '_tech-mkt/main' into main
4 年前
Ciro Continisio
e633636d
More animations
4 年前
DeivSky
6e0a7847
Removed the "Cache Result" option in StateConditionSOs
The option was causing more confusion than anything, and wasn't being used at all. Every condition has it on since it's the default, so I've left the feature active all the time while removing the toggle as discussed [here](https://forum.unity.com/threads/input-cached-when-not-immediately-consumed-by-a-state.1022698/#post-6786170 ).
4 年前
Ciro Continisio
01f30d5a
Imported animations and art
4 年前
GitHub
f91be74c
Fix input caching ( #339 )
* StopMovement every update instead of on entering Idle State
* Fix input caching
A simple fix using coroutines to clear any cached input the frame after it was trigggered.
* Added Action to clear input cache
Reverted the changes to `Protagonist.cs` and `InteractionManager.cs` that were made to clear the input cached and instead put it all together in a single Action and added it to the Idle and Walking states.
* [Bot] Automated dotnet-format update
4 年前
DeivSky
5d7ef302
Allow hot reloading of state machines
4 年前
Ciro Continisio
89d048fc
Package updates
4 年前
GitHub
085eeb74
Update README.md
4 年前
GitHub
70640dcd
Add files via upload
4 年前