unity-tech-cn
/
open-project-1
40
21
派生 72
代码 合并请求 版本发布
1531 提交
7 分支
6 Plastic标签
目录树: b939ebb6
分支列表 标签列表
${ item.name }
创建分支 ${ searchTerm }
从 'b939ebb6'
${ noResults }

203 次代码提交 (b939ebb6-4b5b-45a6-a68c-6a18feaffa03)

作者 SHA1 备注 提交日期
Ciro Continisio 72d7c142 Character state machine 4 年前
Ciro Continisio 2cb26091 Tweaks and comments 4 年前
Ciro Continisio c9bcfaeb Merge branch 'DeivSky/state-machine' into main 4 年前
GitHub b5b57142 Added caching to the conditions for better performance (#164) 4 年前
Ciro Continisio 8504c55f PigChef plays idle and walk animations 4 年前
Ciro Continisio 6803546e [Bot] Automated dotnet-format update 4 年前
Ciro Continisio d8761506 Merge remote-tracking branch 'tech-mkt/main' into main 4 年前
kgc00 781633e3 Merge remote-tracking branch 'upstream/main' into main 4 年前
Ciro Continisio 7705382e Merge branch 'main' into state-machine-improvements 4 年前
kgc00 c4dabcbe merge 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 年前
Ciro Continisio ee1d998c AnimatorParameterActionSO and refactoring 4 年前
Ciro Continisio 3e2ad7f2 Integrated dust particles 4 年前
Ciro Continisio e7bdd126 [Bot] Automated dotnet-format update 4 年前
Ciro Continisio 0bcdfe44 Merge remote-tracking branch 'tech-mkt/main' into pr-bashing 4 年前
Ciro Continisio 5fcc526a Merge branch 'use-box-collider-for-pottery-objects' of https://github.com/mtakac/open-project-1 into main 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 4 年前
Ciro Continisio 82d4c4e3 Fixed framerate-dependent jump (?) 4 年前
Llaczky a05af5c2 Merge branch 'main' into art-assets 4 年前
GitHub e09986b8 Merge branch 'main' into fix/object-pool 4 年前
Ciro Continisio 1d26bec4 Merge branch 'main' into state-machine-improvements 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 年前
Ciro Continisio b9e24678 [Bot] Automated dotnet-format update 4 年前
GitHub 5fd25192 Added small internal cooldown to the PlayLandParticlesAction StateAction (#260) 4 年前
MTrecozzi c97e9c6b [Bot] Automated dotnet-format update 4 年前
GitHub e9c2c909 State Machine - Proposed fix for Issue 228 (#227) 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 4 年前
Ciro Continisio 9d3fb89a Merge remote-tracking branch 'tech-mkt/state-machine-improvements' into main 4 年前
Dan Young 268ab82e Merge remote-tracking branch 'upstream/art-assets' into art-assets 4 年前
rainaldisatria 3bf061d4 Use CustomBaseEditor class in AnimatorParameterActionSOEditor.cs 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 370a7993 Merge remote-tracking branch 'origin/main' 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 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 年前
David Henshaw 61abd62c Add feature controlling number of landing particles based on fall distance 4 年前
treivize e5c1ed4b Initial Plant Critter behaviour - Idle - Alert - Attack 4 年前
David Henshaw 2bf575bd Tweak Landing Particle effects 4 年前
treivize a4dc96e7 Initial Plant Critter combat system - Get Hit - Killed 4 年前
Ciro Continisio 48a39328 Merge remote-tracking branch 'davidhenshaw/main' into pr-bash 4 年前
Ciro Continisio 5efb9eed Tweaks to landing particles 4 年前
GitHub d0298f3d Merge pull request #3 from UnityTechnologies/art-assets 4 年前
HarshNarayanJha 06438a1a Pulled from upstream/main 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 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 1853f7ab Added Critter SO - Item drop when killed - FR critter names (#299) 4 年前
Amel Negra 01936592 Merge remote-tracking branch 'origin/art-assets' into main 4 年前
GitHub 54f79bad Added slime critter behavior (#312) 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 3 年前
GitHub 71fe0c78 Update PigChef TransitionTable, Jumping and Sliding mechanics (#310) 3 年前
Ciro Continisio c691552b Merge branch 'pr-bash' into whiteboxing 3 年前
Dane Byrd c6beedc4 Merge branch 'art-assets' into ground_shader 3 年前
uChema 0f397e96 Merge branch 'main' into QuestSystem 3 年前
Marc-Olivier 45cb9412 Add a Stop and Finish option for the AudioManager 3 年前
Ciro Continisio 4b1081d0 Merge branch 'AudioStop' of https://github.com/island212/open-project-1 into pr-bash 3 年前
Ciro Continisio 3f2b0d3c Merge branch 'create-editorBase-for-custom-inspector' of https://github.com/rainaldisatria/open-project-1 into main 3 年前
GitHub f91be74c Fix input caching (#339) 3 年前
alex 2f536097 Merge remote-tracking branch 'upstream/main' into main 3 年前
alex 9fd881be Fix Interaction System doesn't follow the FSM 3 年前
Ciro Continisio 38827f46 Merge remote-tracking branch '_tech-mkt/main' into main 3 年前
GitHub 87e0c403 Combat System - Critter/CritterSO scripts refactor using state machine capabilities and adding config SO (#325) 3 年前
alex ae4f635e Fix Fix Interaction System doesn't follow the FSM 3 年前
Yohann Puyhaubert 7418c9cd [Bot] Automated dotnet-format update 3 年前
GitHub 762d050f Merge pull request #6 from UnityTechnologies/main 3 年前
alex 90193b88 Revert "Fix Fix Interaction System doesn't follow the FSM" 3 年前
Yohann Puyhaubert a5261cf1 Combat System - Added player getting hit and killed states 3 年前
Smurjo df03afb9 Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main 3 年前
alex b4dda4f6 Fix Interaction System doesn't follow the FSM 3 年前
Ciro Continisio 1690f35f PigChef jump fixes, particles on jump liftoff 3 年前
Yohann Puyhaubert ed7d963f Added Player Cane Hit variant and enabling attack based on animation events 3 年前
Ciro Continisio b7e86dc9 Merge branch 'main' of https://github.com/AlexandreGheraibia/open-project-1 into main 3 年前
Ciro Continisio 3d4ab5fa Merge branch 'feature/combat-player-get-hit' of https://github.com/treivize/open-project-1 into pr-bash 3 年前
Ciro Continisio 7ea6bfdf Merge branch 'feature/player-cane-hit-anim-variant' of https://github.com/treivize/open-project-1 into pr-bash 3 年前
Ciro Continisio 28d4d3bb Attack system overhaul 3 年前
Ciro Continisio 19c74b30 [Bot] Automated dotnet-format update 3 年前
Ciro Continisio 57258669 Merge branch 'main' into pr-bash 3 年前
uChema 7ece782e Merge branch 'main' into QuestSystem 3 年前
uChema 7f7c4818 Fix Merge 3 年前
uChema dd1963d1 [Bot] Automated dotnet-format update 3 年前
Ciro Continisio 7cd4ce12 Merge remote-tracking branch 'tech-mkt/main' into pr-bash 3 年前
GitHub d07ee56f Merge pull request #1 from UnityTechnologies/main 3 年前
GitHub b5417125 Merge pull request #7 from UnityTechnologies/main 3 年前
Yohann Puyhaubert bf1a236b Added pathway NPC movement strategy 3 年前
GitHub c20ffd23 Added slash effect when player is triggering an attack (#356) 3 年前
Bronson Zgeb a19b2328 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
Ciro Continisio 2f0661e3 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
Yohann Puyhaubert 460eb34c Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement 3 年前
Yohann Puyhaubert 6bee54e4 Update pathway config SO to work with the latest pathway editor changes 3 年前
Yohann Puyhaubert b7bb56dd Fix attack logic to consume attack from animation events 3 年前
Amel Negra 67e5ce82 Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main 3 年前
Amel Negra 5464088e Merge branch 'feature/combat-update-consume-input' into main 3 年前
GitHub c0b2931f Merge pull request #1 from UnityTechnologies/main 3 年前
Amel 7b1ed2b2 Merge branch 'main' into UI 3 年前
Amel Negra df409c61 typo fix 3 年前
uChema 84d13891 Merge branch 'main' into UI 3 年前
uChema 0ed45c81 Add Collectible Prefab 3 年前
uChema 20cfec67 clean up folders 3 年前
Ciro Continisio 2d718f1c Merge branch 'main' into vegetation-tweaks 3 年前
Amel Negra 6dda5831 WIP talking condition for townsfolks 3 年前
Amel Negra e0ede3d5 Merge branch 'main' into AmelMain 3 年前
Amel Negra cef038ad Now townsfolk possible to idle, walk, talk and choose behavior from MB 3 年前
GitHub 0e084a6f [Bugfix] New condition prevents Critter from attacking when dialogue on (#420) 3 年前
uChema 6ddc6d14 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
Ciro Continisio bc17972b Merge branch 'main' into iet 3 年前
Amel Negra c094f333 Merge branch 'main' into AmelMain 3 年前
Amel Negra 837dcf96 removed state machine added twice on prefab 3 年前
itsLevi0sa 5a4b5e30 [Bot] Automated dotnet-format update 3 年前
Amel Negra bd7b83fa Made Initial state an enum 3 年前
Amel Negra 1bdfb7ff Added townsfolk walking condition 3 年前
Amel Negra a186115b Added IsInDialogue to step controller 3 年前
Ciro Continisio 76cc2e8b Merge branch 'ForestMaze' of https://github.com/itsLevi0sa/open-project-1 into whiteboxing 3 年前
Amel Negra b2351dfa renamed InitialState variable 3 年前
Amel Negra 13e2f4ef renamed initial state to state 3 年前
Amel Negra d516a82f Debugging agent issue not finding path 3 年前
Amel Negra 47a6b132 typo fix 3 年前
Amel Negra 8257591d Store rotation before facing protagonist to use it after dialogue 3 年前
Amel Negra b4c11041 Added is NPC saying line condition 3 年前
Amel Negra 3a9decf3 comment debug lines and push scene 3 年前
Amel Negra 017d02f4 Renamed all files to fit general NPC use instead of townsfolk 3 年前
Amel 4717e2f5 wip 3 年前
Amel Negra 3f4c581e Added is path ready condition 3 年前
Amel Negra e3126f25 Setting the right initial value for the way point index + added comments/renaming for clarity 3 年前
Amel Negra 1ce4260d Fixed issue with reaching the waypoint 3 年前
Amel 320a8038 Adding jump up and down states for bard hare with their conditions and transitions 3 年前
Amel 03aa1941 wip fixing townsfolk state machine on talk and listen 3 年前
Amel 58d7262d wip v2 townsfolk 3 年前
Amel e5e6a42e Townsfolk state machine V1 3 年前
Amel Negra c95b063c waypoint index initial value 3 年前
Amel Negra ce10fdea Bard hare state machine working 3 年前
Amel Negra 8151f1b5 Merge remote-tracking branch 'origin/main' into AmelMain 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 d77d34d4 Now we have 2 face protagonist actions specific to NPC and critters 3 年前
Amel Negra 348c8c14 Merge branch 'AmelMain' into main 3 年前
uChema c24dd21f Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
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 年前
Amel 9a3e73a6 Added reset health SO action 3 年前
uChema ad0bf614 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
Ciro Continisio 6bf9cfe1 Merge remote-tracking branch 'tech-mkt/main' 3 年前
Ciro Continisio 47ed0d6a Merge branch 'main' into worldbuilding 3 年前
GitHub 9fd51f47 Add camera shake on protagonist hit. (#454) 3 年前
uChema b768a7dc Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
uChema 8a2721d9 Setting Questline + rename SO's files 3 年前
GitHub a98c8e7f Fixed jump attack particle bug (#464) 3 年前
Amel Negra 42ba5e06 Merge remote-tracking branch 'origin/main' into AmelMain 3 年前
uChema b4892bfe Merge with main 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" 3 年前
Ciro Continisio 056f6536 Merge branch 'main' into worldbuilding 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 3faf99a1 Use the state machine to change Game State to and from Combat 3 年前
Greg Solo 73b4e5d8 Set game to combat state when critter detects player 3 年前
uChema 1d6b8128 Use Game States In State Machine 3 年前
uChema 0a1c31a0 Add healthbar 3 年前
uChema 0e1137be Adding Icons + New Interaction system 3 年前
uChema f29c7129 Add Icons placeholders - Set Game Scene UI - Add Aggro System 3 年前
GitHub 14e342ab Update summary of ChangeGameStateActionSO.cs (#496) 3 年前
Ciro Continisio 27ebfa55 Code formatting and tweaks 3 年前
Ciro Continisio 313f8a7f Code cleanup, refactored Anchors to be generic 3 年前
Ciro Continisio c284ce4c Reorganised editor tools, added ReadOnly attribute 3 年前
Ciro Continisio 6b104b55 Mega code cleanup 3 年前
Ciro Continisio 8bfcef97 StateAction and StateMachine improvements 3 年前
Ciro Continisio 5af375fa Various changes around health management 3 年前