ee2cec18
Camera rotation, Movement tweaks
Movement now is independent of camera rotation
4 年前
b09b90e6
Fixed player movement axis bug
4 年前
bbcfe5c4
Merge pull request #4 from DapperDino/master
Verified that the bug is fixed. Thanks, Nathan!
Also: **First contribution!!** 🎉
4 年前
1215a9bf
Fixed snappy movement bug
4 年前
4af64d31
Merge pull request #9 from DapperDino/master
Fix looks good!
4 年前
6738e6e0
Fixed an issue regarding player jump not getting stopped by a collision from above
4 年前
a5b785a6
Merge pull request #16 from Quickz/player-jump-fix
Tested in the scene and it seems like it fixes the issue. Thanks @Quickz , merging!
4 年前
e447593c
Fixed steep surfaces bug
4 年前
1f6fdb42
Replace magic numbers with variables - issue: 40
4 年前
f40790a1
Made adjustments based on HyagoOliveiran's suggestions
Tried to add more variables to increase legibility.
Added UpdateSlide function.
Deleted some empty lines.
4 年前
c0a9e0a7
Update UOP1_Project/Assets/Scripts/Characters/Character.cs
I deleted unnecessary spacing by following atb-brown suggestion.
Co-authored-by: Austin Brown <atb.austin@gmail.com>
4 年前
fa4b802f
Update Character.cs
4 年前
a046c18a
Deleted unnecessary spacing
4 年前
25279029
fixed an issue regarding player jump not getting canceled in a few cases
4 年前
03385e75
Update Character.cs
4 年前
90d34bde
Fixed bouncing issue when player hit under floating platform
4 年前
506101f1
Merge pull request #45 from Quickz/jump-fix
Fixed an issue regarding player jump not getting canceled in a few cases
4 年前
90e60ba3
Update Character.cs
4 年前
a9604394
Merge branch 'master' into TMPro-Import
4 年前
fa308200
Update Character.cs
4 年前
bd2f9dce
Merge branch 'master' into remove-magic-numbers
4 年前
123c2bdc
Update Character.cs
4 年前
e23c8e72
Change var name to more acurately show purpose
4 年前
b194fe99
Merge branch 'master' into Wodopo/spawn-system
# Conflicts:
# UOP1_Project/Assets/Scenes/CharController.unity
# UOP1_Project/Assets/Scripts/CameraManager.cs
4 年前
14215282
Update Character.cs
4 年前
106bfcd0
Remove accidentaly added blank lines
4 年前
69c48251
Changed the new variable into a constant
4 年前
02d8e6c7
Merge pull request #55 from andrewreal/remove-magic-numbers
Remove magic numbers
4 年前
f063f571
Merge branch 'bug-steep-surfaces'
4 年前
a291c583
Merge remote-tracking branch 'upstream/master'
4 年前
83f426f0
Merge remote-tracking branch 'upstream/master'
4 年前
f5ad616a
Merge pull request #26 from mwert09/master
Fixed steep surfaces bug and implemented sliding
4 年前
cd634c11
Implemented automatic linter
4 年前
4211568e
[Bot] Automated dotnet-format update
4 年前
83951a71
Merge pull request #73 from MileyHollenberg/Linter
Setup automatic linting as a Github Action
4 年前
9965c051
Removed unused imports ( #75 )
4 年前
e27f318b
Merge branch 'master' into custom-lighting-shader
# Conflicts:
# UOP1_Project/Packages/manifest.json
# UOP1_Project/ProjectSettings/ProjectVersion.txt
4 年前
3a48da8b
Initial commit
4 年前
391017ac
Yet another State Machine ( #94 )
* Initial commit
* [Bot] Automated dotnet-format update
* Added debug toggle
* [Bot] Automated dotnet-format update
* Update StateMachines.unity
* Removed serializable actions/conditions. Added current state name in state machine component. Added more spheres to test scene.
* minor
* Renaming from 'Scriptable' prefix to 'SO' suffix.
Co-Authored-By: Ciro Continisio <20049224+ciro-unity@users.noreply.github.com>
* Adjusted test scene. Renamed StateAction.Perform() to OnUpdate(). Added a couple of Tooltips and comments.
The test scene was adjusted to display how to override the behaviour of the Spheres by attatching a different `ChaseDataSO` to the `StateMachine`, specifying a different target.
Tooltips and comments were added to try to explain the workflow of overriding Action and Condition data.
* [Bot] Automated dotnet-format update
* Removed ScriptableObjects array from StateMachine. Adjusted test scene. Single l...
4 年前
43ebc212
Art reorganisation and cleanup
4 年前
ff340fa4
Fixed typo
4 年前
d2082480
Removed personal namespace
4 年前
72d7c142
Character state machine
4 年前
2cb26091
Tweaks and comments
Removed StateMachines scene, fixed a small bug on Sliding when spawning in the air and trying to move
4 年前
c9bcfaeb
Merge branch 'DeivSky/state-machine' into main
Conflicts are all regarding the renaming of the namespace from Deivsky to UOP1
# Conflicts:
# UOP1_Project/Assets/Scripts/StateMachine/Core/IStateComponent.cs
# UOP1_Project/Assets/Scripts/StateMachine/Core/State.cs
# UOP1_Project/Assets/Scripts/StateMachine/Core/StateAction.cs
# UOP1_Project/Assets/Scripts/StateMachine/Core/StateCondition.cs
# UOP1_Project/Assets/Scripts/StateMachine/Core/StateMachine.cs
# UOP1_Project/Assets/Scripts/StateMachine/Core/StateTransition.cs
# UOP1_Project/Assets/Scripts/StateMachine/ScriptableObjects/StateActionSO.cs
# UOP1_Project/Assets/Scripts/StateMachine/ScriptableObjects/StateConditionSO.cs
# UOP1_Project/Assets/Scripts/StateMachine/ScriptableObjects/StateSO.cs
# UOP1_Project/Assets/Scripts/StateMachine/ScriptableObjects/StateTransitionSO.cs
4 年前
8c53ac1f
Fixed Assembly issue
4 年前
cc6cd14e
Fixed Assembly issue
4 年前
851efcad
Merge remote-tracking branch 'origin/main' into Scene-Loading
4 年前
55d5d2a4
Merge branch 'main' into art-assets
# Conflicts:
# UOP1_Project/Assets/Art/Characters/PhoenixChick.meta
# UOP1_Project/Assets/Cutscenes.meta
# UOP1_Project/Assets/Cutscenes/ExampleCutscene.playable.meta
# UOP1_Project/Assets/Materials/Debug_Semitransparent.mat.meta
# UOP1_Project/Assets/Materials/Obstacles_Blue.mat.meta
# UOP1_Project/Assets/Prefabs/GameplayEssentials.meta
# UOP1_Project/Assets/Prefabs/Input Reader.asset
# UOP1_Project/Assets/Prefabs/Input Reader.asset.meta
# UOP1_Project/Assets/Prefabs/Pig.prefab
# UOP1_Project/Assets/Presets.meta
# UOP1_Project/Assets/Presets/Defaults.meta
# UOP1_Project/Assets/Scenes/CharController.unity
# UOP1_Project/Assets/ScriptableObjects.meta
# UOP1_Project/Assets/ScriptableObjects/Input Reader.asset
# UOP1_Project/Assets/ScriptableObjects/Input Reader.asset.meta
# UOP1_Project/Assets/ScriptableObjects/Input/InputReader.asset
# UOP1_Project/Assets/ScriptableObjects/Input/InputReader.asset.meta
# UOP1_Project/Assets/Settings/Presets.meta
# ...
4 年前
b5b57142
Added caching to the conditions for better performance ( #164 )
Condition results are now cached so they are only evaluated once per frame, regardless of how many times they are being checked in the state machine logic.
Caching is made by each instance of the state machine and the condition respective scriptable object.
Added a boolean value to enable/disable this feature on each Condition Scriptable Object individually.
Extra internal changes:
The abstract function Condition.Statement() changed from public to protected so it can only be used inside the internal Condition.GetStatement().
Added documentation regarding all Get methods for the abstract Scriptable Objects to clarify their behaviors.
Removed StateTransitionSO since it was replaced by TransitionTableSO
Changed public TransitionTableSO.GetInitialState() to internal.
Changed a few SO references to their specialized classes.
4 年前
8504c55f
PigChef plays idle and walk animations
Created action to set a bool parameter on the state machine
4 年前
6803546e
[Bot] Automated dotnet-format update
4 年前
d8761506
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
781633e3
Merge remote-tracking branch 'upstream/main' into main
4 年前
7705382e
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
4 年前
c4dabcbe
merge
4 年前
ededb7c0
Merge branch 'state-machine-improvements' into main
4 年前
253b73a3
Merge remote-tracking branch 'upstream/main' into main
4 年前
7b04a609
Merge branch 'main' into simple-menu-controls
4 年前
7be88cca
Removed script Character, moved StateMachine SOs
4 年前
383e85b3
Renamed variable in all Conditions and Actions
4 年前
3db2e782
Added the ability to talk
4 年前
7f5780ce
[Bot] Automated dotnet-format update
4 年前
a0293eb3
Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system
4 年前
ee1d998c
AnimatorParameterActionSO and refactoring
4 年前
3e2ad7f2
Integrated dust particles
4 年前
e7bdd126
[Bot] Automated dotnet-format update
4 年前
0bcdfe44
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
4 年前
5fcc526a
Merge branch 'use-box-collider-for-pottery-objects' of https://github.com/mtakac/open-project-1 into main
4 年前
99c4ccb4
Audio functionality
4 年前
826ef58b
AudioSystem functionality
4 年前
0728a4c6
Merge branch 'art-assets' into feature/art/pant_critter
4 年前
14e737cc
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
4 年前
82d4c4e3
Fixed framerate-dependent jump (?)
Also added a debug option to the editor initialised, to force framerate to extreme values
4 年前
a05af5c2
Merge branch 'main' into art-assets
4 年前
e09986b8
Merge branch 'main' into fix/object-pool
4 年前
1d26bec4
Merge branch 'main' into state-machine-improvements
4 年前
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
c81112b1
Reworked all Actions and Conditions to take advantage of the refactor
4 年前
b9e24678
[Bot] Automated dotnet-format update
4 年前
6bf8be1d
Added back recklol Dissolve effect ( #217 )
* Added recklol dissolve effect with some tweaks
* Added names to dissolve outputs
* Added a dissolve effect option in contextual menu and add alpha cutoff in Toon_Disolve
4 年前
11189097
Merge remote-tracking branch '_tech-mkt/art-assets' into art-assets
4 年前
5fd25192
Added small internal cooldown to the PlayLandParticlesAction StateAction ( #260 )
* Added small internal cooldown to PlayLandParticlesAction StateAction
https://open.codecks.io/unity-open-project-1/decks/15-code/card/18k-avoid-spamming-particles-on-sliding
Whenever the PlayLandParticlesAction StateAction is exited by the state machine, it checks if total elapsed time is greater then the total elapsed time of the last particle call + a small amount.
If so, only then do we tell the DustParticle Controller to play, and we also set the new time to beat to be the current time.
* Update PlayLandParticlesActionSO.cs
Removed the unnecessarily verbose extra function
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
c97e9c6b
[Bot] Automated dotnet-format update
4 年前
8da148bf
Introduced RuntimeAnchors
Used in Spawn and CameraSystem for decoupling purposes
4 年前
2700464f
[Bot] Automated dotnet-format update
4 年前
e9c2c909
State Machine - Proposed fix for Issue 228 ( #227 )
* Added Sliding to JumpAscending
Player was unable to jump if sliding which caused the player to get stuck in geometry/holes.
* Added IsActuallyMoving Condition SO and update PigChef Transition Table
IsActuallyMovingSO evaluates character movement by the character controller's velosity.sqrMagnitude. Returns true if the character controller is moving beyond the threshold. Characters can no longer jump while sliding but can jump if they get stuck.
* Update .gitignore
* Small fixes
Reconnected disconnected assets in the TransitionTable, reverted changes on the .gitignore, added multiplication in threshold verification equation
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
8c6e7df0
[Bot] Automated dotnet-format update
4 年前
cc52237b
Added isPickingUp SO condition to state machine
4 年前
d62d8e9e
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Prefabs/PrototypingTree.prefab.meta
# UOP1_Project/Assets/Samples.meta
# UOP1_Project/Assets/Samples/Polybrush.meta
# UOP1_Project/Assets/Samples/ProBuilder/4.4.0/Universal Render Pipeline Support/Material/ProBuilder Default URP.mat.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/CharController.unity.meta
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/CharController/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/Locations/Beach/LightingData.asset
# UOP1_Project/Assets/Scenes/TestingGround.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_optimized.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_opt...
4 年前
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
4 年前
9d3fb89a
Merge remote-tracking branch 'tech-mkt/state-machine-improvements' into main
4 年前
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
3bf061d4
Use CustomBaseEditor class in AnimatorParameterActionSOEditor.cs
4 年前
2051a72a
Adding interaction UI + Events
4 年前
2c9810c9
Merge branch 'main' into interaction
4 年前
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
370a7993
Merge remote-tracking branch 'origin/main' into interaction
4 年前
9bae4220
Merge remote-tracking branch 'origin/interaction' into main
4 年前
77242d26
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
4 年前
e3f6f31a
Added Run and Faint animation for PigChef, implemented Run as BlendTree
4 年前
26d5b059
Added the ability to run for keyboard players
4 年前
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
61abd62c
Add feature controlling number of landing particles based on fall distance
4 年前
e5c1ed4b
Initial Plant Critter behaviour - Idle - Alert - Attack
4 年前
2bf575bd
Tweak Landing Particle effects
4 年前
a4dc96e7
Initial Plant Critter combat system - Get Hit - Killed
4 年前
48a39328
Merge remote-tracking branch 'davidhenshaw/main' into pr-bash
4 年前
5efb9eed
Tweaks to landing particles
4 年前
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
06438a1a
Pulled from upstream/main
4 年前
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
c925b56b
Merge branch 'feature/code/plant_critter_sm' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
e6e1f38f
Merge branch 'feature/sub/plant_critter_combat_system' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
6592ba26
Tweaks
Protagonist now moves to Idle state after attack, with the right timing
4 年前
162a06e3
Refactoring, renaming, comments
4 年前
84e76f64
Fixes, typos and tweaks
4 年前
6e9237b6
Walkling cane as weapon, tweaks to animations
4 年前
7c088a1f
Merge branch 'pr-bash' into main
4 年前
154737ee
[Bot] Automated dotnet-format update
4 年前
b8753400
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
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 年前
c28d9833
Merge branch 'main' into QuestSystem
4 年前
1853f7ab
Added Critter SO - Item drop when killed - FR critter names ( #299 )
4 年前
94c592c3
[Bot] Automated dotnet-format update
4 年前
01936592
Merge remote-tracking branch 'origin/art-assets' into main
4 年前
54f79bad
Added slime critter behavior ( #312 )
* Slime Critter initial behavior
* Added slime critter behavior
4 年前
183fdac0
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
faf70fc8
Slime critter propel attack ( #315 )
4 年前
94887c60
[Bot] Automated dotnet-format update
4 年前
71fe0c78
Update PigChef TransitionTable, Jumping and Sliding mechanics ( #310 )
* Update PigChef_TransitionTable.asset
Changes:
- From Idle
- To Sliding
- ~~IsActuallyMoving~~
- To JumpAscending
- ~~IsSliding~~
- From Walking
- **To Sliding (moved above To JumpAscending)**
- To JumpAscending
- ~~IsSliding~~
* Reordered Walking and Idle states transitions.
- To Sliding
- To JumpAscending
- To JumpDescending
- To Attack
- To PickUp
- To Talk
- To Walking/Idle
* Update PigChef.controller
Updated PigChef Animator controller to reflect the changes to the TransitionTable:
- Added transition from Walking to Collect on PickUp trigger.
- Added transition from Walking to Talking when IsTalking is True.
* Added MidSliding State
The MidSliding State is added to prevent the state machine from going back and forth between Sliding and JumpDescending when not needed.
* Major changes to player sliding and aerial movement, bug fixes, and adjustments...
4 年前
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
0f397e96
Merge branch 'main' into QuestSystem
4 年前
45cb9412
Add a Stop and Finish option for the AudioManager
4 年前
837d24dd
Fix Shared Tables (Localization) conflict.
4 年前
47ad6cc8
[Bot] Automated dotnet-format update
4 年前
4b1081d0
Merge branch 'AudioStop' of https://github.com/island212/open-project-1 into pr-bash
4 年前
3f2b0d3c
Merge branch 'create-editorBase-for-custom-inspector' of https://github.com/rainaldisatria/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scripts/Editor/GameSceneSOEditor.cs
4 年前
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 年前
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
9fd881be
Fix Interaction System doesn't follow the FSM
4 年前
38827f46
Merge remote-tracking branch '_tech-mkt/main' into main
4 年前
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 年前
ae4f635e
Fix Fix Interaction System doesn't follow the FSM
4 年前
7418c9cd
[Bot] Automated dotnet-format update
4 年前
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
4 年前
90193b88
Revert "Fix Fix Interaction System doesn't follow the FSM"
This reverts commit f3d92d727da6f8f6b6ca1dca867835bf45b35c79.
4 年前
a5261cf1
Combat System - Added player getting hit and killed states
4 年前
df03afb9
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
4 年前
b4dda4f6
Fix Interaction System doesn't follow the FSM
4 年前
1690f35f
PigChef jump fixes, particles on jump liftoff
4 年前
ed7d963f
Added Player Cane Hit variant and enabling attack based on animation events
4 年前
0d4b9d8a
Refactoring, moved items
4 年前
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 年前
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 年前
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 年前
28d4d3bb
Attack system overhaul
4 年前
19c74b30
[Bot] Automated dotnet-format update
4 年前
57258669
Merge branch 'main' into pr-bash
4 年前
7ece782e
Merge branch 'main' into QuestSystem
4 年前
7f7c4818
Fix Merge
4 年前
dd1963d1
[Bot] Automated dotnet-format update
4 年前
7cd4ce12
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
4 年前
d07ee56f
Merge pull request #1 from UnityTechnologies/main
Latest changes
4 年前
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
bf1a236b
Added pathway NPC movement strategy
4 年前
22788ea0
Included pathway component to edit PathwayConfigSO
4 年前
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 年前
a19b2328
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
2f0661e3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
6bee54e4
Update pathway config SO to work with the latest pathway editor changes
4 年前
b7bb56dd
Fix attack logic to consume attack from animation events
4 年前
b1d0c051
Correction following Alexandre review
4 年前
30b47152
Hide back the attack input
Sorry, it was displayed on inspector for debug purpose only
4 年前
247585ac
Move out from Editor only section waypoints prop and WaypointData class
4 年前
67e5ce82
Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main
4 年前
5464088e
Merge branch 'feature/combat-update-consume-input' into main
4 年前
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
8e91ed4b
Acceleration/Deceleration for character
4 年前
56af60b8
[Bot] Automated dotnet-format update
4 年前
997b50ae
Merge branch 'main' into pr/393
4 年前
7b1ed2b2
Merge branch 'main' into UI
4 年前
2a357495
Open/Close Inventory with Input system. No mouse needed
4 年前
21c257d2
[Bot] Automated dotnet-format update
4 年前
ce2090e7
Merge branch 'UI' of https://github.com/UnityTechnologies/open-project-1 into UI
4 年前
df409c61
typo fix
4 年前
84d13891
Merge branch 'main' into UI
4 年前
0ed45c81
Add Collectible Prefab
4 年前
5bf93532
Townsfolk script to control when talking by default or not
4 年前
20cfec67
clean up folders
4 年前
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
95e2789c
Tweaked protagonist attack
Now moving very slowly while attacking
4 年前
6dda5831
WIP talking condition for townsfolks
4 年前
e76a2bb9
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
cef038ad
Now townsfolk possible to idle, walk, talk and choose behavior from MB
4 年前
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 年前
6ddc6d14
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
4 年前
c094f333
Merge branch 'main' into AmelMain
4 年前
cf9b5d2c
WIP Settings menu
4 年前
837dcf96
removed state machine added twice on prefab
4 年前
5a4b5e30
[Bot] Automated dotnet-format update
4 年前
bd7b83fa
Made Initial state an enum
4 年前
1bdfb7ff
Added townsfolk walking condition
4 年前
a186115b
Added IsInDialogue to step controller
4 年前
76cc2e8b
Merge branch 'ForestMaze' of https://github.com/itsLevi0sa/open-project-1 into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Scripts/UI/UIManager.cs
4 年前
b2351dfa
renamed InitialState variable
4 年前
13e2f4ef
renamed initial state to state
4 年前
d516a82f
Debugging agent issue not finding path
4 年前
3dad5079
Townsfolk to stop talking when protagonist talks to others in conversation
4 年前
e446a5a7
edited townsfolk script to move methods to step controller
4 年前
47a6b132
typo fix
4 年前
8257591d
Store rotation before facing protagonist to use it after dialogue
4 年前
b4c11041
Added is NPC saying line condition
4 年前
3a9decf3
comment debug lines and push scene
4 年前
017d02f4
Renamed all files to fit general NPC use instead of townsfolk
4 年前
4717e2f5
wip
4 年前
3f4c581e
Added is path ready condition
4 年前
e3126f25
Setting the right initial value for the way point index + added comments/renaming for clarity
4 年前
1ce4260d
Fixed issue with reaching the waypoint
4 年前
cae701a3
Add states of Bard Hare and Fry King to the NPC script
4 年前
320a8038
Adding jump up and down states for bard hare with their conditions and transitions
4 年前
03aa1941
wip fixing townsfolk state machine on talk and listen
4 年前
58d7262d
wip v2 townsfolk
4 年前
e5e6a42e
Townsfolk state machine V1
4 年前
c95b063c
waypoint index initial value
4 年前
2ab8f62c
removed unneeded states from NPC script
4 年前
ce10fdea
Bard hare state machine working
4 年前
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
127bd54d
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
350159af
Merge branch 'main' into whiteboxing
4 年前
74ff185e
renamed slime critter attack controller to more general to reuse for rock
4 年前
d77d34d4
Now we have 2 face protagonist actions specific to NPC and critters
4 年前
348c8c14
Merge branch 'AmelMain' into main
4 年前
c24dd21f
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
75e90368
Adding new condition script for when a new line is displayed
4 年前
eafd1d40
Adding Random time elapsed condition
4 年前
75076141
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
176eb353
removing eat state from NPC since it will be used only in cut-scenes and not gameplay
4 年前
e6dcfc27
Merge branch 'main' into whiteboxing
4 年前
0b4f451f
Merge branch 'AmelMain' into main
4 年前
aa88e701
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
72d88c0d
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/AddressableAssetsData/OSX/addressables_content_state.bin.meta
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity.meta
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
# UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta
4 年前
9a3e73a6
Added reset health SO action
3 年前
73a43775
Critters state machines adjustments
3 年前
ad0bf614
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
6bf9cfe1
Merge remote-tracking branch 'tech-mkt/main'
3 年前
47ed0d6a
Merge branch 'main' into worldbuilding
3 年前
3bb6625f
Created SFX SO for all critters
3 年前
b61e19c7
Creating a parent class for all character audio
3 年前
f92d1b8a
removing audio config and channel from protagonist class
3 年前
7654f9e8
Merge remote-tracking branch 'amel-unity/main' into main
3 年前
d0523373
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
8f750556
Added getting hit and faint sounds for protagonist
3 年前
bbf35a4d
SFX tweaks
Volume adjustments, moved Audio listener to Protagonist
3 年前
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
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 年前
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
9fd51f47
Add camera shake on protagonist hit. ( #454 )
* Add camera shake on protagonist hit.
* add cam shake on critters hit
3 年前
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
8a2721d9
Setting Questline + rename SO's files
3 年前
a98c8e7f
Fixed jump attack particle bug ( #464 )
Like mentioned in the thread, the bug is caused because the state machine goes Ascending->Descending->DescendingAttacking where Descending calls the particles when exiting. I fixed this simply by adding a ground check on the LandParticles action.
3 年前
42ba5e06
Merge remote-tracking branch 'origin/main' into AmelMain
3 年前
b4892bfe
Merge with main
3 年前
b214f102
Work on character controller
3 年前
f3bd8b00
Three raycasts
3 年前
c3118a36
New day, new test
3 年前
5b2ff381
More tweaks to CC
3 年前
832dd088
Merge branch 'ciro'
3 年前
256684a1
First frame error check
3 年前
d7205d06
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
3 年前
f26da778
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
ad52a32a
hot fixes - Questline integration
3 年前
97ccda6a
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
72ec616e
[Bot] Automated dotnet-format update
3 年前
460fb941
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding
3 年前
de0f0586
Revert "Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding"
This reverts commit 5141fc8d8d88057646e6602844c0bc709606f6d3, reversing
changes made to 0146f00fa2288b3baf783f2feb33ed3ff37fb231.
3 年前
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 年前
d9d8d631
Adding talk sfx events to pig chef talk clips
3 年前
02a13eae
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
aa9e8032
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into CaveWhiteboxing
3 年前
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
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 年前
0425b39f
[Bot] Automated dotnet-format update
3 年前
1d3f0c8a
Added FallCatcher script for water areas
3 年前
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
38195933
Disable audio sfx events on animation during cutscenes
3 年前
11ccdf9f
Create method on NPC script to change state to walk (For lose cutscene wip)
3 年前
599c6af5
Make NPC wait for a random time before walking away in cutscene
3 年前
3faf99a1
Use the state machine to change Game State to and from Combat
3 年前
73b4e5d8
Set game to combat state when critter detects player
4 年前
1d6b8128
Use Game States In State Machine
3 年前
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
0a1c31a0
Add healthbar
3 年前
0e1137be
Adding Icons + New Interaction system
3 年前
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
57caaba3
Keep health between scenes
3 年前
94daf002
Restore health and Apply changes to MainMenuCanvas prefab
3 年前
8760a221
Select first Item in Inventory when Inventory Open
3 年前
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
14e342ab
Update summary of ChangeGameStateActionSO.cs ( #496 )
3 年前
53bc6c38
Refactored code to remove some warnings
3 年前
27ebfa55
Code formatting and tweaks
3 年前
313f8a7f
Code cleanup, refactored Anchors to be generic
3 年前
202b38ba
More code refactoring around Anchors
3 年前
c284ce4c
Reorganised editor tools, added ReadOnly attribute
3 年前
e0bf1a99
More code cleanup and bug fixes
Renamed tools
Hidden Quest tool
Added debug visualisation to some ScriptableObjects using ReadOnly attribute
3 年前
b74f3140
More Runtime Anchor refactoring, other SO additions
Also fixed bug with RuntimeAnchors
Fixed BardHare state machine (error on Animator parameter)
3 年前
6b104b55
Mega code cleanup
3 年前
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 年前
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 年前
Ciro Continisio
Nathan
GitHub
Quickz
mwert09
Andrew Real
Miley Hollenberg
DeivSky
Unknown
kgc00
rainaldisatria
treivize
Llaczky
MTrecozzi
John McAllister
Amel
Dan Young
Chema Damak
Amel Negra
David Henshaw
HarshNarayanJha
uChema
Yohann Puyhaubert
Dane Byrd
Marc-Olivier
alex
Smurjo
Bronson Zgeb
itsLevi0sa
Greg Solo