Unknown
863a7673
Adding events and listeners for scene loading
4 年前
Unknown
09bb47ff
Remove old files
4 年前
Unknown
da0bbab5
Added Void, Int and Load Events SO and Listeners
4 年前
Ciro Continisio
c3bf387e
Cleanup, Reorganisation of folders and Scenes
4 年前
circa94
cdbf1207
Merge branch 'circa94/master' into circa94/inventory-system
4 年前
GitHub
2907b6c8
Audio System ( #90 )
* Adding scenesLoader scene
* Adding main menu and level 1 scenes for test
* Adding loading system
* Adding scenes data (still WIP)
* SOs for menus and levels and adding scenes
* Adding events and listeners for scene loading
* Main menu and loading bar scripts
* pushing ScenesLoader scene
* Main menu scene, added menu disable on start
* Added check to avoid loading scene multiple times
* Changed to L key instead of space bar for load (space used to jump)
* Clean
* Added clear lists option and tweaks on MM and ScenesLoader scenes
* Adjustments on scene loading
* Added level 2 and level end trigger in level 1
* Added new obstacle material for lvl2 and tagged Player
* Added custom inspector for GameScene ScriptableObjects
It improves workflow and minimizes user error by allowing a designer to pick scenes from a list instead of typing their name manually
* Updated GameSceneEditor class
* Added new obstacle mate...
4 年前
Ciro Continisio
e1aa5f02
[Bot] Automated dotnet-format update
4 年前
kgc00
ad56cb20
Merge remote-tracking branch 'upstream/main' into main
4 年前
Ciro Continisio
1ee5259e
Merge branch 'main' into big-merge
4 年前
Ciro Continisio
bed528b4
Merge branch 'main' into big-merge
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 年前
Chema Damak
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
Ciro Continisio
f8f9e0b0
Event system refactoring
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 年前
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 年前
GitHub
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from 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
f8264168
updated event name for interaction ended
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 年前
Dan Young
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
GitHub
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
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 年前
Amel Negra
23a23d5d
small tweaks on scenes
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
Dan Young
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
alex
9fd881be
Fix Interaction System doesn't follow the FSM
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
0509be25
Refactored the whole cold startup mechanism
4 年前
uChema
5d435a5e
Merge branch 'main' into UI
4 年前
uChema
0f212cd8
Add Questline Testing ground
4 年前
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
4 年前
Ciro Continisio
d8f2c2f3
Merge branch 'main' into ciro
4 年前
uChema
09ae3bfc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
uChema
2f6c4b7a
Hot fix : NullReferenceException on game exit
3 年前
Ciro Continisio
2d712a99
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
uChema
4ad4a353
Settings System
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
Ciro Continisio
ed9498cd
Reorganised and renamed ScriptableObjects
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 年前