Unknown
1cc14a04
SOs for menus and levels and adding scenes
4 年前
Unknown
af81ba57
Added level 2 and level end trigger in level 1
4 年前
Unknown
aa06f015
Added beach and forest scenes for scenes loading tests
4 年前
Unknown
0bb99173
Renamed Levels folder to Locations
4 年前
Chema Damak
54306cec
Added localization package
4 年前
Chema Damak
597b3f7b
Merge branch 'localization' into main
4 年前
Ciro Continisio
58d65aa2
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
4 年前
Ciro Continisio
ce5b07db
Fry king in scene, Loading tweaks
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 年前
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 年前
GitHub
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
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 年前
HarshNarayanJha
4e2ef8cc
Pulled from upstream/main
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 年前
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 年前
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 年前
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 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
334de1f1
Part 1
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
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 年前
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 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
4a525440
Scene separated
4 年前
Ciro Continisio
4b2bcaf1
Mountain Path scene
4 年前
uChema
b4892bfe
Merge with main
4 年前
Ciro Continisio
f3bd8b00
Three raycasts
4 年前
Ciro Continisio
832dd088
Merge branch 'ciro'
4 年前
uChema
f26da778
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
509b93fe
Removed ForestEntrance scene
4 年前
uChema
718b6321
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
a156875a
Merge remote-tracking branch 'origin/main' into main
4 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
4 年前
Amel
b472d7a2
Adding load scene signal to load a location from timeline
3 年前
uChema
90cc66d9
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
4 年前
uChema
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
Ciro Continisio
30e472a6
Work on night scene
3 年前