Ciro Continisio
6d1b63ae
Reorganising assets
4 年前
Ciro Continisio
a06f9b30
Sample scene
Prefab creation, fixed rotation issue
4 年前
Ciro Continisio
79a79de9
Imported Townsfolk, Pig Chick
More assets in the environment test scene
4 年前
Ciro Continisio
e87c5fdd
Model fixes
Fixed rotation of Walking Cane and Lantern, applied property to StoneCritter Prefab
4 年前
Ciro Continisio
f76bc5ce
Imported Townsfolk_F, Animations
4 年前
Ciro Continisio
e1f2b62c
Imported rigged RockCritter, renaming
4 年前
Ciro Continisio
03ff96ac
New test scenes
Big testing scene with Polybrush terrain, small test scene with just primitives
4 年前
Ciro Continisio
0ceeafd9
Refreshed Forest and Beach scenes
4 年前
Ciro Continisio
c28c6bc6
New Pig and RockCritter animations
4 年前
Ciro Continisio
e8f4a6e7
Imported BardHare
4 年前
Ciro Continisio
cd7fea82
Tweaks, cleaning
4 年前
Ciro Continisio
e155c0a6
Added camera dummy, fixed issue with player Prefab tag
4 年前
Ciro Continisio
ecf3b2ef
Art updates
Imported chest, fixed Phoenix Chick, fixed BardHare
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
e5e7acc6
Merge branch 'art-assets' into main
4 年前
kgc00
b06aad3e
updates
4 年前
Ciro Continisio
bbca6fd1
Imported rigged Phoenix Chick + 2 animations
4 年前
kgc00
f6474b49
undid prefab change
4 年前
treivize
e2449c18
[WIP] Plant Critter - Model UV Color Rig Animations
4 年前
Ciro Continisio
ededb7c0
Merge branch 'state-machine-improvements' into main
4 年前
treivize
245438bb
Fixed Fresnel effect done before outline and add water like movement
4 年前
treivize
612432c6
Added Slime Critters variants and final Toon_Fresnel Shader
4 年前
treivize
b5ba51b4
Added meshed eyes with animation for them
4 年前
treivize
d21bf195
Fix prefabs and FBX import
4 年前
kgc00
253b73a3
Merge remote-tracking branch 'upstream/main' into main
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 年前
Chema Damak
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
Ciro Continisio
3db2e782
Added the ability to talk
4 年前
rainaldisatria
a0293eb3
Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system
4 年前
Ciro Continisio
12f2649c
Talk animation re-implemented
4 年前
Ciro Continisio
3e2ad7f2
Integrated dust particles
4 年前
Ciro Continisio
11c7a35b
Pig chef fixed animations
4 年前
Ciro Continisio
99c4ccb4
Audio 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 年前
shuttle127
47c639cb
Create silhouette pass
Added some URP render features to silhouette characters when they're behind static scenery
4 年前
Ciro Continisio
09419cf4
Tweaks, dither shader
4 年前
Ciro Continisio
1d26bec4
Merge branch 'main' into state-machine-improvements
4 年前
treivize
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
Eduardo de Albuquerque
8845aa98
Merge branch 'main' into HollowBoatEffect
# Conflicts:
# UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset
# UOP1_Project/ProjectSettings/TagManager.asset
4 年前
Ciro Continisio
d9dd5e5e
Tweaked RenderFeatures
4 年前
Ciro Continisio
ded7ec7c
Merge branch 'feature/art/pant_critter' of https://github.com/treivize/open-project-1 into pr-bash
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 年前
GitHub
5a9a452f
Fix Plant Critter mesh scaling and name ( #239 )
4 年前
Ciro Continisio
101906b4
Townsfolk_M animations, Palm2
4 年前
Dane Byrd
bd72e4e6
Merge remote-tracking branch 'UnityTechnologies/art-assets' into art-assets
4 年前
Amel Negra
4687dbf1
Added interaction to main character prefab
4 年前
Amel Negra
1f2315aa
Added Rigidbody component to the Interaction GO on the pig
4 年前
Ciro Continisio
8da148bf
Introduced RuntimeAnchors
Used in Spawn and CameraSystem for decoupling purposes
4 年前
Amel
9918fbce
Interaction go on the pig is now a prefab
4 年前
Amel
582ea351
Added interaction events and updated interaction manager
4 年前
Ciro Continisio
d62d8e9e
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Prefabs/PrototypingTree.prefab.meta
# UOP1_Project/Assets/Samples.meta
# UOP1_Project/Assets/Samples/Polybrush.meta
# UOP1_Project/Assets/Samples/ProBuilder/4.4.0/Universal Render Pipeline Support/Material/ProBuilder Default URP.mat.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/CharController.unity.meta
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/CharController/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/Locations/Beach/LightingData.asset
# UOP1_Project/Assets/Scenes/TestingGround.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_optimized.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_opt...
4 年前
GitHub
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
4 年前
Ciro Continisio
443b4a6c
New FryKing animations and prefab
4 年前
Ciro Continisio
648aa035
First setup
4 年前
Amel
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Ciro Continisio
e7b2e446
New art assets
4 年前
Amel Negra
770c4301
setup IK for the pig on the arms
4 年前
Dan Young
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel
5418926e
added null check before event raise on interaction
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
ceeb6c1e
Added collider on bard hare prefab
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
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
4 年前
Ciro Continisio
86b055e0
Merge remote-tracking branch 'amel-unity/main' into pr-bash
4 年前
Ciro Continisio
2149cc50
AnimationRigging setup, lantern grab clip
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
e5c1ed4b
Initial Plant Critter behaviour - Idle - Alert - Attack
4 年前
lpchow
93934dc5
recreate SlimeCritter_Base prefab with the right SlimeCritter_Rig fbx
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
Art assets
4 年前
uChema
a16fe655
Dialogue And Quest Managers + Refractoring some scripts
4 年前
uChema
748ff00f
Add a quest, and test; WIP
4 年前
uChema
edca0f63
Rename Task to Step
4 年前
uChema
b2cf2c5b
Refractoring
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
162a06e3
Refactoring, renaming, comments
4 年前
Ciro Continisio
84e76f64
Fixes, typos and tweaks
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
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 年前
Ciro Continisio
49f39298
Imported new animations
4 年前
Ciro Continisio
6e1104f0
Merge branch 'pr-bash' 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 )
* 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
faf70fc8
Slime critter propel attack ( #315 )
4 年前
Amel Negra
361478ea
re added pick up event in interaction prefab
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 年前
uChema
837d24dd
Fix Shared Tables (Localization) conflict.
4 年前
Yohann Puyhaubert
07983754
Added Slime Critter droplets when moving
4 年前
Ciro Continisio
1bf52eb2
2.5D sounds on character
4 年前
Ciro Continisio
290cf250
Merge branch 'pr-bash' into main
4 年前
alex
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
Ciro Continisio
01f30d5a
Imported animations and art
4 年前
alex
9fd881be
Fix Interaction System doesn't follow the FSM
4 年前
alex
1dc5ecc0
Fix Interaction System doesn't follow the FSM
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 年前
alex
4ca519fc
Fix Interaction System doesn't follow the FSM
4 年前
Ciro Continisio
0d4b9d8a
Refactoring, moved items
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
761001e0
Merge branch 'art/slime-critter-droplet' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
3d347e8f
Slime droplets adjustments
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
uChema
7f7c4818
Fix Merge
4 年前
Chema Damak
fab44b36
Merge fixes completed
4 年前
Ciro Continisio
7cd4ce12
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
4 年前
GitHub
d07ee56f
Merge pull request #1 from UnityTechnologies/main
Latest changes
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
Yohann Puyhaubert
22788ea0
Included pathway component to edit PathwayConfigSO
4 年前
GitHub
c20ffd23
Added slash effect when player is triggering an attack ( #356 )
* Added slash effect when player is triggering an attack
* Corrected after merge from main
* renamed script to correct typing mistake
Co-authored-by: Amel Negra <amel.negra@unity3d.com>
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
70978d9d
Audio changes
4 年前
Ciro Continisio
07f4bf25
Music playing
4 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
Amel Negra
67e5ce82
Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main
4 年前
Ciro Continisio
e63ce59b
Lighting adjustments, probes
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
ccbaa8cd
Recreating clips with staff
4 年前
Ciro Continisio
148520ea
Animation tweaks
4 年前
Ciro Continisio
293f994f
Merge branch 'graphic-rework'
4 年前
uChema
997b50ae
Merge branch 'main' into pr/393
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
uChema
2a357495
Open/Close Inventory with Input system. No mouse needed
4 年前
uChema
e4b71f99
Add controls
4 年前
uChema
d1f0a9e1
Add healthbar logic
4 年前
uChema
2847ceef
Fix current questline + Add UI Healthbar into Game play scene
4 年前
Amel
b5d3a5bb
Townsfolks prefabs
4 年前
Ciro Continisio
49d768c5
Rebaked TestingGround and ArtShowcase
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
Ciro Continisio
f40bd45e
Phoenix Chick 2.0
4 年前
Amel Negra
051c3841
Adding townsfolk backup prefabs before merge
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
Ciro Continisio
8f5b1bdb
Refined PigChef animations
4 年前
Amel Negra
2e8f265c
After merge townsfolk back up
4 年前
Amel Negra
ebc69c75
New path configs for townsfolk walking
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
# Conflicts:
# UOP1_Project/Packages/manifest.json
4 年前
Amel Negra
c094f333
Merge branch 'main' into AmelMain
4 年前
Amel Negra
d0830611
Updating townsfolk prefab
4 年前
Amel Negra
e8da7a59
Adding intractable prefabs for townsfolk we can interact with
4 年前
Amel Negra
9a5842e7
removed not needed old prefabs
4 年前
Amel Negra
837dcf96
removed state machine added twice on prefab
4 年前
Amel Negra
aef41f89
All townsfolk are intractable (removed variant)
4 年前
Amel Negra
1bdfb7ff
Added townsfolk walking condition
4 年前
Amel Negra
1f8d4c95
Updated prefabs to add new event from step controller
4 年前
Amel Negra
84d448b1
Reordered Townsfolk M prefab components to match F prefab
4 年前
Amel Negra
ab253bb8
adjusting colliders so characters don't go through each other when talking
4 年前
Amel
86f9401b
Updating townsfolk prefabs to be prefab variants from fbx
4 年前
Amel
b1dc4e31
Added NPC script to Bard Hare
4 年前
Amel
30038c42
Bard hare Animator controller and Prefab update
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
079dfbbc
Rock Critter full prefab added
4 年前
Amel Negra
b506fbc5
renamed slime critter
4 年前
Amel Negra
7633b40d
pushing rock critter prefab
4 年前
Amel Negra
e0700a24
slowing walk speed for slime critter
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
52d6b39f
post merge bard hare fix
4 年前
uChema
52a617fe
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
946cf3fe
updating bard hare state machine with new changes from townsfolk v2 SM
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
2ad7557f
Added collider + NPC tag and needed components for Fry King prefab
4 年前
Amel Negra
f4f39c50
Adding Dialogue shot VCam for the different NPC prefabs
4 年前
Amel Negra
586b9eed
Added noise for dialogue shot cameras of NPCs
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
# 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
4 年前
Amel
33211714
Using new rock critter state machine on the prefab
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 Negra
31008d48
Added critter audio class to the plant critter prefab
4 年前
Amel
3765dafe
Adding critter audio script and its SOs to the slime critter prefab
4 年前
Amel
61430f4d
Adding audio critter script to 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
fbfa7e61
Adding NPC script to prefabs and assigned AudioCue SOs
4 年前
Amel Negra
68d32d66
Bard hare prefab update on audio
4 年前
Amel
4f16b6a2
pushing bard hare prefab after updating sounds
4 年前
Amel
43ef6d4e
Townsfolk F and M now talk as long as the animation plays
4 年前
Amel
fc682e87
Critter prefabs now use new sound config 3D
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 年前
Amel
bc98f737
Bard hare prefab after updates
4 年前
Amel
a0b65245
Dialogue shot tweaking
4 年前
Ciro Continisio
bbf35a4d
SFX tweaks
Volume adjustments, moved Audio listener to Protagonist
4 年前
Ciro Continisio
8d6a3cb2
Audio tweaks
4 年前
Ciro Continisio
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
4 年前
Ciro Continisio
38af1d45
PigChef tweaks
Added jump and land sfx
Jump animation now broken in 3 states (liftoff, in air, land)
Added extra late transition between cane swings, so the character is never waiting idle too long when the attack button is pressed
4 年前
uChema
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
uChema
d36df8f3
Adding save to disk on questline update
4 年前
Ciro Continisio
1b98a3e3
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
3 年前
Ciro Continisio
d2ffcb9e
Added IK and new animations for BardHare
Adeed IK to the legs
Created new Sing_Sitting and Sing_Sitting2 sing variations
Created a new Listening animation starting from a talk one
3 年前
Ciro Continisio
f8947aa6
Sound tweaks and timing
Tweaked SFX timing on animation clips
3 年前
Ciro Continisio
e25d45dc
Audio tweaks and reorganisation
Renamed some voice files (evidencing when short or long)
Reorganised protagonist GetHit and Die AudioCues
Created variations on GetHit
3 年前
uChema
0f212cd8
Add Questline Testing ground
3 年前
uChema
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
d8f2c2f3
Merge branch 'main' into ciro
3 年前
uChema
8a2721d9
Setting Questline + rename SO's files
3 年前
GitHub
06df8c3e
Add script to orient audio listener with the camera ( #457 )
* Add script to orient audio listener with the camera
* Use TransformAnchor to compute listener orientation
3 年前
uChema
e022f2ee
Rework on questline naming
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 年前
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
4413ebd5
Adding missing items + missing questline to a finite quest. Fixing errors.
Use TestingInventory with TestingGround_Questline scene to test the full quest
3 年前
Ciro Continisio
e7a11cf3
Interactables for Beach, Hill and Farms
3 年前
Ciro Continisio
ba483324
Ayud and Felfel looks
3 年前
Ciro Continisio
eee951e1
Farms
3 年前
Ciro Continisio
509b93fe
Removed ForestEntrance scene
3 年前
Ciro Continisio
a0a16da1
Scene work
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 年前
uChema
441fd47b
Add Mountain rock critter variant.
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 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
Ciro Continisio
984180df
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/61ff26a351934...
3 年前
Ciro Continisio
e0c72522
Fixed BardHare dialogue camera being on at all times
3 年前
Amel Negra
a676cd5d
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel Negra
a60d5a44
Adding Townsfolk NPCs prefab variants examples
3 年前
uChema
9f6faf19
Change default Dialogue for Bard hare in town
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel
38195933
Disable audio sfx events on animation during cutscenes
3 年前
Amel
de1dc005
Add game state to pig chef prefab
3 年前
Amel Negra
6790825d
Adding game state ref to Chef Comb and Bard Hare prefabs
3 年前
Ciro Continisio
c5f38fb8
Merge remote-tracking branch 'tech-mkt/main'
3 年前
Amel Negra
2f39fb35
NPCs examples accessories hierarchy order fixed
3 年前
Amel
ca019671
Disabled debug transition on pig chef
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
1ce93bca
Small fixes in Game State System
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
0a1c31a0
Add healthbar
3 年前
uChema
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
uChema
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
Amel
7b7510b3
Fix dialogue shots
3 年前
Amel Negra
667efa1d
Added farming animation with wip example
3 年前
Amel Negra
b8e46c19
New farming animation in-place with Timeline example
3 年前
uChema
57caaba3
Keep health between scenes
3 年前
uChema
5ad05c8e
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
uChema
94daf002
Restore health and Apply changes to MainMenuCanvas prefab
3 年前
Amel
cb4d2d6e
E interaction disabled during cutscenes
3 年前
Ciro Continisio
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
Ciro Continisio
534f3a7b
Fixes to ScriptableObjects values
3 年前
Ciro Continisio
6b104b55
Mega code cleanup
3 年前
Ciro Continisio
5af375fa
Various changes around health management
Fixed UIHealthBar reset hearts bug
Relocated UI event channels under the Health folder
Enemies no longer fire UpdateUI events
Fixed PigChef's missing sounds
3 年前