Ciro Continisio
|
291ae413
|
New flowers, fixes
Switched many small assets to bake with light probes instead of lightmaps
|
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
|
420aec35
|
Imported new rocks, asset fixes
Tweaked size of some trees
|
4 年前 |
|
Ciro Continisio
|
d9dd5e5e
|
Tweaked RenderFeatures
|
4 年前 |
|
Ciro Continisio
|
ce50c2eb
|
Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets
|
4 年前 |
|
Ciro Continisio
|
87226439
|
Put the big rocks on the OccludingObjects layer
|
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 年前 |
|
Ciro Continisio
|
bd2b6359
|
Midboxing again
|
4 年前 |
GitHub
|
81481d8b
|
Merge pull request #4 from UnityTechnologies/main
update my local branch
|
4 年前 |
|
uChema
|
7ece782e
|
Merge branch 'main' into QuestSystem
|
4 年前 |
|
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
4 年前 |
|
Ciro Continisio
|
3bd54bf1
|
New colliders for BigRocks and BigTree
|
4 年前 |
|
Ciro Continisio
|
6620446f
|
Navigation-related prefab tweaks
|
4 年前 |
Amel Negra
|
e0ede3d5
|
Merge branch 'main' into AmelMain
|
4 年前 |
|
uChema
|
3ce06cf5
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
|
Ciro Continisio
|
bc17972b
|
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
|
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
|
587a2230
|
Worldbuilding
Scenes, rocks, waterfalls, foam, ...
Added fog
Rebaked all lighting
|
4 年前 |
|
uChema
|
71dcdcfd
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
