Ciro Continisio
6d1b63ae
Reorganising assets
4 年前
Ciro Continisio
79a79de9
Imported Townsfolk, Pig Chick
More assets in the environment test scene
4 年前
Ciro Continisio
f76bc5ce
Imported Townsfolk_F, Animations
4 年前
Ciro Continisio
03ff96ac
New test scenes
Big testing scene with Polybrush terrain, small test scene with just primitives
4 年前
Ciro Continisio
0ceeafd9
Refreshed Forest and Beach scenes
4 年前
Ciro Continisio
c28c6bc6
New Pig and RockCritter animations
4 年前
Ciro Continisio
cd7fea82
Tweaks, cleaning
4 年前
Ciro Continisio
e155c0a6
Added camera dummy, fixed issue with player Prefab tag
4 年前
Ciro Continisio
7705382e
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
4 年前
kgc00
b06aad3e
updates
4 年前
Ciro Continisio
7be88cca
Removed script Character, moved StateMachine SOs
4 年前
Chema Damak
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
Ciro Continisio
3db2e782
Added the ability to talk
4 年前
Ciro Continisio
12f2649c
Talk animation re-implemented
4 年前
Ciro Continisio
3e2ad7f2
Integrated dust particles
4 年前
Ciro Continisio
11c7a35b
Pig chef fixed animations
4 年前
Ciro Continisio
99c4ccb4
Audio functionality
4 年前
shuttle127
47c639cb
Create silhouette pass
Added some URP render features to silhouette characters when they're behind static scenery
4 年前
Ciro Continisio
09419cf4
Tweaks, dither shader
4 年前
Ciro Continisio
d9dd5e5e
Tweaked RenderFeatures
4 年前
Ciro Continisio
0661be42
Re-preffabbed the slimes
4 年前
Amel Negra
4687dbf1
Added interaction to main character prefab
4 年前
Amel Negra
1f2315aa
Added Rigidbody component to the Interaction GO on the pig
4 年前
Ciro Continisio
8da148bf
Introduced RuntimeAnchors
Used in Spawn and CameraSystem for decoupling purposes
4 年前
Amel
9918fbce
Interaction go on the pig is now a prefab
4 年前
Amel
582ea351
Added interaction events and updated interaction manager
4 年前
Ciro Continisio
648aa035
First setup
4 年前
Amel
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Amel Negra
770c4301
setup IK for the pig on the arms
4 年前
Amel
5418926e
added null check before event raise on interaction
4 年前
Amel
2c9810c9
Merge branch 'main' into interaction
4 年前
Amel Negra
370a7993
Merge remote-tracking branch 'origin/main' into interaction
4 年前
Ciro Continisio
86b055e0
Merge remote-tracking branch 'amel-unity/main' into pr-bash
4 年前
Ciro Continisio
2149cc50
AnimationRigging setup, lantern grab clip
4 年前
David Henshaw
2bf575bd
Tweak Landing Particle effects
4 年前
treivize
a4dc96e7
Initial Plant Critter combat system - Get Hit - Killed
4 年前
Ciro Continisio
5efb9eed
Tweaks to landing particles
4 年前
Ciro Continisio
e6e1f38f
Merge branch 'feature/sub/plant_critter_combat_system' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
162a06e3
Refactoring, renaming, comments
4 年前
Ciro Continisio
6e9237b6
Walkling cane as weapon, tweaks to animations
4 年前
Ciro Continisio
c6c67ff0
New sound effects
Wired new sound effects: jump, pickup, swing cane and footsteps
Laid the foundation work for more
Script playing sfx on player from animation clips
4 年前
Ciro Continisio
1bf52eb2
2.5D sounds on character
4 年前
alex
9fd881be
Fix Interaction System doesn't follow the FSM
4 年前
alex
1dc5ecc0
Fix Interaction System doesn't follow the FSM
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 年前
Yohann Puyhaubert
a5261cf1
Combat System - Added player getting hit and killed states
4 年前
Yohann Puyhaubert
ed7d963f
Added Player Cane Hit variant and enabling attack based on animation events
4 年前
Ciro Continisio
0d4b9d8a
Refactoring, moved items
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 年前
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 年前
Chema Damak
fab44b36
Merge fixes completed
4 年前
GitHub
c20ffd23
Added slash effect when player is triggering an attack ( #356 )
* Added slash effect when player is triggering an attack
* Corrected after merge from main
* renamed script to correct typing mistake
Co-authored-by: Amel Negra <amel.negra@unity3d.com>
4 年前
Ciro Continisio
70978d9d
Audio changes
4 年前
Ciro Continisio
07f4bf25
Music playing
4 年前
Ciro Continisio
ccbaa8cd
Recreating clips with staff
4 年前
Ciro Continisio
148520ea
Animation tweaks
4 年前
uChema
2a357495
Open/Close Inventory with Input system. No mouse needed
4 年前
uChema
d1f0a9e1
Add healthbar logic
4 年前
uChema
2847ceef
Fix current questline + Add UI Healthbar into Game play scene
4 年前
Ciro Continisio
49d768c5
Rebaked TestingGround and ArtShowcase
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
Ciro Continisio
f40bd45e
Phoenix Chick 2.0
4 年前
Ciro Continisio
8f5b1bdb
Refined PigChef animations
4 年前
Amel
de5ce681
Pig chef audio event added to fbx and pushing prefab
4 年前
Ciro Continisio
bbf35a4d
SFX tweaks
Volume adjustments, moved Audio listener to Protagonist
4 年前
Ciro Continisio
38af1d45
PigChef tweaks
Added jump and land sfx
Jump animation now broken in 3 states (liftoff, in air, land)
Added extra late transition between cane swings, so the character is never waiting idle too long when the attack button is pressed
3 年前
GitHub
06df8c3e
Add script to orient audio listener with the camera ( #457 )
* Add script to orient audio listener with the camera
* Use TransformAnchor to compute listener orientation
3 年前
Ciro Continisio
b214f102
Work on character controller
3 年前
Ciro Continisio
f3bd8b00
Three raycasts
3 年前
Ciro Continisio
c3118a36
New day, new test
3 年前
Ciro Continisio
5b2ff381
More tweaks to CC
3 年前
Amel Negra
cdba81f2
Pushing animations, ACs and prefabs tweaked for cutscenes
3 年前
Amel Negra
d9d8d631
Adding talk sfx events to pig chef talk clips
3 年前
Amel
de1dc005
Add game state to pig chef prefab
3 年前
Amel
ca019671
Disabled debug transition on pig chef
3 年前
uChema
0a1c31a0
Add healthbar
3 年前
uChema
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
57caaba3
Keep health between scenes
3 年前
uChema
94daf002
Restore health and Apply changes to MainMenuCanvas prefab
3 年前
Amel
cb4d2d6e
E interaction disabled during cutscenes
3 年前
Ciro Continisio
6b104b55
Mega code cleanup
3 年前
Ciro Continisio
5af375fa
Various changes around health management
Fixed UIHealthBar reset hearts bug
Relocated UI event channels under the Health folder
Enemies no longer fire UpdateUI events
Fixed PigChef's missing sounds
3 年前