Ciro Continisio
2c375fd1
Merge branch 'art-assets' of https://github.com/MortyJHin/open-project-1 into pr-bash
4 年前
Ciro Continisio
1c9c17d2
Reorganisation
4 年前
Ciro Continisio
2f001d27
Prefab tweaks
4 年前
Ciro Continisio
10a426d8
Scenes moved around
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
GitHub
b196db3a
General Map Whiteboxing_1 ( #294 )
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
Ciro Continisio
b5c513e4
Small tweaks
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 年前
Ciro Continisio
1995c542
Merge branch 'whiteboxing' of https://github.com/NicknEma/open-project-1 into NicknEma-whiteboxing
# Conflicts:
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_2/Beach.unity
4 年前
NicknEma
72cb0094
Update Beach.unity
4 年前
NicknEma
27a139f7
Added CameraManager and SpawnSystem to the scene
4 年前
NicknEma
7974b44d
Second whiteboxing for the beach area
4 年前
GitHub
f8f9e06c
Second whiteboxing for the beach area ( #211 )
4 年前
Amel Negra
6504ce17
Generated lighting
4 年前
Amel Negra
9c4c0b8c
Removed terrain and the scene using it
4 年前
GitHub
f9ef3334
Whiteboxing ( #155 )
* Add files via upload
Uploading town whiteboxing as separate files
* Add files via upload
Truffleton scene
* Moved files from the root to a new folder
Co-authored-by: Amel Negra <amel.negra@unity3d.com>
4 年前
GitHub
dde7dc4c
Beach whitebox ( #145 )
* beach whitebox 1 optimized
originally by @itsLevi0sa (on forums), optimized by @jamercer
* Swapped the missing tree prefab
* beach trees
owch.
* Tree Collider Mesh Assigned
you cannot walk through trees now!
* Trees are now prefabs
Co-authored-by: Unknown <amel.negra@unity3d.com>
4 年前
Unknown
8661d95e
Added Polybrush URP samples
4 年前
Unknown
32b38b9d
Added Probuilder URP support samples
4 年前
Unknown
d6dd3c0b
Merge remote-tracking branch 'origin/whiteboxing' into whiteboxing
4 年前
Unknown
78d8fa60
Added Whiteboxing folder under Scenes folder
4 年前