gunnbr/PrincessLandVR
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: gunnbr/PrincessLandVR:accdfe5019637736f400455b9b2bab585a20245d
gunnbr/PrincessLandVR:master
...
compare: gunnbr/PrincessLandVR:9c5d74f65fc5c2d2d6097b8b3bc2b49402d1269b
gunnbr/PrincessLandVR:master
4 Commits
accdfe5019 ... 9c5d74f65f
Author SHA1 Message Date
gunnbr 9c5d74f65f Merge branch 'master' of http://sakura:3030/gunnbr/PrincessLandVR 2021-01-12 20:43:50 -08:00
gunnbr 5c85a5db2a Fix up some terrain and objects on top of moved terrain 2021-01-12 20:42:55 -08:00
gunnbr dca604c215 Switch to daytime light 2021-01-12 20:42:28 -08:00
gunnbr 48070fcd8a Adjust fish to swim animation 2021-01-12 20:41:55 -08:00
4 changed files with 835 additions and 832 deletions
Expand all files Collapse all files

No files matched your search

Assets/Gaia User Data/Sessions/GS-20210109 - 193032/Terrain Data/Terrain_0_0-20210109 - 193032.asset
BIN
View File
Binary file not shown.
Assets/Procedural Worlds/Gaia/Lighting/Gaia Lighting System Profile.asset
+1 -1
View File
@@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_multiSceneLightingSupport: 1 m_multiSceneLightingSupport: 1
m_updateInRealtime: 1 m_updateInRealtime: 1
m_selectedLightingProfileValuesIndex: 2 m_selectedLightingProfileValuesIndex: 1
m_renamingProfile: 0 m_renamingProfile: 0
m_editSettings: 1 m_editSettings: 1
m_lightingBakeMode: 1 m_lightingBakeMode: 1
Assets/Quirky Series/Pets/Goldfish/Animations/AC_Goldfish.controller
+36 -36
View File
@@ -24,7 +24,7 @@ AnimatorController:
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!1101 &1101069232905013964 --- !u!1101 &1101069232905013964
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -112,7 +112,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &1101331582686254366 --- !u!1101 &1101331582686254366
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -178,7 +178,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &1101638671196154564 --- !u!1101 &1101638671196154564
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -200,7 +200,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &1101813117540230672 --- !u!1101 &1101813117540230672
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -244,8 +244,8 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1102 &1102068636003343932 --- !u!1102 &1102068636003343932
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -270,7 +270,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102124752476982478 --- !u!1102 &1102124752476982478
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -296,7 +296,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102134918304361458 --- !u!1102 &1102134918304361458
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -322,8 +322,8 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102173684955980844 --- !u!1102 &1102173684955980844
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -349,7 +349,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102174821316947756 --- !u!1102 &1102174821316947756
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -375,7 +375,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102178892989154172 --- !u!1102 &1102178892989154172
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -401,8 +401,8 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102193044716519752 --- !u!1102 &1102193044716519752
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -427,8 +427,8 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102200094495882546 --- !u!1102 &1102200094495882546
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -453,7 +453,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102257740706137686 --- !u!1102 &1102257740706137686
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -479,7 +479,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102264864984767498 --- !u!1102 &1102264864984767498
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -506,7 +506,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102326540909826346 --- !u!1102 &1102326540909826346
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -532,8 +532,8 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102420137043352176 --- !u!1102 &1102420137043352176
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -558,7 +558,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102549092563641162 --- !u!1102 &1102549092563641162
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -584,7 +584,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102584978266722826 --- !u!1102 &1102584978266722826
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -610,8 +610,8 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102642966608558264 --- !u!1102 &1102642966608558264
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -636,7 +636,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102730688722344022 --- !u!1102 &1102730688722344022
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -663,7 +663,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102786437799229866 --- !u!1102 &1102786437799229866
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -689,7 +689,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102811079635423126 --- !u!1102 &1102811079635423126
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -715,8 +715,8 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102831295721099748 --- !u!1102 &1102831295721099748
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -742,8 +742,8 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102921364481200396 --- !u!1102 &1102921364481200396
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@@ -769,7 +769,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102937364975409194 --- !u!1102 &1102937364975409194
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -796,7 +796,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102984611642155622 --- !u!1102 &1102984611642155622
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -822,7 +822,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1107 &1107902928453360364 --- !u!1107 &1107902928453360364
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -892,4 +892,4 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102811079635423126} m_DefaultState: {fileID: 1102984611642155622}
Assets/Scenes/PrincessLand.unity
+798 -795
View File
File diff suppressed because it is too large. Load diff