-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
It was causing issues with saving the serialization of certain objects.
- Loading branch information
james7132
committed
Apr 18, 2015
1 parent
d36ed22
commit 1801e50
Showing
18 changed files
with
1,080 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,6 @@ | |
| [Bb]uild/ | ||
| [Dd]ocs/html | ||
|
|
||
| [Pp]rojectSettings | ||
| Assets/TestTemp | ||
| Assets/TestTemp.meta | ||
|
|
||
|
|
||
Binary file modified
BIN
-1.69 KB
(65%)
Assets/External/DanmakU/Materials/Inverted One Color Danmaku Material.mat
Binary file not shown.
Binary file modified
BIN
-1.69 KB
(65%)
Assets/External/DanmakU/Materials/Standard One Color Danmaku Material.mat
Binary file not shown.
Binary file modified
BIN
-3.58 KB
(15%)
Assets/Plugins/Editor/Vexe/ScriptableAssets/VFWSettings.asset
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!11 &1 | ||
| AudioManager: | ||
| m_ObjectHideFlags: 0 | ||
| m_Volume: 1 | ||
| Rolloff Scale: 1 | ||
| Doppler Factor: 1 | ||
| Default Speaker Mode: 2 | ||
| m_SampleRate: 0 | ||
| m_DSPBufferSize: 0 | ||
| m_VirtualVoiceCount: 512 | ||
| m_RealVoiceCount: 32 | ||
| m_DisableAudio: 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!55 &1 | ||
| PhysicsManager: | ||
| m_ObjectHideFlags: 0 | ||
| m_Gravity: {x: 0, y: -9.81000042, z: 0} | ||
| m_DefaultMaterial: {fileID: 0} | ||
| m_BounceThreshold: 2 | ||
| m_SleepThreshold: .00499999989 | ||
| m_DefaultContactOffset: .00999999978 | ||
| m_SolverIterationCount: 6 | ||
| m_RaycastsHitTriggers: 1 | ||
| m_EnableAdaptiveForce: 0 | ||
| m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!1045 &1 | ||
| EditorBuildSettings: | ||
| m_ObjectHideFlags: 0 | ||
| serializedVersion: 2 | ||
| m_Scenes: [] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!159 &1 | ||
| EditorSettings: | ||
| m_ObjectHideFlags: 0 | ||
| serializedVersion: 3 | ||
| m_ExternalVersionControlSupport: Visible Meta Files | ||
| m_SerializationMode: 2 | ||
| m_WebSecurityEmulationEnabled: 0 | ||
| m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d | ||
| m_DefaultBehaviorMode: 1 | ||
| m_SpritePackerMode: 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!30 &1 | ||
| GraphicsSettings: | ||
| m_ObjectHideFlags: 0 | ||
| serializedVersion: 3 | ||
| m_Deferred: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_LegacyDeferred: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_AlwaysIncludedShaders: | ||
| - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_PreloadedShaders: [] | ||
| m_LightmapStripping: 0 | ||
| m_LightmapKeepPlain: 1 | ||
| m_LightmapKeepDirCombined: 1 | ||
| m_LightmapKeepDirSeparate: 1 | ||
| m_LightmapKeepDynamic: 1 | ||
| m_FogStripping: 0 | ||
| m_FogKeepLinear: 1 | ||
| m_FogKeepExp: 1 | ||
| m_FogKeepExp2: 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,295 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!13 &1 | ||
| InputManager: | ||
| m_ObjectHideFlags: 0 | ||
| serializedVersion: 2 | ||
| m_Axes: | ||
| - serializedVersion: 3 | ||
| m_Name: Horizontal | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: left | ||
| positiveButton: right | ||
| altNegativeButton: a | ||
| altPositiveButton: d | ||
| gravity: 3 | ||
| dead: .00100000005 | ||
| sensitivity: 3 | ||
| snap: 1 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Vertical | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: down | ||
| positiveButton: up | ||
| altNegativeButton: s | ||
| altPositiveButton: w | ||
| gravity: 3 | ||
| dead: .00100000005 | ||
| sensitivity: 3 | ||
| snap: 1 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Fire1 | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: left ctrl | ||
| altNegativeButton: | ||
| altPositiveButton: mouse 0 | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Fire2 | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: left alt | ||
| altNegativeButton: | ||
| altPositiveButton: mouse 1 | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Fire3 | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: left cmd | ||
| altNegativeButton: | ||
| altPositiveButton: mouse 2 | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Jump | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: space | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Mouse X | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 0 | ||
| dead: 0 | ||
| sensitivity: .100000001 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 1 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Mouse Y | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 0 | ||
| dead: 0 | ||
| sensitivity: .100000001 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 1 | ||
| axis: 1 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Mouse ScrollWheel | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 0 | ||
| dead: 0 | ||
| sensitivity: .100000001 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 1 | ||
| axis: 2 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Horizontal | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 0 | ||
| dead: .189999998 | ||
| sensitivity: 1 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 2 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Vertical | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 0 | ||
| dead: .189999998 | ||
| sensitivity: 1 | ||
| snap: 0 | ||
| invert: 1 | ||
| type: 2 | ||
| axis: 1 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Fire1 | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: joystick button 0 | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Fire2 | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: joystick button 1 | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Fire3 | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: joystick button 2 | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Jump | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: joystick button 3 | ||
| altNegativeButton: | ||
| altPositiveButton: | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Submit | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: return | ||
| altNegativeButton: | ||
| altPositiveButton: joystick button 0 | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Submit | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: enter | ||
| altNegativeButton: | ||
| altPositiveButton: space | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 | ||
| - serializedVersion: 3 | ||
| m_Name: Cancel | ||
| descriptiveName: | ||
| descriptiveNegativeName: | ||
| negativeButton: | ||
| positiveButton: escape | ||
| altNegativeButton: | ||
| altPositiveButton: joystick button 1 | ||
| gravity: 1000 | ||
| dead: .00100000005 | ||
| sensitivity: 1000 | ||
| snap: 0 | ||
| invert: 0 | ||
| type: 0 | ||
| axis: 0 | ||
| joyNum: 0 |
Oops, something went wrong.