André McGrail
|
d5412042
|
Small buoyant object tweaks, updated packages, removed analytics, no more debug conflicts with input
|
5 年前 |
Mike Geig
|
07e4012f
|
-removed all DOTS physics stuff. Tagged the previous commit so we can go back to it later
|
5 年前 |
|
André McGrail
|
6ccbdcf8
|
Updated embedded packages
|
5 年前 |
|
André McGrail
|
acc5c0e7
|
Updates for clouds
|
5 年前 |
|
André McGrail
|
1c0adb5c
|
Merge branch 'demo-work-temp' into demo-work
# Conflicts:
# Assets/scenes/Island.unity
|
5 年前 |
|
André McGrail
|
2addac81
|
Merge remote-tracking branch 'origin/demo_brandanddesign' into demo-work
# Conflicts:
# Assets/Objects/environment/Cliffs/Env_DistantCards.fbx.meta
# Assets/Objects/environment/Cliffs/Maps/BGcards_Albedo.png.meta
# Assets/Objects/environment/Cliffs/Maps/BGcards_Normal.png.meta
# Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat
# Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat.meta
# Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat
# Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat.meta
# Assets/Objects/environment/Trees/small_tree_A.fbx
# Assets/Objects/environment/Trees/small_tree_A.fbx.meta
# ProjectSettings/QualitySettings.asset
|
5 年前 |
mikegeig
|
d69901c9
|
-Cleaned up some of the scripts
-re-organized files preparing for merge into demo branch
|
5 年前 |
|
mikegeig
|
bd44dad8
|
Merge branch 'demo-work' into prep-for-merge
|
5 年前 |
