Ciro Continisio
|
03ff96ac
|
New test scenes
Big testing scene with Polybrush terrain, small test scene with just primitives
|
4 年前 |
kgc00
|
781633e3
|
Merge remote-tracking branch 'upstream/main' into main
|
4 年前 |
|
Ciro Continisio
|
7705382e
|
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
|
4 年前 |
|
kgc00
|
c4dabcbe
|
merge
|
4 年前 |
|
Ciro Continisio
|
d4366a3d
|
Rebaked scenes, removed directional lightmaps
|
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 年前 |
GitHub
|
5c82e99e
|
Merge pull request #2 from UnityTechnologies/main
import changes from main
|
4 年前 |
|
GitHub
|
54240307
|
Devlog 3: Handling complex input (#307)
Project upgrade to 2021.1
|
4 年前 |
|
Ciro Continisio
|
49f39298
|
Imported new animations
|
4 年前 |
|
Ciro Continisio
|
6e1104f0
|
Merge branch 'pr-bash' into main
|
4 年前 |
uChema
|
c28d9833
|
Merge branch 'main' into QuestSystem
|
4 年前 |
|
uChema
|
008bad73
|
Fix Merge
|
4 年前 |
|
GitHub
|
54f79bad
|
Added slime critter behavior (#312)
* Slime Critter initial behavior
* Added slime critter behavior
|
4 年前 |
|
Ciro Continisio
|
183fdac0
|
Merge remote-tracking branch 'tech-mkt/main' into main
|
4 年前 |
Dan Young
|
eb670224
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
3 年前 |
|
Ciro Continisio
|
c691552b
|
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
|
3 年前 |
Dane Byrd
|
c6beedc4
|
Merge branch 'art-assets' into ground_shader
|
3 年前 |
|
uChema
|
0f397e96
|
Merge branch 'main' into QuestSystem
|
3 年前 |
|
Ciro Continisio
|
91a763b7
|
Updated project to 2020 LTS
|
3 年前 |
|
Ciro Continisio
|
61f7cbe7
|
Scene redress and rebakes
|
3 年前 |
|
Ciro Continisio
|
e63ce59b
|
Lighting adjustments, probes
|
3 年前 |
|
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
3 年前 |
|
Ciro Continisio
|
44604f6f
|
Updated testing scenes
|
3 年前 |
|
Ciro Continisio
|
753835bc
|
Night sky, sunset
|
3 年前 |
|
Ciro Continisio
|
543c9e95
|
New lightmaps for TestingGround
|
3 年前 |
|
Ciro Continisio
|
293f994f
|
Merge branch 'graphic-rework'
|
3 年前 |
|
uChema
|
997b50ae
|
Merge branch 'main' into pr/393
|
3 年前 |
Amel
|
7b1ed2b2
|
Merge branch 'main' into UI
|
3 年前 |
|
Ciro Continisio
|
49d768c5
|
Rebaked TestingGround and ArtShowcase
|
3 年前 |
|
Ciro Continisio
|
42e0d46a
|
Changes to TestingGround
|
3 年前 |
Amel Negra
|
e0ede3d5
|
Merge branch 'main' into AmelMain
|
3 年前 |
|
uChema
|
3ce06cf5
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Ciro Continisio
|
bc17972b
|
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
|
3 年前 |
|
Ciro Continisio
|
f790674d
|
Rebaked TestingGround
|
3 年前 |
|
uChema
|
d0523373
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
|
Ciro Continisio
|
85c5bf58
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
|
3 年前 |
