0ce62d9d
Added scene management folder in scripts
4 年前
a72a0657
Now possible to start the game from any scene
4 年前
a5ff75ad
SO name updated in other scripts
4 年前
77cff63f
[Bot] Automated dotnet-format update
4 年前
c3bf387e
Cleanup, Reorganisation of folders and Scenes
4 年前
cdbf1207
Merge branch 'circa94/master' into circa94/inventory-system
4 年前
54306cec
Added localization package
4 年前
597b3f7b
Merge branch 'localization' into main
4 年前
58d65aa2
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
4 年前
f8f9e0b0
Event system refactoring
4 年前
ce5b07db
Fry king in scene, Loading tweaks
4 年前
0728a4c6
Merge branch 'art-assets' into feature/art/pant_critter
4 年前
14e737cc
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
4 年前
82d4c4e3
Fixed framerate-dependent jump (?)
Also added a debug option to the editor initialised, to force framerate to extreme values
4 年前
a05af5c2
Merge branch 'main' into art-assets
4 年前
e09986b8
Merge branch 'main' into fix/object-pool
4 年前
1d26bec4
Merge branch 'main' into state-machine-improvements
4 年前
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
8a7a3b44
Fix for issue Location Loader issue #229
4 年前
f0ace111
Revert "Fix for issue Location Loader issue #229"
This reverts commit c7d75ff1da92b172333042e5e9df43a2a296ca03.
4 年前
baff1741
Proposed fix for issue #229 with test scenes
4 年前
b7efdfcb
Revert "Proposed fix for issue #229 with test scenes"
This reverts commit 14a6a3a062c3979cf9fef8d3b156c560f6fcd27b.
4 年前
89044d84
Revert "Revert "Proposed fix for issue #229 with test scenes""
This reverts commit 3e9fb2d2aaf01d1a054e2e9f18a8f37540a888a8.
4 年前
c1fe908d
Fixes to example, moved files in Examples folder
4 年前
5aaad3c6
Merge branch 'Location-Loader-issue-229-fix' into main
4 年前
4ea5a7a5
[Bot] Automated dotnet-format update
4 年前
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
4 年前
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
2c9810c9
Merge branch 'main' into interaction
4 年前
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
1fa4000f
Adding initialization script
4 年前
f194e62b
[Bot] Automated dotnet-format update
4 年前
9bae4220
Merge remote-tracking branch 'origin/interaction' into main
4 年前
77242d26
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
4 年前
78c0f11a
"Editor window to quickly open scenes" task ( #267 )
* Added the Quick Scene Access Tool
* removed unused file
4 年前
cdab9c20
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
4 年前
2a0d8691
Merge branch 'main' into pr-bash
4 年前
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
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 年前
4e2ef8cc
Pulled from upstream/main
4 年前
6e9b7f56
Fix SceneAccessTool build fail issue ( #274 )
* Added the Quick Scene Access Tool
* removed unused file
* orgainized script for SceneAccessTool to their proper folders. Build should work now
4 年前
74441aab
Fix to load correct light probes
4 年前
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
06438a1a
Pulled from upstream/main
4 年前
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
88ede019
Renamed initializationSO to PersistentManagersSO
4 年前
ee385f08
Added initializationLoader class
4 年前
072ede02
EditorInitialisationLoader now works with menu and locations
4 年前
424f4bdf
Added loadingScreenManager to listen to UI toggle events
4 年前
2cfbb2ea
Spinning UI element script for loading screen
4 年前
cddb1132
Added GameplaySO to be able to create gameplay scene
4 年前
a2507600
removed unused class
4 年前
35619468
Added onSceneReady event to inform when scene is loaded and set active
4 年前
5d87a633
Pushing scenes
4 年前
403824da
major changes on location loader to fit the new scene re architecture
4 年前
38fdca31
Made GameSceneSo TextArea to better see scenes descriptions
4 年前
f558e77c
removed unused variable in location loader
4 年前
d00568b8
Added the event for editor initializer and updated prefabs to ref it
4 年前
eb568505
renamed LocationLoader to SceneLoader
4 年前
03bdc2e4
Now loading screen works
4 年前
d78abfcb
to do added
4 年前
a6b2a938
Using bool instead of event because on the same GO
4 年前
76588955
moved script to scripts scene management folder
4 年前
e8d73e33
Merge branch 'scenes-re-architecture' into main
4 年前
86717d66
[Bot] Automated dotnet-format update
4 年前
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 年前
76ffdd4f
[Bot] Automated dotnet-format update
4 年前
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 年前
e4af50a3
removed old comment
4 年前
3e7e4387
Added persistent scenes list clear when loading done
4 年前
c28d9833
Merge branch 'main' into QuestSystem
4 年前
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
3 年前
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
3 年前
c799113a
Small tweaks to UI Fader
Still not functional
3 年前
7ece782e
Merge branch 'main' into QuestSystem
3 年前
334de1f1
Part 1
3 年前
48f41150
Simplified GameSceneSO and SceneSelector
3 年前
8a53579e
Refactor done
Individual scene starting from the editor not functional
3 年前
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
3 年前
ee3efeff
Prefab renaming and relocation
3 年前
068abd40
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
3 年前
953afd39
Merge branch 'loading-refactor' into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/GameplayEssentials/SceneLoader.prefab
3 年前
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.
3 年前
ea9dfcea
Small fix to SceneLoader
3 年前
94a617c8
Reorganising SceneDataSOs
3 年前
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
3 年前
dcf0b00e
Refactor part 3
3 年前
7eee90e5
Loading refactor part 4
3 年前
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
3 年前
47498b5c
[Bot] Automated dotnet-format update
3 年前
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.
3 年前
bd9a16aa
Added a Load function to StartGame.
Can now load a previously saved game from disk.
3 年前
10bb976f
[Bot] Automated dotnet-format update
3 年前
5c50ddcf
Keep a backup of previous save. Added Continue from save to Menu.
3 年前
2f0661e3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
9ab7d6e5
Fixed missing save file error
3 年前
70978d9d
Audio changes
3 年前
b871dd8d
[Bot] Automated dotnet-format update
3 年前
2e6b1d55
Merge remote-tracking branch 'origin/main' into main
3 年前
2b80d7b3
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
3 年前
f6f1ad38
Fixes on the AudioManager, music in the Main Menu
3 年前
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
3 年前
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
3 年前
a1ce890c
Removed array of scenes from loading
3 年前
0509be25
Refactored the whole cold startup mechanism
3 年前
eaa6623e
Enabled the cold editor startup for the MainMenu scene too
3 年前
5d435a5e
Merge branch 'main' into UI
3 年前
ce73c3ab
Merge remote-tracking branch 'origin/main' into main
3 年前
73ce8d6d
I'm curious why the AO handle result is not used in this context? ( #414 )
3 年前
ea77fe9c
Fixed a simple typo in LoadingScreenManager ( #417 )
In LoadingScreenManager.cs we subscribed to a listener in OnDisable instead of unsubscribing.
3 年前
84d13891
Merge branch 'main' into UI
3 年前
4b0c5144
Merge branch 'main' into UI
3 年前
b52c1a1f
Add UI to Main Menu + Add Popup + Working on Settings
3 年前
5a4b5e30
[Bot] Automated dotnet-format update
3 年前
c3699920
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
3 年前
76cc2e8b
Merge branch 'ForestMaze' of https://github.com/itsLevi0sa/open-project-1 into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Scripts/UI/UIManager.cs
3 年前
3b82d4e6
Editor cold startup tweaks
It now works even if the SceneDataSO is not referenced
3 年前
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
3 年前
127bd54d
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
c7f86452
Merge remote-tracking branch 'origin/main' into main
3 年前
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
3 年前
d3f9b548
Added save Questline status
3 年前
34861adb
Location entrance camera
We can now configure a custom camera shot for each location entrance
3 年前
709521fa
Merge branch 'main' into worldbuilding
3 年前
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
7a89c938
First implementation of fading during loading scenes
3 年前
6208f362
Deleted while loop
Deleted while loop, changed _onFadeComplete to BoolEventChannel
3 年前
13e36ce1
Added bool parameter to LoadEventChannelSO
Now you can specify if you want to fade screen during loading
3 年前
3f37142f
Removed not used namespaces
3 年前
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 年前
c5d56d4c
Fixed bug when player landed in multiple LocationExits at once
3 年前
cc99c71a
Added 3D to main menu (temp)
3 年前
09ae3bfc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
36d16456
File cleanup and relocation
3 年前
42ba5e06
Merge remote-tracking branch 'origin/main' into AmelMain
3 年前
b4892bfe
Merge with main
3 年前
72ec616e
[Bot] Automated dotnet-format update
3 年前
460fb941
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding
3 年前
de0f0586
Revert "Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding"
This reverts commit 5141fc8d8d88057646e6602844c0bc709606f6d3, reversing
changes made to 0146f00fa2288b3baf783f2feb33ed3ff37fb231.
3 年前
fab03691
Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.
3 年前
7c507f4a
Create save file on editor cold startup if needed
3 年前
68cafc40
[Bot] Automated dotnet-format update
3 年前
aa9e8032
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into CaveWhiteboxing
3 年前
7ba7a559
Merge branch 'pr/396' into main
3 年前
84ae59c8
Fix Push
3 年前
2d712a99
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
1d3f0c8a
Added FallCatcher script for water areas
3 年前
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
b472d7a2
Adding load scene signal to load a location from timeline
3 年前
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
6520caab
Separated Timeline scene loading from the LocationExit script
3 年前
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
2727c6c2
Fix typo in SceneLoader.cs ( #495 )
3 年前
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 年前
f1c2b9e1
Added Teleporter cheat menu
Press C key to activate, only in the editor
3 年前
Unknown
Ciro Continisio
circa94
Chema Damak
treivize
GitHub
Llaczky
jandd661
Dan Young
Amel
Amel Negra
HarshNarayanJha
rcarag
uChema
Yohann Puyhaubert
Bronson Zgeb
itsLevi0sa
Wiecio
fqureshi