Ciro Continisio
6d1b63ae
Reorganising assets
4 年前
Ciro Continisio
55d5d2a4
Merge branch 'main' into art-assets
# Conflicts:
# UOP1_Project/Assets/Art/Characters/PhoenixChick.meta
# UOP1_Project/Assets/Cutscenes.meta
# UOP1_Project/Assets/Cutscenes/ExampleCutscene.playable.meta
# UOP1_Project/Assets/Materials/Debug_Semitransparent.mat.meta
# UOP1_Project/Assets/Materials/Obstacles_Blue.mat.meta
# UOP1_Project/Assets/Prefabs/GameplayEssentials.meta
# UOP1_Project/Assets/Prefabs/Input Reader.asset
# UOP1_Project/Assets/Prefabs/Input Reader.asset.meta
# UOP1_Project/Assets/Prefabs/Pig.prefab
# UOP1_Project/Assets/Presets.meta
# UOP1_Project/Assets/Presets/Defaults.meta
# UOP1_Project/Assets/Scenes/CharController.unity
# UOP1_Project/Assets/ScriptableObjects.meta
# UOP1_Project/Assets/ScriptableObjects/Input Reader.asset
# UOP1_Project/Assets/ScriptableObjects/Input Reader.asset.meta
# UOP1_Project/Assets/ScriptableObjects/Input/InputReader.asset
# UOP1_Project/Assets/ScriptableObjects/Input/InputReader.asset.meta
# UOP1_Project/Assets/Settings/Presets.meta
# ...
4 年前
Ciro Continisio
8504c55f
PigChef plays idle and walk animations
Created action to set a bool parameter on the state machine
4 年前
Ciro Continisio
1ee5259e
Merge branch 'main' into big-merge
4 年前
Ciro Continisio
bed528b4
Merge branch 'main' into big-merge
4 年前
Ciro Continisio
f0dc54d3
Fix CM bug, tweaks
4 年前
Ciro Continisio
ededb7c0
Merge branch 'state-machine-improvements' into main
4 年前
Chema Damak
597b3f7b
Merge branch 'localization' into main
4 年前
Ciro Continisio
d14b0e45
Cleanup
4 年前
Ciro Continisio
7be88cca
Removed script Character, moved StateMachine SOs
4 年前
Marek Takac
c91c9d5b
Added Sliding to JumpDescending protagonist transition
4 年前
Chema Damak
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
Ciro Continisio
3db2e782
Added the ability to talk
4 年前
Ciro Continisio
58d65aa2
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
4 年前
rainaldisatria
a0293eb3
Merge remote-tracking branch 'upstream/main' into branching-feature-in-dialogue-system
4 年前
Ciro Continisio
72550bc5
Merge branch 'add-sliding-to-jump-descending-transition' of https://github.com/mtakac/open-project-1 into pr-bashing
# Conflicts:
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Idle.asset
4 年前
Ciro Continisio
12f2649c
Talk animation re-implemented
4 年前
Ciro Continisio
3e2ad7f2
Integrated dust particles
4 年前
Ciro Continisio
f8f9e0b0
Event system refactoring
4 年前
Ciro Continisio
99c4ccb4
Audio functionality
4 年前
Ciro Continisio
ce5b07db
Fry king in scene, Loading tweaks
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
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 年前
jandd661
baff1741
Proposed fix for issue #229 with test scenes
4 年前
jandd661
b7efdfcb
Revert "Proposed fix for issue #229 with test scenes"
This reverts commit 14a6a3a062c3979cf9fef8d3b156c560f6fcd27b.
4 年前
jandd661
89044d84
Revert "Revert "Proposed fix for issue #229 with test scenes""
This reverts commit 3e9fb2d2aaf01d1a054e2e9f18a8f37540a888a8.
4 年前
jandd661
3ee06ccf
Update Beach Scene with test data
4 年前
jandd661
dfb183ee
Revert "Update Beach Scene with test data"
This reverts commit 90ac457d70ca678160e42ea1c3dc637709748cc1.
4 年前
Ciro Continisio
c1fe908d
Fixes to example, moved files in Examples folder
4 年前
Ciro Continisio
c81112b1
Reworked all Actions and Conditions to take advantage of the refactor
4 年前
Amel Negra
38e2201e
Added events for pickup, cook and talk
4 年前
Amel Negra
9182a86c
Added interaction example scene
4 年前
Jan Urbanec
347a978e
Initial decoupling of CameraManager and SpawnSystem. Spawn system still needs reference to CameraManager, because it must provide it to Protagonist.
4 年前
Ciro Continisio
2ced0ef9
Added description to EventChannels
4 年前
Ciro Continisio
8da148bf
Introduced RuntimeAnchors
Used in Spawn and CameraSystem for decoupling purposes
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 )
* 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 年前
Amel
582ea351
Added interaction events and updated interaction manager
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 年前
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 年前
Amel
3357822c
start talking interaction event name updated
4 年前
Amel
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Amel
8d423ac9
post merge fixes
4 年前
Chema Damak
8871d820
Changed Events to Event Channels
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
f8264168
updated event name for interaction ended
4 年前
uChema
6434aa7b
Renaming and cleaning folders
4 年前
Amel Negra
96e4f244
Merge remote-tracking branch 'origin/interaction' 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 年前
GitHub
78c0f11a
"Editor window to quickly open scenes" task ( #267 )
* Added the Quick Scene Access Tool
* removed unused file
4 年前
Ciro Continisio
cdab9c20
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
2a0d8691
Merge branch 'main' into pr-bash
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 年前
GitHub
3b36c936
Making GameSceneSO more reliable ( #265 )
* Use more reliable SceneAsset instead of error-prone scene name
This also makes a custom editor unnecessary
* Set proper SceneAssets and serialize
* Improve code readability by splitting runtime and editor parts
* Fix scene path not being retrieved when entering play mode in Editor
* Use scene path instead of name
* Reset to default value
For a case when domain was not reloaded after entering play mode
4 年前
treivize
e5c1ed4b
Initial Plant Critter behaviour - Idle - Alert - Attack
4 年前
treivize
a4dc96e7
Initial Plant Critter combat system - Get Hit - Killed
4 年前
HarshNarayanJha
4e2ef8cc
Pulled from upstream/main
4 年前
uChema
79e39b28
Merging Dialogue branching to the Quest System.
4 年前
uChema
c852ab5b
Update Cutscenes to use Event Channels
4 年前
uChema
c128feff
Fix Dialogue branching and add UI
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 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
uChema
01c0ef6b
Modify Quest1
4 年前
Amel Negra
d485d9c8
Added ToggleLoadingScreen event channel
4 年前
Amel Negra
645a2f43
Added Gameplay and PersistentManagers scenes SO
4 年前
Amel Negra
f86d071b
Added LoadMenu specific channel
4 年前
Amel Negra
35619468
Added onSceneReady event to inform when scene is loaded and set active
4 年前
Amel Negra
d00568b8
Added the event for editor initializer and updated prefabs to ref it
4 年前
Amel Negra
a6b2a938
Using bool instead of event because on the same GO
4 年前
Amel Negra
e8d73e33
Merge branch 'scenes-re-architecture' into main
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
7c088a1f
Merge branch 'pr-bash' into main
4 年前
GitHub
fb323a77
Allow multiple entry/exit points in Locations ( #284 )
* added support for multiple entry/exit points using PathSO
* + added entrance & exit in TestingGround scene going to the Beach scene
* + LocationExit: renamed a private method
* Added spawn location tag
* Added tag to entrances in different locations
* Find entrances with tag before spawning
* Added array initialization
* Made entrance a prefab
Co-authored-by: Amel Negra <amel.negra@unity3d.com>
4 年前
treivize
5a7b97f4
Corrected plant critter state machine to be aligned with animator
Sometimes when giving the last hit to the plant critter, it happens that the plant is killed without playing the expected animations.
I have just figured out what is going wrong, the attack state in plant critter state machine has transition to dying state, so it happens that the state machine is ahead compare to the animator so some animations are missed. I am removing these transitions (Attack to Dying and Fighting to Dying, and adding BeenHit to Dying)
4 年前
GitHub
f5865370
Scene Selector window ( #285 )
* changed input phase check to match best practices
* menu input
- handles keyboard + gamepad inputs
- handles mouse inputs
- created component to place on selectable UI elements to register them
as a pointer enter/exit receiver
- updated inputreader to contain menu inputs as well
- updated input actions to contain new menu inputs
* updates
* debug
* docs
* removed ununsed var
* doc
* found fix for todo #2
* added to component menu
* was able to fix edge case #1
* doc
* updates
* undid prefab change
* merged in main, added menu prefab to asset database
* removed action asset reference in event system on prefab
* readme
* menu prefab into scene
* updated readme
* removed call to base.onenter in CC button to simplify selection logic
* Use more reliable SceneAsset instead of error-prone scene name
This also makes a custom editor unnecessary
* Set proper SceneAssets and serialize
* ...
4 年前
Amel Negra
1d6f6e82
Added initialization scene to its SO
4 年前
Ciro Continisio
f2eeaad5
Merge remote-tracking branch 'treivize/bugfix/art/dying_animation_sequence' 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 年前
Amel Negra
5908e6d7
Added description for initialization scene
4 年前
Amel Negra
23a23d5d
small tweaks on scenes
4 年前
Ciro Continisio
49f39298
Imported new animations
4 年前
IroncladLandship
ac869e64
UI Fade in and out code and implementation
This implements the UI fader to black card using events and scriptable objects. To use, add a FadeChannelSO to the relevant script, assign the scriptable object, the call either Fade, FadeIn, or FadeOut. Has parameters for duration and target color. This is usable anywhere and at any time, but contains no safeguards besides preventing multiple fades from happening at the same time.
Note: This modifies the PersistentManagers scene and adds an Image UI element that it depends on.
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 年前
uChema
964f7361
New Quest System with Questlines
4 年前
Ciro Continisio
183fdac0
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
uChema
4e8cb14b
Replace Dialogue lines with Localized string, Fix Quest System with questline
4 年前
Dan Young
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
uChema
3ab7bd4b
Remove test questline
4 年前
uChema
b48675a8
Add italian locale
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 年前
GitHub
1fa19316
StopMovement every update instead of on entering Idle State ( #318 )
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
Ciro Continisio
1c9c17d2
Reorganisation
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 年前
uChema
837d24dd
Fix Shared Tables (Localization) conflict.
4 年前
Ciro Continisio
a30ece4a
Merge branch 'pr-bash' into art-assets
4 年前
GitHub
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
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"
This reverts commit e27436f12646bb3a6d3869f4ab41da6ea4521d81.
4 年前
Ciro Continisio
e5f66cfc
Tweaks, removing doppler effect
4 年前
alex
b13a4bdc
Revert "Revert "Update JumpDescending.asset""
This reverts commit 719a1305ea51f3eff310efcbc1c2128db8e35db4.
4 年前
alex
47e372b5
Revert "Revert "Revert "Update JumpDescending.asset"""
This reverts commit 6ad2c966a59dd8753d2727474d57777d4e8994a9.
4 年前
alex
4454ead8
Revert "Fixed Talk"
This reverts commit ea98412739eb79be71ed494a399ef730ce020101.
4 年前
alex
df4724a0
Revert "Fix Input is cached when not immediately consumed by a State"
This reverts commit 2da91014e3a14a3a81ed65d87357eda43c855bdb.
4 年前
alex
e354a52a
Revert "Fix Input is cached when not immediately consumed by a State for jump and attack"
This reverts commit 7e41a5097458eeb6ce0908ef69eebc92587e4217.
4 年前
GitHub
f91be74c
Fix input caching ( #339 )
* StopMovement every update instead of on entering Idle State
* Fix input caching
A simple fix using coroutines to clear any cached input the frame after it was trigggered.
* Added Action to clear input cache
Reverted the changes to `Protagonist.cs` and `InteractionManager.cs` that were made to clear the input cached and instead put it all together in a single Action and added it to the Idle and Walking states.
* [Bot] Automated dotnet-format update
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 )
* 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 年前
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
# 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
b0118308
Merge branch 'main' of https://github.com/ZombieNub/open-project-1 into pr-bash
4 年前
Ciro Continisio
c799113a
Small tweaks to UI Fader
Still not functional
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
334de1f1
Part 1
4 年前
Ciro Continisio
76ed440e
AddressableAsset settings
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
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 年前
Ciro Continisio
953afd39
Merge branch 'loading-refactor' into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/GameplayEssentials/SceneLoader.prefab
4 年前
Bronson Zgeb
451b07c9
Basic structure for saving location to a file
Added a Uuid type and drawer
Removed saving TestScript
Added a Database and Desc type to reference other SOs by UUID
When it comes to serializing data (scenes and items for example) it's much simpler to be able to reference everything by a UUID and to be able to easily look them up in a table.
Added a uuid to the LocationSOs and put them in a DB
Converted SaveSystem into a SO. Removed test vars from Save.
4 年前
Ciro Continisio
94a617c8
Reorganising SceneDataSOs
4 年前
Ciro Continisio
8fec9425
Loading tool refactor
Scenes load in groups in the editor. It's now possible to start from an arbitrary scene but not move between scenes afterwards
4 年前
Ciro Continisio
970e5671
Merge branch 'main' into pr-bash
# Conflicts:
# UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Beach.asset
# UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Forest.asset
# UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Glade.asset
# UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/LocationSO.cs
4 年前
Bronson Zgeb
a45a7dd8
Added a SerializableScriptableObject to store asset GUID.
This replaces the previous serialization code. We can use the cached asset GUID to serialize assets to disk as well as load them through the Addressables system.
4 年前
Bronson Zgeb
9b794d57
Added ItemStack Serialization on Save
4 年前
Bronson Zgeb
4d990a64
Refactored the SerializedSO
4 年前
Bronson Zgeb
253267ff
Save Data when you add or remove an item
4 年前
Ciro Continisio
2f0661e3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
GitHub
a16c268f
Town Whiteboxing ( #384 )
Created a Town Folder inside the Whiteboxing Folder, with the scene/materials/script and lightmap data inside. Also added a SceneDataSO named Town in the SceneData>Locations folder.
4 年前
Bronson Zgeb
80efbc3c
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
70978d9d
Audio changes
4 年前
Amel Negra
2e6b1d55
Merge remote-tracking branch 'origin/main' into main
4 年前
Ciro Continisio
07f4bf25
Music playing
4 年前
Ciro Continisio
f6f1ad38
Fixes on the AudioManager, music in the Main Menu
4 年前
uChema
3d4fdc12
UI Integration (WIP)
4 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
uChema
7321e9d0
UI Integration (WIP)
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 年前
uChema
5bb0b53c
Fixing some UIs / Adding localized preview image for the items
4 年前
uChema
627867d3
UI Tweeks + some items descriptions
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
Update fork
4 年前
uChema
31d75482
Add controls. Switch Quest/Questline.cs names. And Button add Questline , quests, step
4 年前
uChema
e492f068
Clean project and add folder creation.
4 年前
Ciro Continisio
7235809c
Fixing small reimport issue
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
uChema
27225bd9
Fix localization error
4 年前
uChema
09ec279d
Fix Input when closing Inventory
4 年前
Ciro Continisio
0509be25
Refactored the whole cold startup mechanism
4 年前
Amel
5a5a8fe6
Adding IdleAttacking and WalkAttacking states
4 年前
Amel
492c5d44
Added isSurprised bool paramater
4 年前
uChema
e4b71f99
Add controls
4 年前
Amel
4a46ed5f
ReceiveHit trigger instead of surprised
4 年前
uChema
5d435a5e
Merge branch 'main' into UI
4 年前
Amel
ce0fb799
Updated state machine for PigChef, now possible to attack and walk
4 年前
Amel
d47144d0
removed old attack state
4 年前
uChema
5c109f22
Fix Items / Condense Localization tables. NB : Quests are not working anymore
4 年前
uChema
86db6931
Rename Quest Data to quest manager + Add Game Manager
4 年前
Amel
72040b36
Getting hit update
4 年前
Amel
8c7c6a9c
Now possible to jump and attack
4 年前
uChema
0fcc4c17
Fix last commit
4 年前
Amel Negra
75180244
Merge remote-tracking branch 'origin/main' into main
4 年前
uChema
0db80293
Change disabled and Selected button graphics. Add reset UI when reloaded
4 年前
uChema
d1f0a9e1
Add healthbar logic
4 年前
uChema
2847ceef
Fix current questline + Add UI Healthbar into Game play scene
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 年前
uChema
20cfec67
clean up folders
4 年前
Amel
e3220202
Path config for townsfolk
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
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
Fine tuned state machine timing, added Pickup to Idle transition in Animator
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 )
* 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 年前
uChema
cf9b5d2c
WIP Settings menu
4 年前
uChema
b52c1a1f
Add UI to Main Menu + Add Popup + Working on Settings
4 年前
uChema
30ea906a
Add close button to Settings and Credits screens
4 年前
uChema
78eac924
Pause Screen
4 年前
uChema
7828a4fe
Asset folder Clean up
4 年前
uChema
c3699920
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
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 年前
Ciro Continisio
4c903dff
Whiteboxing master scene v1
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
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
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
54cb5ca0
Rock Critter egg png icon
4 年前
Amel Negra
8965948b
Rock Critter egg prefab and
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 年前
Amel Negra
c7f86452
Merge remote-tracking branch 'origin/main' into main
4 年前
uChema
c24dd21f
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
4a525440
Scene separated
4 年前
Ciro Continisio
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
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 年前
uChema
9e6b5587
Remove unused Events
4 年前
uChema
e132a119
Add a StepToDialogue function to the StepSO. Fix preview display in the Quest tool
4 年前
Ciro Continisio
e6dcfc27
Merge branch 'main' into whiteboxing
4 年前
Amel Negra
49e49849
Adding to Localized tables Fry King actor and dialogue to test
4 年前
Amel Negra
a3194a18
Fry King state machine
4 年前
Amel Negra
65d30a33
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
Amel Negra
36cba268
Fixed Fry King dialogue typo
4 年前
Amel Negra
4ac06b52
Merge remote-tracking branch 'origin/main' into AmelMain
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
# 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
bf0ea70e
Fixed plant critter attack rotation
4 年前
uChema
50525348
Fix Quest Tool : Add Remove buttons and AddDialogue Buttons
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
8b7ce38c
Create questlines
4 年前
Amel Negra
44d7891f
Moving audio SO of protagonist to a new folder
4 年前
uChema
5c004cab
Fix previous changes
4 年前
Amel Negra
3bb6625f
Created SFX SO for all critters
4 年前
uChema
d43ded64
Update Dialogue for fry king
4 年前
Amel
65fb8a3f
Add dialogue to steps
4 年前
Amel
b3a39f56
removing move sound for plant critter since it doesn't move
4 年前
Amel
4b26459a
Using protagonist footsteps temporarily for critter move
4 年前
Amel
f483ddd3
Using walk on audio from protagonist on rock critter temporarily
4 年前
Amel
6d56e31b
Merge branch 'main' into mainAmel
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 年前
uChema
d2aaaee5
Fix issue #446
4 年前
Amel Negra
f5305f77
Adding different footsteps AudioCue SOs
4 年前
Amel Negra
25484697
SFX AudioCue SOs for townsfolk F and M
4 年前
Amel Negra
c364401a
SFX AudioCue SOs for Legendary chef
4 年前
Amel Negra
18e53726
SFX AudioCue SOs for Bard Hare sing(Idle) and talk
4 年前
Amel Negra
fbfa7e61
Adding NPC script to prefabs and assigned AudioCue SOs
4 年前
Amel
1e044ca3
Bard hare sing and talk
4 年前
Amel
db4e3fed
updating the configs
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
9c232940
Audio configs 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
37e5adb2
Fix Quests SO
4 年前
uChema
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
uChema
53aaeb3f
Fix Quest SOs
4 年前
uChema
283617f7
Creating Win/Lose quests and how to handle - Saving quests WIP
4 年前
Ciro Continisio
709521fa
Merge branch 'main' into worldbuilding
4 年前
Ciro Continisio
fabdc101
Fix for SaveSystem
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 年前
GitHub
9fd51f47
Add camera shake on protagonist hit. ( #454 )
* Add camera shake on protagonist hit.
* add cam shake on critters hit
3 年前
Amel
3e9620c3
Bard hare state machine tweaks after animation updates
3 年前
Amel
01e75470
Tweaking end conversation state for BardHare SM
3 年前
Ciro Continisio
a8343b05
Merge remote-tracking branch 'tech-mkt/main'
3 年前
Amel
8994f2dd
Organized SM configs in folders
3 年前
Amel
eab29e55
Smaller range for reward droppables when positioned
3 年前
Ciro Continisio
f8947aa6
Sound tweaks and timing
Tweaked SFX timing on animation clips
3 年前
Ciro Continisio
6bd5deac
Added reverb zones
3 年前
Ciro Continisio
0727f56c
Tweaked player movement speed
3 年前
Ciro Continisio
5f2c082e
Put sound on torches
Also added them to Field_Hill
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 年前
Wiecio
7a89c938
First implementation of fading during loading scenes
4 年前
Wiecio
6208f362
Deleted while loop
Deleted while loop, changed _onFadeComplete to BoolEventChannel
4 年前
uChema
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
065751a8
Merge branch 'main' of https://github.com/Wiecio/open-project-1 into ciro
# Conflicts:
# UOP1_Project/Assets/Scenes/Managers/PersistentManagers.unity
# UOP1_Project/Assets/Scripts/Events/ScriptableObjects/LoadEventChannelSO.cs
# UOP1_Project/Assets/Scripts/SaveSystem/SaveSystem.cs
# UOP1_Project/Assets/Scripts/SceneManagement/LocationExit.cs
# UOP1_Project/Assets/Scripts/SceneManagement/SceneLoader.cs
3 年前
Ciro Continisio
d8f2c2f3
Merge branch 'main' into ciro
3 年前
uChema
8a2721d9
Setting Questline + rename SO's files
3 年前
uChema
09ae3bfc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
uChema
fd58c9ac
Add new item icons
3 年前
Ciro Continisio
4b2bcaf1
Mountain Path scene
3 年前
uChema
e022f2ee
Rework on questline naming
3 年前
GitHub
0d96fe7f
Implement pause menu music ( #463 )
3 年前
Amel Negra
42ba5e06
Merge remote-tracking branch 'origin/main' into AmelMain
3 年前
Amel Negra
f670d943
Updating cutscene example scene with dialogue-cutscene updates
3 年前
Ciro Continisio
7a6ec0e8
Merge remote-tracking branch 'tech-mkt/main'
3 年前
uChema
b4892bfe
Merge with main
3 年前
Ciro Continisio
b214f102
Work on character controller
3 年前
Ciro Continisio
3e67c187
Merge branch 'main' into ciro
3 年前
Ciro Continisio
f3bd8b00
Three raycasts
3 年前
Ciro Continisio
5b2ff381
More tweaks to CC
3 年前
Ciro Continisio
832dd088
Merge branch 'ciro'
3 年前
Amel Negra
bd15167a
Added talk to Idle transition for pig chef
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
ad52a32a
hot fixes - Questline integration
3 年前
uChema
6a1077d3
Create cutscenes dialogue
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
43f6f6f7
Merge branch 'main' into worldbuilding
3 年前
Ciro Continisio
509b93fe
Removed ForestEntrance scene
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 年前
uChema
7671fd63
Change 'Salty' adjective to Savory
3 年前
Amel Negra
5ff6116e
Adding Nar actor
3 年前
uChema
718b6321
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
a156875a
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
9936dca6
Refactoring Dialogue System
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 年前
uChema
2f6c4b7a
Hot fix : NullReferenceException on game exit
3 年前
uChema
fab03691
Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.
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
2d712a99
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
Amel Negra
fa8cc2af
Added new path configs for slime critters on the Field_Farms scene
3 年前
Ciro Continisio
1d3f0c8a
Added FallCatcher script for water areas
3 年前
Ciro Continisio
83ea7526
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity
3 年前
uChema
b1c2f634
Integrating Cutscenes and Questlines in final scenes
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel Negra
a557f23b
Now DialogueBehaviour takes care of disabling UI dialogue when not paused
3 年前
Amel
8b2d50b0
Add start state for townsfolks
3 年前
Amel Negra
f6c9e887
Rock critter snooze state tweaking after animation integration
3 年前
Amel
b472d7a2
Adding load scene signal to load a location from timeline
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
3 年前
Greg Solo
73b4e5d8
Set game to combat state when critter detects player
4 年前
uChema
1d6b8128
Use Game States In State Machine
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
4ad4a353
Settings System
3 年前
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
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
uChema
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
8a36c2bf
Fix UI Rescaling. Test The whole game. WIP Interaction after cutscene
3 年前
Amel
1d5d51cb
Added beach intro cutscene + plays only when we play new game
3 年前
uChema
93300a72
Rolling Credits
3 年前
Amel
22980250
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
3854e2ed
Art folder reorg
3 年前
uChema
57caaba3
Keep health between scenes
3 年前
uChema
94daf002
Restore health and Apply changes to MainMenuCanvas prefab
3 年前
uChema
2e7057c0
Error message when can't cook
3 年前
Ciro Continisio
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
Ciro Continisio
510caa41
Small tweaks to UI elements
3 年前
Ciro Continisio
30e472a6
Work on night scene
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
Also fixed bug with RuntimeAnchors
Fixed BardHare state machine (error on Animator parameter)
3 年前
Ciro Continisio
6b104b55
Mega code cleanup
3 年前
Ciro Continisio
8bfcef97
StateAction and StateMachine improvements
Added a description to StateMachine's StateAction SOs
State Machine editor now displays descriptions for StateActions
Reorganised Protagonist's StateActions into folders
3 年前
Ciro Continisio
c62d8542
Renamed all FryKing assets to LegendaryChef
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 年前
Ciro Continisio
2a223039
Fixed bugs
Addressable issues (stray loc tables), and a bug on the UI (inventory menu not updating a button prompt)
3 年前