Ciro Continisio
|
8de2f73f
|
Moved stray materials and textures
|
4 年前 |
|
Ciro Continisio
|
26747ac5
|
Merge branch 'treivize/feature/art/transparent_support' into art-assets
|
4 年前 |
|
Ciro Continisio
|
e5e7acc6
|
Merge branch 'art-assets' into main
|
4 年前 |
kgc00
|
253b73a3
|
Merge remote-tracking branch 'upstream/main' into main
|
4 年前 |
|
kgc00
|
7b04a609
|
Merge branch 'main' into simple-menu-controls
|
4 年前 |
|
Ciro Continisio
|
6804ad52
|
Boat, Fry king, Lantern fixes
|
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 年前 |
|
Ciro Continisio
|
09419cf4
|
Tweaks, dither shader
|
4 年前 |
|
Ciro Continisio
|
1d26bec4
|
Merge branch 'main' into state-machine-improvements
|
4 年前 |
|
treivize
|
df2ab2a2
|
Merge branch 'art-assets' into feature/art/slime_critter
|
4 年前 |
Eduardo de Albuquerque
|
8845aa98
|
Merge branch 'main' into HollowBoatEffect
# Conflicts:
# UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset
# UOP1_Project/ProjectSettings/TagManager.asset
|
4 年前 |
|
Ciro Continisio
|
d9dd5e5e
|
Tweaked RenderFeatures
|
4 年前 |
|
Ciro Continisio
|
bd14256e
|
Material and prefab 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
|
2b770690
|
ClearSky skybox
|
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 年前 |
Kyle Minors
|
1bec3630
|
Updated water shader added.
Stored with a new plane, material and timeline asset.
|
4 年前 |
|
Ciro Continisio
|
a68b6c07
|
Water values reinstated
|
4 年前 |
|
Ciro Continisio
|
50a25f4a
|
Merge branch 'main' into 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
|
e4d15d8c
|
Relocated whiteboxing scenes and folders
|
4 年前 |
|
Amel Negra
|
8151f1b5
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
4 年前 |
uChema
|
127bd54d
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
|
Ciro Continisio
|
ebe81a73
|
Worldbuilding in progress
Landmasses vertex paint, water plane tweaks
|
4 年前 |
|
Ciro Continisio
|
a2299fee
|
Water shaders, landmasses
|
4 年前 |
|
Ciro Continisio
|
5cc9de68
|
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
|
3 年前 |
|
uChema
|
735363c3
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Amel
|
6f206e69
|
Merge remote-tracking branch 'origin/main' into mainAmel
|
3 年前 |
|
Ciro Continisio
|
59efe5a3
|
Rock prefabs
|
3 年前 |
|
Ciro Continisio
|
71481135
|
Shader and lighting tweaks
|
3 年前 |
|
Ciro Continisio
|
53d9fe16
|
Scene work
|
3 年前 |
|
Ciro Continisio
|
8167037b
|
Worldbuilding
|
3 年前 |
|
uChema
|
eab4c107
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Ciro Continisio
|
587a2230
|
Worldbuilding
Scenes, rocks, waterfalls, foam, ...
Added fog
Rebaked all lighting
|
3 年前 |
|
uChema
|
71dcdcfd
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Ciro Continisio
|
3835c521
|
Skybox and water tweaks
Now endless water plane!
|
3 年前 |
|
uChema
|
718b6321
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Amel Negra
|
a156875a
|
Merge remote-tracking branch 'origin/main' into main
|
3 年前 |
|
uChema
|
90cc66d9
|
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
|
3 年前 |
|
Ciro Continisio
|
30e472a6
|
Work on night scene
|
3 年前 |
