270 次代码提交 (84ae59c8-0622-436b-aaec-73b8c5cc4bce)

作者 SHA1 备注 提交日期
Ciro Continisio 6d1b63ae Reorganising assets 4 年前
Ciro Continisio a06f9b30 Sample scene 4 年前
Ciro Continisio 43ebc212 Art reorganisation and cleanup 4 年前
Ciro Continisio 79a79de9 Imported Townsfolk, Pig Chick 4 年前
Ciro Continisio fb97255e Moved art assets 4 年前
Ciro Continisio fb39de1a Expression test 4 年前
Ciro Continisio 8bcb0d29 Imported directions sign, removed no_eyes tests 4 年前
Ciro Continisio 9df0bbc8 Lowerpoly Townsfolk, imported Sitar 4 年前
Ciro Continisio 24cc8443 Added crunch compression to all textures + Preset 4 年前
Ciro Continisio f76bc5ce Imported Townsfolk_F, Animations 4 年前
Ciro Continisio e1f2b62c Imported rigged RockCritter, renaming 4 年前
Ciro Continisio 03ff96ac New test scenes 4 年前
Ciro Continisio c28c6bc6 New Pig and RockCritter animations 4 年前
Ciro Continisio 8504c55f PigChef plays idle and walk animations 4 年前
Ciro Continisio 38b89476 Added PostProcessing support 4 年前
Ciro Continisio f0dc54d3 Fix CM bug, tweaks 4 年前
Ciro Continisio e8f4a6e7 Imported BardHare 4 年前
Ciro Continisio ecf3b2ef Art updates 4 年前
Ciro Continisio e5e7acc6 Merge branch 'art-assets' into main 4 年前
Ciro Continisio bbca6fd1 Imported rigged Phoenix Chick + 2 animations 4 年前
treivize bb0dafff Added Slime Critter and new Toon shader to add Fresnel effect on it 4 年前
treivize e2449c18 [WIP] Plant Critter - Model UV Color Rig Animations 4 年前
treivize 245438bb Fixed Fresnel effect done before outline and add water like movement 4 年前
treivize 4b202e5f [WIP] Better UV, Rig and Texture 4 年前
treivize 612432c6 Added Slime Critters variants and final Toon_Fresnel Shader 4 年前
treivize 884f78d8 [WIP] Update animations Idle, Warn, Alert and Attack 4 年前
treivize 449795a4 Add latest texture 4 年前
treivize f1cf3605 Simplify Toon_Fresnel shader - move Direct Specular to Lightning Model 4 年前
treivize b5ba51b4 Added meshed eyes with animation for them 4 年前
treivize d21bf195 Fix prefabs and FBX import 4 年前
treivize 93d46d23 Added spawning, injured and faint animations to plant critter 4 年前
kgc00 253b73a3 Merge remote-tracking branch 'upstream/main' into main 4 年前
andytouch a397d578 Art: Added Detail Masks for Main Characters. Added DetailMaskTint Shader Graph. 4 年前
treivize 896fc63a Removed eyes from Plant Critter and set up a proper animator 4 年前
kgc00 7b04a609 Merge branch 'main' into simple-menu-controls 4 年前
treivize e9e05bd8 Updated Alert animation and clean up branch 4 年前
Ciro Continisio 7be88cca Removed script Character, moved StateMachine SOs 4 年前
Ciro Continisio 12f2649c Talk animation re-implemented 4 年前
Ciro Continisio 07d58711 Boat, Fry king 4 年前
Ciro Continisio 11c7a35b Pig chef fixed animations 4 年前
Ciro Continisio b5de134f New art demo scene 4 年前
Ciro Continisio ce5b07db Fry king in scene, Loading tweaks 4 年前
Ciro Continisio 05095f49 Merge remote-tracking branch 'tech-mkt/art-assets' into pr-bashing 4 年前
treivize 0728a4c6 Merge branch 'art-assets' into feature/art/pant_critter 4 年前
GitHub 14e737cc Merge pull request #1 from UnityTechnologies/art-assets 4 年前
treivize df2ab2a2 Merge branch 'art-assets' into feature/art/slime_critter 4 年前
Ciro Continisio ded7ec7c Merge branch 'feature/art/pant_critter' of https://github.com/treivize/open-project-1 into pr-bash 4 年前
Ciro Continisio 5dd0e2e5 Small tweaks to the material and animator 4 年前
Ciro Continisio 163fb9ae Merge branch 'feature/art/slime_critter' of https://github.com/treivize/open-project-1 into pr-bash 4 年前
Ciro Continisio 0661be42 Re-preffabbed the slimes 4 年前
Ciro Continisio 1413811f Material properties 4 年前
Ciro Continisio bd14256e Material and prefab tweaks 4 年前
GitHub 5a9a452f Fix Plant Critter mesh scaling and name (#239) 4 年前
GitHub 19a7c4c5 Upgrade to 2020.2.13b (#247) 4 年前
Ciro Continisio 101906b4 Townsfolk_M animations, Palm2 4 年前
Dane Byrd bd72e4e6 Merge remote-tracking branch 'UnityTechnologies/art-assets' into art-assets 4 年前
Dane Byrd 8ae0f49f Remove Albedo Influence on Specular Light Brightness 4 年前
Ciro Continisio e7641175 Merge branch 'art-assets' of https://github.com/daneobyrd/open-project-1 into daneobyrd-art-assets 4 年前
Ciro Continisio 019c7796 Merge branch 'art-assets' into main 4 年前
Amel 8c488723 updated pig chef animator controller for pick up animation 4 年前
Ciro Continisio d62d8e9e Merge branch 'main' into whiteboxing 4 年前
Ciro Continisio 443b4a6c New FryKing animations and prefab 4 年前
Ciro Continisio 648aa035 First setup 4 年前
Ciro Continisio e7b2e446 New art assets 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 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 2149cc50 AnimationRigging setup, lantern grab clip 4 年前
Ciro Continisio 1645ed7d Added BardHare and FryKing animations 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 年前
lpchow 9946260e Add anims for slimecritter, create animcontroller, update its prefab with latest rig 4 年前
treivize a4dc96e7 Initial Plant Critter combat system - Get Hit - Killed 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 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 6e9237b6 Walkling cane as weapon, tweaks to animations 4 年前
Ciro Continisio 7c088a1f Merge branch 'pr-bash' into main 4 年前
Ciro Continisio 1cd999fc Merge branch 'art-assets' of https://github.com/lpchow/open-project-1 into pr-bash 4 年前
Ciro Continisio 9429e445 Imported SlimeCritter animations 4 年前
GitHub 54240307 Devlog 3: Handling complex input (#307) 4 年前
Ciro Continisio c6c67ff0 New sound effects 4 年前
Ciro Continisio e05d8586 Tweaks to Pig's walk 4 年前
Ciro Continisio 49f39298 Imported new animations 4 年前
Ciro Continisio 6e1104f0 Merge branch 'pr-bash' into main 4 年前
Ciro Continisio 2fdc2b25 More animations 4 年前
Ciro Continisio 46a89483 More animations 4 年前
Ciro Continisio 71186bf9 Merge branch 'art-assets' into main 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 faf70fc8 Slime critter propel attack (#315) 4 年前
GitHub 71fe0c78 Update PigChef TransitionTable, Jumping and Sliding mechanics (#310) 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 年前
Yohann Puyhaubert 07983754 Added Slime Critter droplets when moving 4 年前
GitHub 81481d8b Merge pull request #4 from UnityTechnologies/main 4 年前
Ciro Continisio e5f66cfc Tweaks, removing doppler effect 4 年前
alex 2f536097 Merge remote-tracking branch 'upstream/main' into main 4 年前
Ciro Continisio 01f30d5a Imported animations and art 4 年前
Ciro Continisio e633636d More animations 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 e85967c7 Refined PigChef walk animation 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 年前
Ciro Continisio 761001e0 Merge branch 'art/slime-critter-droplet' of https://github.com/treivize/open-project-1 into pr-bash 4 年前
uChema 7ece782e Merge branch 'main' into QuestSystem 4 年前
Ciro Continisio ff1bfdd1 Imported new animations 4 年前
GitHub b5417125 Merge pull request #7 from UnityTechnologies/main 4 年前
Ciro Continisio 6acf65d7 Tweaked emission graph, added textures 4 年前
Yohann Puyhaubert 0b3da4fa Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement 4 年前
Ciro Continisio f023e9d4 Imported polished animations 4 年前
Ciro Continisio 7087fd8d Relocated source PSDs 4 年前
GitHub c20ffd23 Added slash effect when player is triggering an attack (#356) 4 年前
Bronson Zgeb a19b2328 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Ciro Continisio 2f0661e3 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Ciro Continisio 07f4bf25 Music playing 4 年前
Ciro Continisio 26ab9830 Fixed CaneSwing SFX, new toon Slash effect 4 年前
Yohann Puyhaubert 460eb34c Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement 4 年前
Ciro Continisio 91a763b7 Updated project to 2020 LTS 4 年前
Yohann Puyhaubert b7bb56dd Fix attack logic to consume attack from animation events 4 年前
uChema 7abf0997 WIP - UI Integration 4 年前
Ciro Continisio 09ce5d71 Tweaks 4 年前
Ciro Continisio 475acb43 Revised animations 4 年前
Ciro Continisio 16e743f5 Merge remote-tracking branch 'tech-mkt/main' into main 4 年前
Ciro Continisio 2eabe55e Outlines removed 4 年前
Amel Negra 5464088e Merge branch 'feature/combat-update-consume-input' into main 4 年前
GitHub c0b2931f Merge pull request #1 from UnityTechnologies/main 4 年前
Ciro Continisio ea50928b Character animations 4 年前
Ciro Continisio 31a3eba6 Character animations 4 年前
Ciro Continisio e81c0ea8 Material work 4 年前
Ciro Continisio 864de4dc Leftover files 4 年前
Brett 848058e8 Merge remote-tracking branch 'upstream/main' into main 4 年前
Ciro Continisio ccbaa8cd Recreating clips with staff 4 年前
Ciro Continisio 61a9901f Sub state machines 4 年前
Ciro Continisio 148520ea Animation tweaks 4 年前
Ciro Continisio 8e91ed4b Acceleration/Deceleration for character 4 年前
Ciro Continisio 293f994f Merge branch 'graphic-rework' 4 年前
GitHub 6f7ba06a Added L0D Models for Townsfolk (#394) 4 年前
Amel 77827673 Renamed LOD 4 年前
Ciro Continisio a1bec1ec Random idle for PigChef 4 年前
uChema 997b50ae Merge branch 'main' into pr/393 4 年前
Amel 7b1ed2b2 Merge branch 'main' into UI 4 年前
Amel 4857849f Added pigChef attack avatar mask 4 年前
Amel c17eea45 Added Upper-body attack layer to PigChef controller 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 年前
uChema 84d13891 Merge branch 'main' into UI 4 年前
Amel 551d6066 Working on Townsfolk Animator Controller 4 年前
Ciro Continisio f40bd45e Phoenix Chick 2.0 4 年前
Ciro Continisio 95e2789c Tweaked protagonist attack 4 年前
uChema e76a2bb9 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Ciro Continisio 0f056131 Improved pickup animation 4 年前
Amel Negra e0ede3d5 Merge branch 'main' into AmelMain 4 年前
Ciro Continisio 8f5b1bdb Refined PigChef animations 4 年前
Amel Negra 7004ced9 Updating townsfolk F and M prefabs 4 年前
uChema 3ce06cf5 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 203ad8de Renamed ''idle 2'' RockCritter animation to ''Alert '' 4 年前
uChema 167ca847 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Amel Negra 738b219b Adding exit to idle from talk in the Animator Controller 4 年前
Amel Negra ddcc378c Merge branch 'main' into AmelMain 4 年前
Amel Negra f71fd525 wip bard hare animator 4 年前
Amel Negra b770e356 bard hare animator controller 4 年前
Amel Negra 21715b8e bard hare animator controller 4 年前
Amel 30038c42 Bard hare Animator controller and Prefab update 4 年前
Amel 811a6012 Bard hare state machine wip 4 年前
Amel Negra ce10fdea Bard hare state machine working 4 年前
Amel Negra 8ff69edb Bard hare animator controller tweaking 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 abfb3081 Rock Critter Animator Override Controller 4 年前
Amel Negra db4289a0 removing old rock critter controller 4 年前
Amel Negra 5552969c adding attack in place anim to test for rock critter 4 年前
Amel Negra a1965f75 added events to attack anim 4 年前
Amel Negra 4d800711 replace with new attack anim on rock critter override controller 4 年前
Amel Negra 99871ed8 temporarily using the idle animation for the rock critter faint 4 年前
Amel Negra 0f2334d3 removing broken attack in place anim 4 年前
Amel Negra 6bb088d5 Attack animation works 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 c0a90df6 Rock critter keeps walk animation on alert 4 年前
uChema 52a617fe Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Amel Negra a83290a1 Bard Hare Animator Controller separating jump up and down from talk 4 年前
uChema 75076141 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Amel Negra ef760f6d Fry King Animator controller done 4 年前
Ciro Continisio e6dcfc27 Merge branch 'main' into whiteboxing 4 年前
Amel Negra 8d75ed88 Phoenix Chick Animator Controller 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 2897f987 Added revive trigger for Animator Controller to fit snooze state for Rock Critter 4 年前
Amel 73a43775 Critters state machines adjustments 4 年前
Amel 901da185 Renaming critter states to fit both slime and rock critters 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 年前
Amel 5fade22f Adding audio events for plant critter on fbx 4 年前
Amel 973f4804 Adding audio events to slime critter fbx 4 年前
Amel 90c6c12d Adding attack event for rock critter on animation (not fbx) since it's made in Unity 4 年前
Amel 681e36ce Adding audio events to fbxs on rock critter 4 年前
Amel Negra 7654f9e8 Merge remote-tracking branch 'amel-unity/main' into main 4 年前
uChema d0523373 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 4 年前
Amel Negra 50f5eeab Adding animation events for audio 4 年前
Amel 8f750556 Added getting hit and faint sounds for protagonist 4 年前
Amel 050b37e4 Updating bard hare with sing short and long sfx SOs and updated FBXs 4 年前
Amel 43ef6d4e Townsfolk F and M now talk as long as the animation plays 4 年前
Amel 29cb354f Legendary Chef now talk as long as the animation plays 4 年前
Amel de5ce681 Pig chef audio event added to fbx and pushing prefab 4 年前
Ciro Continisio 85c5bf58 Merge branch 'main' into worldbuilding 4 年前
Ciro Continisio 8167037b Worldbuilding 4 年前
Ciro Continisio c0958996 Updated project to 2020.3.12f1 3 年前
Ciro Continisio 38af1d45 PigChef tweaks 3 年前
uChema eab4c107 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
Ciro Continisio d2ffcb9e Added IK and new animations for BardHare 3 年前
Ciro Continisio f8947aa6 Sound tweaks and timing 3 年前
uChema b768a7dc Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
Ciro Continisio 44bdea11 Fixed landing SFX playing when attacking in the air 3 年前
uChema b4892bfe Merge with main 3 年前
Ciro Continisio e7a11cf3 Interactables for Beach, Hill and Farms 3 年前
Ciro Continisio ba483324 Ayud and Felfel looks 3 年前
Ciro Continisio 56d5c554 Tweaks to glow shader 3 年前
uChema 718b6321 Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
Amel Negra cdba81f2 Pushing animations, ACs and prefabs tweaked for cutscenes 3 年前
Amel Negra a156875a Merge remote-tracking branch 'origin/main' into main 3 年前
Amel Negra d9d8d631 Adding talk sfx events to pig chef talk clips 3 年前
uChema 02a13eae Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
Ciro Continisio 984180df Merge branch 'main' into worldbuilding 3 年前
Amel Negra a60d5a44 Adding Townsfolk NPCs prefab variants examples 3 年前
Amel c426ce61 Keeping only one event called for sfx during talk animations 3 年前
Amel e69dc93c Added start state to townsfolk AC 3 年前
Amel Negra e611f40c Adding rock critter snooze animation 3 年前
Amel Negra 42e6bd08 Adding phoenix chick nibbling and sneezing animations 3 年前
Amel Negra f6c9e887 Rock critter snooze state tweaking after animation integration 3 年前
Amel 1f2da108 Adding new celebration animations 3 年前
Amel 4b681a41 Adding more towsfolk variants for the crowd 3 年前
Amel Negra b3541b2e Updated townsfolk example prefab 3 年前
uChema 90cc66d9 Merge branch 'main' of https://github.com/uChema/open-project-1 into main 3 年前
uChema dc07bb35 Merge remote-tracking branch 'upstream/main' into main 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 92cb047d Merge remote-tracking branch 'upstream/main' into main 3 年前
Amel Negra c1cee660 Moved common F and M animations of townsfolk on a new folder 3 年前
Amel Negra 667efa1d Added farming animation with wip example 3 年前
Amel 2addb8d8 Added and integrated new attack animation for plant critter 3 年前
Amel Negra ec0654b5 Plant critter attack animation v2 integration 3 年前
Amel Negra b8e46c19 New farming animation in-place with Timeline example 3 年前
uChema 5ad05c8e Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main 3 年前
Ciro Continisio b74f3140 More Runtime Anchor refactoring, other SO additions 3 年前
Ciro Continisio c62d8542 Renamed all FryKing assets to LegendaryChef 3 年前
Ciro Continisio d1b015ee Removed empty layer on PigChef animator 3 年前