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

230 次代码提交 (381edcb3-70bd-4665-b438-495e5abb92c5)

作者 SHA1 备注 提交日期
Ciro Continisio 7be88cca Removed script Character, moved StateMachine SOs 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 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 4 年前
GitHub e09986b8 Merge branch 'main' into fix/object-pool 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 年前
Amel 4f58bf1c Added pick up sfx and play sound action 4 年前
Amel 775466b3 Added pick up state to the state machine 4 年前
Amel 54956501 pickUp state in states folder 4 年前
GitHub e9c2c909 State Machine - Proposed fix for Issue 228 (#227) 4 年前
Amel 6d8abc2f Added pickup state to state machine 4 年前
Amel c7031006 Added timer pick animation condition and is picking up condition 4 年前
Amel 6180d823 Added pick up trigger action to state machine 4 年前
GitHub 5c82e99e Merge pull request #2 from UnityTechnologies/main 4 年前
Dan Young 268ab82e Merge remote-tracking branch 'upstream/art-assets' into art-assets 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 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 e5c1ed4b Initial Plant Critter behaviour - Idle - Alert - Attack 4 年前
treivize a4dc96e7 Initial Plant Critter combat system - Get Hit - Killed 4 年前
uChema 79e39b28 Merging Dialogue branching to the Quest System. 4 年前
GitHub d0298f3d Merge pull request #3 from UnityTechnologies/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 4 年前
Ciro Continisio 162a06e3 Refactoring, renaming, comments 4 年前
Ciro Continisio 7c088a1f Merge branch 'pr-bash' into main 4 年前
treivize 5a7b97f4 Corrected plant critter state machine to be aligned with animator 4 年前
Ciro Continisio f2eeaad5 Merge remote-tracking branch 'treivize/bugfix/art/dying_animation_sequence' into pr-bash 4 年前
Ciro Continisio c6c67ff0 New sound effects 4 年前
uChema c28d9833 Merge branch 'main' into QuestSystem 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 4 年前
GitHub 71fe0c78 Update PigChef TransitionTable, Jumping and Sliding mechanics (#310) 4 年前
GitHub 1fa19316 StopMovement every update instead of on entering Idle State (#318) 4 年前
Ciro Continisio c691552b Merge branch 'pr-bash' into whiteboxing 4 年前
Dane Byrd c6beedc4 Merge branch 'art-assets' into ground_shader 4 年前
uChema 0f397e96 Merge branch 'main' into QuestSystem 4 年前
Ciro Continisio 5ca74ffe Beach and Glade midboxing 4 年前
Ciro Continisio a30ece4a Merge branch 'pr-bash' into art-assets 4 年前
GitHub 81481d8b Merge pull request #4 from UnityTechnologies/main 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" 4 年前
alex b13a4bdc Revert "Revert "Update JumpDescending.asset"" 4 年前
alex 47e372b5 Revert "Revert "Revert "Update JumpDescending.asset""" 4 年前
alex 4454ead8 Revert "Fixed Talk" 4 年前
alex df4724a0 Revert "Fix Input is cached when not immediately consumed by a State" 4 年前
alex e354a52a Revert "Fix Input is cached when not immediately consumed by a State for jump and attack" 4 年前
GitHub f91be74c Fix input caching (#339) 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 87e0c403 Combat System - Critter/CritterSO scripts refactor using state machine capabilities and adding config SO (#325) 4 年前
GitHub 762d050f Merge pull request #6 from UnityTechnologies/main 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 c0c06250 Merge branch 'minor-sm-changes' of https://github.com/DeivSky/open-project-1 into pr-bash 4 年前
Ciro Continisio 0d4b9d8a Refactoring, moved items 4 年前
Ciro Continisio b7e86dc9 Merge branch 'main' of https://github.com/AlexandreGheraibia/open-project-1 into main 4 年前
Ciro Continisio 3d4ab5fa Merge branch 'feature/combat-player-get-hit' of https://github.com/treivize/open-project-1 into pr-bash 4 年前
Ciro Continisio 7ea6bfdf Merge branch 'feature/player-cane-hit-anim-variant' of https://github.com/treivize/open-project-1 into pr-bash 4 年前
Ciro Continisio 28d4d3bb Attack system overhaul 4 年前
uChema 7ece782e Merge branch 'main' into QuestSystem 4 年前
Ciro Continisio 7cd4ce12 Merge remote-tracking branch 'tech-mkt/main' into pr-bash 4 年前
GitHub d07ee56f Merge pull request #1 from UnityTechnologies/main 4 年前
GitHub b5417125 Merge pull request #7 from UnityTechnologies/main 4 年前
Yohann Puyhaubert bf1a236b Added pathway NPC movement strategy 4 年前
Yohann Puyhaubert 023c872d Push missing FSM updates 4 年前
Yohann Puyhaubert 22788ea0 Included pathway component to edit PathwayConfigSO 4 年前
Yohann Puyhaubert 273993ab Made the handles pointing into the forward direction of the pathway 4 年前
Yohann Puyhaubert 9c4d30a1 Update combat SM 4 年前
Yohann Puyhaubert 6bee54e4 Update pathway config SO to work with the latest pathway editor changes 4 年前
Yohann Puyhaubert b7bb56dd Fix attack logic to consume attack from animation events 4 年前
Yohann Puyhaubert b1d0c051 Correction following Alexandre review 4 年前
Amel Negra 67e5ce82 Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main 4 年前
Amel Negra 5464088e Merge branch 'feature/combat-update-consume-input' into main 4 年前
GitHub c0b2931f Merge pull request #1 from UnityTechnologies/main 4 年前
uChema 31d75482 Add controls. Switch Quest/Questline.cs names. And Button add Questline , quests, step 4 年前
Ciro Continisio 7235809c Fixing small reimport issue 4 年前
Amel 7b1ed2b2 Merge branch 'main' into UI 4 年前
Amel 5a5a8fe6 Adding IdleAttacking and WalkAttacking states 4 年前
Amel 492c5d44 Added isSurprised bool paramater 4 年前
Amel 4a46ed5f ReceiveHit trigger instead of surprised 4 年前
Amel ce0fb799 Updated state machine for PigChef, now possible to attack and walk 4 年前
Amel d47144d0 removed old attack state 4 年前
Amel 72040b36 Getting hit update 4 年前
Amel 8c7c6a9c Now possible to jump and attack 4 年前
Amel Negra 75180244 Merge remote-tracking branch 'origin/main' into main 4 年前
Amel 0aba8b15 Adding townsfolk transition table 4 年前
uChema 84d13891 Merge branch 'main' into UI 4 年前
Amel 551d6066 Working on Townsfolk Animator Controller 4 年前
uChema 0ed45c81 Add Collectible Prefab 4 年前
Amel e3220202 Path config for townsfolk 4 年前
Ciro Continisio 2d718f1c Merge branch 'main' into vegetation-tweaks 4 年前
Amel 5932f40a Townsfolk state machine actions 4 年前
Amel db21d893 Townsfolk state machine conditions 4 年前
Amel d7692cb4 Townsfolk state machine states 4 年前
Amel Negra 6dda5831 WIP talking condition for townsfolks 4 年前
Ciro Continisio 0f056131 Improved pickup animation 4 年前
Amel Negra e0ede3d5 Merge branch 'main' into AmelMain 4 年前
Amel Negra cef038ad Now townsfolk possible to idle, walk, talk and choose behavior from MB 4 年前
Amel Negra ebc69c75 New path configs for townsfolk walking 4 年前
uChema 3ce06cf5 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
GitHub 0e084a6f [Bugfix] New condition prevents Critter from attacking when dialogue on (#420) 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 4 年前
Amel Negra c094f333 Merge branch 'main' into AmelMain 4 年前
Amel Negra 1bdfb7ff Added townsfolk walking condition 4 年前
Amel Negra a186115b Added IsInDialogue to step controller 4 年前
Amel Negra 0a180847 Adding talking to protagonist state and needed changes 4 年前
Amel Negra a63051d7 wip 4 年前
Amel Negra 1ef9d0d6 Added listen to protagonist state 4 年前
Amel Negra afdbf109 Townsfolk only talks 4 seconds and not forever (will make random later) 4 年前
Amel Negra b4c11041 Added is NPC saying line condition 4 年前
Amel Negra ddf9a4c3 updated listen to protagonist state 4 年前
Amel Negra 90d30530 State machine push for townsfolk 4 年前
Amel Negra e19def8e Adding listen state for pig chef and transitions for idle and talk 4 年前
Amel Negra 5654b107 removed unused start talking condition 4 年前
Amel Negra 017d02f4 Renamed all files to fit general NPC use instead of townsfolk 4 年前
Amel 4717e2f5 wip 4 年前
Amel Negra 63ddd52e Renamed file for more accuracy 4 年前
Amel Negra a6a0a2d3 is path ready condition asset 4 年前
Amel Negra 9171fe9b Tweaking path way config and add short path one for faster tests 4 年前
Amel Negra a3ca940f updating NPC SM to fix issue of never leaving listen state 4 年前
Amel Negra 234a0bb6 Reorganizing folders for common NPCs conditions, states and actions 4 年前
Amel Negra 9263b609 WIP bard hare state machine 4 年前
Amel 320a8038 Adding jump up and down states for bard hare with their conditions and transitions 4 年前
Amel b8505ee6 wip bard hare SM 4 年前
Amel 923825af updating actions so we it works with other NPCs 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 811a6012 Bard hare state machine wip 4 年前
Amel Negra b23afbae Updating talk state so it's independent from other states 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 d19ce419 Adding rock critter configs 4 年前
Amel Negra d77d34d4 Now we have 2 face protagonist actions specific to NPC and critters 4 年前
Amel Negra e0700a24 slowing walk speed for slime critter 4 年前
Amel Negra 348c8c14 Merge branch 'AmelMain' into main 4 年前
uChema c24dd21f Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Amel Negra ffaf578b Adding 3 new timers conditions for the townsfolk state machine 4 年前
Amel Negra 5a3c9f92 Is a new line displayed condition asset file 4 年前
Amel Negra 11d46cd3 Townsfolk updated state machine 4 年前
Amel Negra 946cf3fe updating bard hare state machine with new changes from townsfolk v2 SM 4 年前
Amel Negra 7251f071 Added Start and end conversation states 4 年前
Amel Negra 2a5bdc6d Jump up and down action for bard hare SM 4 年前
Amel Negra 8dcae7ea Adding animation timers conditions for jump up and down 4 年前
Amel Negra 75bbf9eb new updated bard hare SM 4 年前
Amel Negra f7ead9e8 updating scene after changes and adding new path config for townsfolk 4 年前
uChema 75076141 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Ciro Continisio e6dcfc27 Merge branch 'main' into whiteboxing 4 年前
Amel Negra a3194a18 Fry King state machine 4 年前
Amel Negra 177559b8 Make sure that protagonist stops attacking when dying 4 年前
Amel Negra 0b4f451f Merge branch 'AmelMain' into main 4 年前
uChema aa88e701 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Ciro Continisio 72d88c0d Merge branch 'main' into whiteboxing 4 年前
Amel bf0ea70e Fixed plant critter attack rotation 4 年前
Amel a42be588 Moving slime critter specific actions and states in separate folders 4 年前
Amel 1ab16620 Adding new snooze state with its actions and conditions for rock critter 4 年前
Amel 73a43775 Critters state machines adjustments 4 年前
Amel 9be5ccca Removed unneeded transition from slime critter state machine 4 年前
uChema ad0bf614 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Ciro Continisio 6bf9cfe1 Merge remote-tracking branch 'tech-mkt/main' 4 年前
Ciro Continisio 47ed0d6a Merge branch 'main' into worldbuilding 4 年前
uChema d36df8f3 Adding save to disk on questline update 4 年前
Ciro Continisio 1b98a3e3 Merge branch 'main' of github.com:UnityTechnologies/open-project-1 4 年前
GitHub 9fd51f47 Add camera shake on protagonist hit. (#454) 4 年前
Amel 3e9620c3 Bard hare state machine tweaks after animation updates 4 年前
Amel 01e75470 Tweaking end conversation state for BardHare SM 4 年前
Ciro Continisio a8343b05 Merge remote-tracking branch 'tech-mkt/main' 4 年前
Amel 8994f2dd Organized SM configs in folders 4 年前
Amel eab29e55 Smaller range for reward droppables when positioned 4 年前
Ciro Continisio 0727f56c Tweaked player movement speed 4 年前
uChema 0f212cd8 Add Questline Testing ground 4 年前
uChema b768a7dc Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Ciro Continisio d8f2c2f3 Merge branch 'main' into ciro 4 年前
uChema 8a2721d9 Setting Questline + rename SO's files 4 年前
Ciro Continisio b214f102 Work on character controller 4 年前
Ciro Continisio 5b2ff381 More tweaks to CC 4 年前
Ciro Continisio 832dd088 Merge branch 'ciro' 4 年前
Amel Negra bd15167a Added talk to Idle transition for pig chef 4 年前
uChema d7205d06 Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP 4 年前
uChema f26da778 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
uChema ad52a32a hot fixes - Questline integration 4 年前
uChema 6a1077d3 Create cutscenes dialogue 4 年前
uChema 4413ebd5 Adding missing items + missing questline to a finite quest. Fixing errors. 4 年前
Ciro Continisio 43f6f6f7 Merge branch 'main' into worldbuilding 4 年前
Ciro Continisio 056f6536 Merge branch 'main' into worldbuilding 4 年前
itsLevi0sa 340dd8dc Merge branch 'main' into CaveWhiteboxing 4 年前
Amel Negra fa8cc2af Added new path configs for slime critters on the Field_Farms scene 3 年前
Ciro Continisio 83ea7526 Merge branch 'main' into worldbuilding 3 年前
Amel 8b2d50b0 Add start state for townsfolks 3 年前
Amel Negra f6c9e887 Rock critter snooze state tweaking after animation integration 3 年前
Amel Negra 3cd151d4 Path config for going away during cutscene 3 年前
uChema 3faf99a1 Use the state machine to change Game State to and from Combat 4 年前
Greg Solo 73b4e5d8 Set game to combat state when critter detects player 4 年前
uChema 1d6b8128 Use Game States In State Machine 4 年前
uChema 1ce93bca Small fixes in Game State System 4 年前
uChema dc07bb35 Merge remote-tracking branch 'upstream/main' into main 3 年前
uChema 0a1c31a0 Add healthbar 3 年前
GitHub c0237ad9 Merge branch 'UnityTechnologies:main' into main 3 年前
uChema 378fc807 Merge branch 'main' of https://github.com/uChema/open-project-1 into main 3 年前
uChema 0e1137be Adding Icons + New Interaction system 3 年前
uChema 92cb047d Merge remote-tracking branch 'upstream/main' into main 3 年前
uChema 57caaba3 Keep health between scenes 3 年前
Ciro Continisio 7fdb5bae Merge branch 'main' into UI-icons 3 年前
Ciro Continisio ed9498cd Reorganised and renamed ScriptableObjects 3 年前
Ciro Continisio 534f3a7b Fixes to ScriptableObjects values 3 年前
Ciro Continisio b74f3140 More Runtime Anchor refactoring, other SO additions 3 年前
Ciro Continisio 6b104b55 Mega code cleanup 3 年前
Ciro Continisio 8bfcef97 StateAction and StateMachine improvements 3 年前
Ciro Continisio c62d8542 Renamed all FryKing assets to LegendaryChef 3 年前
Ciro Continisio 5af375fa Various changes around health management 3 年前