open-project-1

作者	SHA1	备注	提交日期
Ciro Continisio	72d7c142	Character state machine	4 年前
GitHub	187ff10f	Allow switching from the Idle state to Sliding or JumpDescending (#124 ) This bug was allowing the character to climb the mountain without sliding. The change also improves responsiveness for dynamic objects in the environment.	4 年前
circa94	cdbf1207	Merge branch 'circa94/master' into circa94/inventory-system	4 年前
Ciro Continisio	8504c55f	PigChef plays idle and walk animations Created action to set a bool parameter on the state machine	4 年前
kgc00	781633e3	Merge remote-tracking branch 'upstream/main' into main	4 年前
Ciro Continisio	7705382e	Merge branch 'main' into state-machine-improvements # Conflicts: # UOP1_Project/Assets/Prefabs/Pig.prefab	4 年前
kgc00	c4dabcbe	merge	4 年前
Ciro Continisio	7be88cca	Removed script Character, moved StateMachine SOs	4 年前
Marek Takac	c91c9d5b	Added Sliding to JumpDescending protagonist transition	4 年前
Ciro Continisio	3db2e782	Added the ability to talk	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 年前
Ciro Continisio	12f2649c	Talk animation re-implemented	4 年前
Ciro Continisio	3e2ad7f2	Integrated dust particles	4 年前
Ciro Continisio	826ef58b	AudioSystem functionality	4 年前
treivize	0728a4c6	Merge branch 'art-assets' into feature/art/pant_critter	4 年前
GitHub	14e737cc	Merge pull request #1 from UnityTechnologies/art-assets Art assets	4 年前
GitHub	e09986b8	Merge branch 'main' into fix/object-pool	4 年前
treivize	df2ab2a2	Merge branch 'art-assets' into feature/art/slime_critter	4 年前
Amel	775466b3	Added pick up state to the state machine	4 年前
Amel	54956501	pickUp state in states folder	4 年前
Amel	6d8abc2f	Added pickup state to state machine	4 年前
GitHub	5c82e99e	Merge pull request #2 from UnityTechnologies/main import changes from main	4 年前
Amel Negra	9bae4220	Merge remote-tracking branch 'origin/interaction' into main	4 年前
Ciro Continisio	77242d26	Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main # Conflicts: # UOP1_Project/Assets/Scenes/TestingGround.unity	4 年前
Ciro Continisio	e3f6f31a	Added Run and Faint animation for PigChef, implemented Run as BlendTree	4 年前
Dan Young	7ce66d74	Merge remote-tracking branch 'upstream/art-assets' into art-assets	4 年前
Amel Negra	a3fdb227	Merge branch 'main' into whiteboxing	4 年前
treivize	a4dc96e7	Initial Plant Critter combat system - Get Hit - Killed	4 年前
GitHub	d0298f3d	Merge pull request #3 from UnityTechnologies/art-assets Art assets	4 年前
Amel Negra	c444c501	Merge remote-tracking branch 'origin/main' into scenes-re-architecture	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	6592ba26	Tweaks Protagonist now moves to Idle state after attack, with the right timing	4 年前
Ciro Continisio	7c088a1f	Merge branch 'pr-bash' into main	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 年前
uChema	c28d9833	Merge branch 'main' into QuestSystem	4 年前
Dan Young	eb670224	Merge remote-tracking branch 'upstream/art-assets' into art-assets	4 年前
GitHub	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 年前
Ciro Continisio	c691552b	Merge branch 'pr-bash' into whiteboxing # Conflicts: # UOP1_Project/Assets/Samples.meta	4 年前
Dane Byrd	c6beedc4	Merge branch 'art-assets' into ground_shader	4 年前
uChema	0f397e96	Merge branch 'main' into QuestSystem	4 年前
alex	cd99f6a9	Fix Input is cached when not immediately consumed by a State for jump and attack	4 年前
alex	80fb372c	Fix Input is cached when not immediately consumed by a State	4 年前
alex	e853b382	Update JumpDescending.asset	4 年前
alex	60953eaa	Fixed Talk	4 年前
alex	c7dfbf56	Revert "Update JumpDescending.asset" This reverts commit e27436f12646bb3a6d3869f4ab41da6ea4521d81.	4 年前
alex	b13a4bdc	Revert "Revert "Update JumpDescending.asset"" This reverts commit 719a1305ea51f3eff310efcbc1c2128db8e35db4.	4 年前
alex	47e372b5	Revert "Revert "Revert "Update JumpDescending.asset""" This reverts commit 6ad2c966a59dd8753d2727474d57777d4e8994a9.	4 年前
alex	4454ead8	Revert "Fixed Talk" This reverts commit ea98412739eb79be71ed494a399ef730ce020101.	4 年前
alex	df4724a0	Revert "Fix Input is cached when not immediately consumed by a State" This reverts commit 2da91014e3a14a3a81ed65d87357eda43c855bdb.	4 年前
alex	e354a52a	Revert "Fix Input is cached when not immediately consumed by a State for jump and attack" This reverts commit 7e41a5097458eeb6ce0908ef69eebc92587e4217.	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 年前
alex	2f536097	Merge remote-tracking branch 'upstream/main' into main	4 年前
alex	9fd881be	Fix Interaction System doesn't follow the FSM	4 年前
Ciro Continisio	38827f46	Merge remote-tracking branch '_tech-mkt/main' into main	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	0d4b9d8a	Refactoring, moved items	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 年前
uChema	7ece782e	Merge branch 'main' into QuestSystem	4 年前
GitHub	b5417125	Merge pull request #7 from UnityTechnologies/main Updating my local repository	4 年前
Yohann Puyhaubert	9c4d30a1	Update combat SM	4 年前
Amel Negra	5464088e	Merge branch 'feature/combat-update-consume-input' into main	4 年前
GitHub	c0b2931f	Merge pull request #1 from UnityTechnologies/main Update fork	4 年前
Amel	7b1ed2b2	Merge branch 'main' into UI	3 年前
Amel	5a5a8fe6	Adding IdleAttacking and WalkAttacking states	3 年前
Amel	ce0fb799	Updated state machine for PigChef, now possible to attack and walk	3 年前
Amel	d47144d0	removed old attack state	3 年前
Amel	72040b36	Getting hit update	3 年前
Amel	8c7c6a9c	Now possible to jump and attack	3 年前
Amel Negra	75180244	Merge remote-tracking branch 'origin/main' into main	3 年前
uChema	84d13891	Merge branch 'main' into UI	3 年前
Amel Negra	e19def8e	Adding listen state for pig chef and transitions for idle and talk	3 年前
uChema	127bd54d	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
Ciro Continisio	350159af	Merge branch 'main' into whiteboxing	3 年前
Amel Negra	177559b8	Make sure that protagonist stops attacking when dying	3 年前
Amel Negra	0b4f451f	Merge branch 'AmelMain' into main	3 年前
uChema	aa88e701	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
Ciro Continisio	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	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 年前
Ciro Continisio	b214f102	Work on character controller	3 年前
Ciro Continisio	5b2ff381	More tweaks to CC	3 年前
Ciro Continisio	832dd088	Merge branch 'ciro'	3 年前
uChema	f26da778	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
itsLevi0sa	340dd8dc	Merge branch 'main' into CaveWhiteboxing	3 年前

1 2

89 次代码提交 (bf6484ad-7e03-488f-b20d-43ccbc3980be)