Ciro Continisio
|
e8f4a6e7
|
Imported BardHare
|
4 年前 |
Ciro Continisio
|
b5de134f
|
New art demo scene
|
4 年前 |
Ciro Continisio
|
21cfe483
|
Art showcase tweaks
|
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
|
a0ac9ece
|
Imported and tweaked extra vegetation
|
4 年前 |
Ciro Continisio
|
b414fbe0
|
Merge branch 'art-assets' into main
|
4 年前 |
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
|
ce50c2eb
|
Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets
|
4 年前 |
Ciro Continisio
|
d4366a3d
|
Rebaked scenes, removed directional lightmaps
|
4 年前 |
Ciro Continisio
|
101906b4
|
Townsfolk_M animations, Palm2
|
4 年前 |
Dane Byrd
|
bd72e4e6
|
Merge remote-tracking branch 'UnityTechnologies/art-assets' into art-assets
|
4 年前 |
Ciro Continisio
|
f588e37a
|
New tree type
|
4 年前 |
Ciro Continisio
|
efd5063f
|
Imported latest town assets
|
4 年前 |
Ciro Continisio
|
e7b2e446
|
New art assets
|
4 年前 |
Dan Young
|
268ab82e
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
4 年前 |
Amel
|
2c9810c9
|
Merge branch 'main' into interaction
|
4 年前 |
Chema Damak
|
8a166bf0
|
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
|
4 年前 |
Amel Negra
|
370a7993
|
Merge remote-tracking branch 'origin/main' into interaction
|
4 年前 |
Ciro Continisio
|
716120b4
|
Bushes, new Fern plant
|
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 年前 |
Ciro Continisio
|
ef68d3e0
|
Imported WoodenBench
|
4 年前 |
Ciro Continisio
|
7c088a1f
|
Merge branch 'pr-bash' into main
|
4 年前 |
GitHub
|
54240307
|
Devlog 3: Handling complex input (#307)
Project upgrade to 2021.1
|
4 年前 |
uChema
|
c28d9833
|
Merge branch 'main' into QuestSystem
|
4 年前 |
Ciro Continisio
|
4b89665c
|
Wind shader improved and painted more meshes
|
4 年前 |
Dan Young
|
eb670224
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
4 年前 |
Ciro Continisio
|
c691552b
|
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
|
4 年前 |
Ciro Continisio
|
4ca6acbc
|
Oven in scene
|
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
|
49d768c5
|
Rebaked TestingGround and ArtShowcase
|
4 年前 |
Amel Negra
|
e0ede3d5
|
Merge branch 'main' into AmelMain
|
4 年前 |
Ciro Continisio
|
8761fdff
|
Fixes to ArtShowcase
|
3 年前 |
Ciro Continisio
|
d3537763
|
Art assets
Tweaked wooden bench UVs and texture, created Campfire prefab out of PotOverFire
|
3 年前 |
Ciro Continisio
|
6de2a6a1
|
ArtShowcase light bake
|
3 年前 |
Amel Negra
|
a676cd5d
|
Merge remote-tracking branch 'origin/main' into main
|
3 年前 |
uChema
|
dc07bb35
|
Merge remote-tracking branch 'upstream/main' into main
|
3 年前 |