open-project-1

作者	SHA1	备注	提交日期
Ciro Continisio	72d7c142	Character state machine	4 年前
Ciro Continisio	2cb26091	Tweaks and comments Removed StateMachines scene, fixed a small bug on Sliding when spawning in the air and trying to move	4 年前
Ciro Continisio	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 年前
GitHub	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 年前
Ciro Continisio	ededb7c0	Merge branch 'state-machine-improvements' into main	4 年前
kgc00	253b73a3	Merge remote-tracking branch 'upstream/main' into main	4 年前
kgc00	7b04a609	Merge branch 'main' into simple-menu-controls	4 年前
Ciro Continisio	7be88cca	Removed script Character, moved StateMachine SOs	4 年前
Ciro Continisio	383e85b3	Renamed variable in all Conditions and Actions	4 年前
Ciro Continisio	3db2e782	Added the ability to talk	4 年前
Ciro Continisio	7f5780ce	[Bot] Automated dotnet-format update	4 年前
rainaldisatria	a0293eb3	Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system	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 年前
treivize	df2ab2a2	Merge branch 'art-assets' into feature/art/slime_critter	4 年前
Ciro Continisio	c81112b1	Reworked all Actions and Conditions to take advantage of the refactor	4 年前
GitHub	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 年前
John McAllister	8c6e7df0	[Bot] Automated dotnet-format update	4 年前
Amel	cc52237b	Added isPickingUp SO condition to state machine	4 年前
GitHub	5c82e99e	Merge pull request #2 from UnityTechnologies/main import changes from main	4 年前
Dan Young	268ab82e	Merge remote-tracking branch 'upstream/art-assets' into art-assets	4 年前
Chema Damak	2051a72a	Adding interaction UI + Events	4 年前
Amel	2c9810c9	Merge branch 'main' into interaction	4 年前
Chema Damak	8a166bf0	Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction	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 年前
Dan Young	7ce66d74	Merge remote-tracking branch 'upstream/art-assets' into art-assets	4 年前
Amel Negra	a3fdb227	Merge branch 'main' into whiteboxing	4 年前
treivize	e5c1ed4b	Initial Plant Critter behaviour - Idle - Alert - Attack	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	c925b56b	Merge branch 'feature/code/plant_critter_sm' of https://github.com/treivize/open-project-1 into pr-bash	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	162a06e3	Refactoring, renaming, comments	4 年前
Ciro Continisio	84e76f64	Fixes, typos and tweaks	4 年前
Ciro Continisio	7c088a1f	Merge branch 'pr-bash' into main	4 年前
Ciro Continisio	154737ee	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	b8753400	Merge remote-tracking branch 'tech-mkt/main' into main	4 年前
uChema	c28d9833	Merge branch 'main' into QuestSystem	4 年前
GitHub	54f79bad	Added slime critter behavior (#312 ) * Slime Critter initial behavior * Added slime critter behavior	4 年前
Ciro Continisio	183fdac0	Merge remote-tracking branch 'tech-mkt/main' into main	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 年前
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 年前
Yohann Puyhaubert	ed7d963f	Added Player Cane Hit variant and enabling attack based on animation events	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 年前
Ciro Continisio	19c74b30	[Bot] Automated dotnet-format update	4 年前
Ciro Continisio	57258669	Merge branch 'main' into pr-bash	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 年前
Amel Negra	67e5ce82	Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main	4 年前
GitHub	c0b2931f	Merge pull request #1 from UnityTechnologies/main Update fork	4 年前
Amel	7b1ed2b2	Merge branch 'main' into UI	4 年前
Amel Negra	6dda5831	WIP talking condition for townsfolks	4 年前
Amel Negra	cef038ad	Now townsfolk possible to idle, walk, talk and choose behavior from MB	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	837dcf96	removed state machine added twice on prefab	4 年前
Amel Negra	bd7b83fa	Made Initial state an enum	4 年前
Amel Negra	1bdfb7ff	Added townsfolk walking condition	4 年前
Amel Negra	a186115b	Added IsInDialogue to step controller	4 年前
Amel Negra	b2351dfa	renamed InitialState variable	4 年前
Amel Negra	13e2f4ef	renamed initial state to state	4 年前
Amel Negra	d516a82f	Debugging agent issue not finding path	4 年前
Amel Negra	47a6b132	typo fix	4 年前
Amel Negra	b4c11041	Added is NPC saying line condition	4 年前
Amel Negra	3a9decf3	comment debug lines and push scene	4 年前
Amel Negra	017d02f4	Renamed all files to fit general NPC use instead of townsfolk	4 年前
Amel	4717e2f5	wip	4 年前
Amel Negra	3f4c581e	Added is path ready condition	4 年前
Amel Negra	1ce4260d	Fixed issue with reaching the waypoint	4 年前
Amel	320a8038	Adding jump up and down states for bard hare with their conditions and transitions	4 年前
Amel	03aa1941	wip fixing townsfolk state machine on talk and listen	4 年前
Amel	58d7262d	wip v2 townsfolk	4 年前
Amel	e5e6a42e	Townsfolk state machine V1	4 年前
Amel Negra	ce10fdea	Bard hare state machine working	4 年前
uChema	127bd54d	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	4 年前
Ciro Continisio	350159af	Merge branch 'main' into whiteboxing	4 年前
Amel Negra	75e90368	Adding new condition script for when a new line is displayed	3 年前
Amel Negra	eafd1d40	Adding Random time elapsed condition	3 年前
uChema	75076141	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
Ciro Continisio	e6dcfc27	Merge branch 'main' into whiteboxing	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 年前
Ciro Continisio	832dd088	Merge branch 'ciro'	3 年前
Ciro Continisio	256684a1	First frame error check	3 年前
uChema	d7205d06	Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP	3 年前
uChema	f26da778	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
uChema	97ccda6a	Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main	3 年前
itsLevi0sa	72ec616e	[Bot] Automated dotnet-format update	3 年前
Ciro Continisio	460fb941	Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding	3 年前
Ciro Continisio	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 年前
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	aa9e8032	Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into CaveWhiteboxing	3 年前
itsLevi0sa	340dd8dc	Merge branch 'main' into CaveWhiteboxing	3 年前
itsLevi0sa	0425b39f	[Bot] Automated dotnet-format update	3 年前
uChema	1d6b8128	Use Game States In State Machine	3 年前
Ciro Continisio	27ebfa55	Code formatting and tweaks	3 年前
Ciro Continisio	6b104b55	Mega code cleanup	3 年前

1 2 3

115 次代码提交 (main)