Ciro Continisio
|
6d1b63ae
|
Reorganising assets
|
4 年前 |
Ciro Continisio
|
a06f9b30
|
Sample scene
Prefab creation, fixed rotation issue
|
4 年前 |
Ciro Continisio
|
fb97255e
|
Moved art assets
|
4 年前 |
Ciro Continisio
|
24cc8443
|
Added crunch compression to all textures + Preset
|
4 年前 |
Ciro Continisio
|
420aec35
|
Imported new rocks, asset fixes
Tweaked size of some trees
|
4 年前 |
Ciro Continisio
|
ce50c2eb
|
Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets
|
4 年前 |
Ciro Continisio
|
1413811f
|
Material properties
|
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
|
2f001d27
|
Prefab tweaks
|
4 年前 |
Dane Byrd
|
c6beedc4
|
Merge branch 'art-assets' into ground_shader
|
4 年前 |
uChema
|
0f397e96
|
Merge branch 'main' into QuestSystem
|
4 年前 |
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
4 年前 |
Ciro Continisio
|
847a1352
|
Rock shader with grass or sand
|
4 年前 |
Ciro Continisio
|
293f994f
|
Merge branch 'graphic-rework'
|
4 年前 |
uChema
|
997b50ae
|
Merge branch 'main' into pr/393
|
4 年前 |
Amel
|
7b1ed2b2
|
Merge branch 'main' into UI
|
4 年前 |
Ciro Continisio
|
3bd54bf1
|
New colliders for BigRocks and BigTree
|
4 年前 |
Amel Negra
|
e0ede3d5
|
Merge branch 'main' into AmelMain
|
4 年前 |
Ciro Continisio
|
4a525440
|
Scene separated
|
4 年前 |
Ciro Continisio
|
c22729d3
|
More worldbuilding
Full bake of all scenes
|
4 年前 |
uChema
|
735363c3
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Amel
|
6f206e69
|
Merge remote-tracking branch 'origin/main' into mainAmel
|
4 年前 |
Ciro Continisio
|
53d9fe16
|
Scene work
|
4 年前 |
uChema
|
eab4c107
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Ciro Continisio
|
dc51f9ac
|
More scenery work
|
4 年前 |
Ciro Continisio
|
51187a9d
|
Location work
|
4 年前 |
uChema
|
71dcdcfd
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |