Ciro Continisio
|
0ceeafd9
|
Refreshed Forest and Beach scenes
|
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
|
b5c513e4
|
Small tweaks
|
4 年前 |
Ciro Continisio
|
10a426d8
|
Scenes moved around
|
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 年前 |
Ciro Continisio
|
bd2b6359
|
Midboxing again
|
4 年前 |
Ciro Continisio
|
b60fe6c7
|
Tweaks and bamboos
|
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
|
91a763b7
|
Updated project to 2020 LTS
|
4 年前 |
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
4 年前 |
Amel
|
7b1ed2b2
|
Merge branch 'main' into UI
|
4 年前 |
Ciro Continisio
|
05c41c7f
|
Rebaked scenes
|
4 年前 |
Amel Negra
|
e0ede3d5
|
Merge branch 'main' into AmelMain
|
4 年前 |