Skip to content

Commit 44acc5a

Browse files
author
Dmitriy Yukhanov
committed
Update Master project to Unity 2019
1 parent 38d8c53 commit 44acc5a

21 files changed

Lines changed: 558 additions & 542 deletions

‎Unity Projects/Package2Folder Master/Packages/manifest.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"dependencies": {
3+
"com.unity.collab-proxy": "1.2.16",
4+
"com.unity.ide.rider": "1.1.4",
5+
"com.unity.ide.vscode": "1.2.0",
6+
"com.unity.test-framework": "1.1.14",
7+
"com.unity.textmeshpro": "2.0.1",
8+
"com.unity.timeline": "1.2.14",
9+
"com.unity.ugui": "1.0.0",
10+
"com.unity.modules.ai": "1.0.0",
11+
"com.unity.modules.androidjni": "1.0.0",
12+
"com.unity.modules.animation": "1.0.0",
13+
"com.unity.modules.assetbundle": "1.0.0",
14+
"com.unity.modules.audio": "1.0.0",
15+
"com.unity.modules.cloth": "1.0.0",
16+
"com.unity.modules.director": "1.0.0",
17+
"com.unity.modules.imageconversion": "1.0.0",
18+
"com.unity.modules.imgui": "1.0.0",
19+
"com.unity.modules.jsonserialize": "1.0.0",
20+
"com.unity.modules.particlesystem": "1.0.0",
21+
"com.unity.modules.physics": "1.0.0",
22+
"com.unity.modules.physics2d": "1.0.0",
23+
"com.unity.modules.screencapture": "1.0.0",
24+
"com.unity.modules.terrain": "1.0.0",
25+
"com.unity.modules.terrainphysics": "1.0.0",
26+
"com.unity.modules.tilemap": "1.0.0",
27+
"com.unity.modules.ui": "1.0.0",
28+
"com.unity.modules.uielements": "1.0.0",
29+
"com.unity.modules.umbra": "1.0.0",
30+
"com.unity.modules.unityanalytics": "1.0.0",
31+
"com.unity.modules.unitywebrequest": "1.0.0",
32+
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
33+
"com.unity.modules.unitywebrequestaudio": "1.0.0",
34+
"com.unity.modules.unitywebrequesttexture": "1.0.0",
35+
"com.unity.modules.unitywebrequestwww": "1.0.0",
36+
"com.unity.modules.vehicles": "1.0.0",
37+
"com.unity.modules.video": "1.0.0",
38+
"com.unity.modules.vr": "1.0.0",
39+
"com.unity.modules.wind": "1.0.0",
40+
"com.unity.modules.xr": "1.0.0"
41+
}
42+
}

‎Unity Projects/Package2Folder Master/ProjectSettings/AudioManager.asset‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@
33
--- !u!11 &1
44
AudioManager:
55
m_ObjectHideFlags: 0
6+
serializedVersion: 2
67
m_Volume: 1
78
Rolloff Scale: 1
8-
m_SpeedOfSound: 347
99
Doppler Factor: 1
1010
Default Speaker Mode: 2
11-
m_DSPBufferSize: 0
11+
m_SampleRate: 0
12+
m_DSPBufferSize: 1024
13+
m_VirtualVoiceCount: 512
14+
m_RealVoiceCount: 32
15+
m_SpatializerPlugin:
16+
m_AmbisonicDecoderPlugin:
1217
m_DisableAudio: 0
18+
m_VirtualizeEffects: 1
19+
m_RequestedDSPBufferSize: 0

‎Unity Projects/Package2Folder Master/ProjectSettings/DynamicsManager.asset‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,34 @@
33
--- !u!55 &1
44
PhysicsManager:
55
m_ObjectHideFlags: 0
6-
m_Gravity: {x: 0, y: -9.81000042, z: 0}
6+
serializedVersion: 13
7+
m_Gravity: {x: 0, y: -9.81, z: 0}
78
m_DefaultMaterial: {fileID: 0}
89
m_BounceThreshold: 2
9-
m_SleepVelocity: .150000006
10-
m_SleepAngularVelocity: .140000001
11-
m_MaxAngularVelocity: 7
12-
m_MinPenetrationForPenalty: .00999999978
13-
m_SolverIterationCount: 6
14-
m_RaycastsHitTriggers: 1
10+
m_SleepThreshold: 0.005
11+
m_DefaultContactOffset: 0.01
12+
m_DefaultSolverIterations: 6
13+
m_DefaultSolverVelocityIterations: 1
14+
m_QueriesHitBackfaces: 0
15+
m_QueriesHitTriggers: 1
16+
m_EnableAdaptiveForce: 0
17+
m_ClothInterCollisionDistance: 0.1
18+
m_ClothInterCollisionStiffness: 0.2
19+
m_ContactsGeneration: 1
1520
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
21+
m_AutoSimulation: 1
22+
m_AutoSyncTransforms: 0
23+
m_ReuseCollisionCallbacks: 0
24+
m_ClothInterCollisionSettingsToggle: 0
25+
m_ClothGravity: {x: 0, y: -9.81, z: 0}
26+
m_ContactPairsMode: 0
27+
m_BroadphaseType: 0
28+
m_WorldBounds:
29+
m_Center: {x: 0, y: 0, z: 0}
30+
m_Extent: {x: 250, y: 250, z: 250}
31+
m_WorldSubdivisions: 8
32+
m_FrictionType: 0
33+
m_EnableEnhancedDeterminism: 0
34+
m_EnableUnifiedHeightmaps: 1
35+
m_SolverType: 0
36+
m_DefaultMaxAngularSpeed: 50

‎Unity Projects/Package2Folder Master/ProjectSettings/EditorBuildSettings.asset‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ EditorBuildSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Scenes: []
8+
m_configObjects: {}

‎Unity Projects/Package2Folder Master/ProjectSettings/EditorSettings.asset‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,33 @@
33
--- !u!159 &1
44
EditorSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 3
6+
serializedVersion: 9
77
m_ExternalVersionControlSupport: Visible Meta Files
88
m_SerializationMode: 2
9-
m_WebSecurityEmulationEnabled: 0
10-
m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d
9+
m_LineEndingsForNewScripts: 2
1110
m_DefaultBehaviorMode: 0
12-
m_SpritePackerMode: 2
11+
m_PrefabRegularEnvironment: {fileID: 0}
12+
m_PrefabUIEnvironment: {fileID: 0}
13+
m_SpritePackerMode: 0
14+
m_SpritePackerPaddingPower: 1
15+
m_EtcTextureCompressorBehavior: 1
16+
m_EtcTextureFastCompressor: 1
17+
m_EtcTextureNormalCompressor: 2
18+
m_EtcTextureBestCompressor: 4
19+
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp
20+
m_ProjectGenerationRootNamespace:
21+
m_CollabEditorSettings:
22+
inProgressEnabled: 1
23+
m_EnableTextureStreamingInEditMode: 1
24+
m_EnableTextureStreamingInPlayMode: 1
25+
m_AsyncShaderCompilation: 1
26+
m_EnterPlayModeOptionsEnabled: 0
27+
m_EnterPlayModeOptions: 3
28+
m_ShowLightmapResolutionOverlay: 1
29+
m_UseLegacyProbeSampleCount: 0
30+
m_AssetPipelineMode: 1
31+
m_CacheServerMode: 0
32+
m_CacheServerEndpoint:
33+
m_CacheServerNamespacePrefix: default
34+
m_CacheServerEnableDownload: 1
35+
m_CacheServerEnableUpload: 1

‎Unity Projects/Package2Folder Master/ProjectSettings/GraphicsSettings.asset‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!30 &1
44
GraphicsSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 12
6+
serializedVersion: 13
77
m_Deferred:
88
m_Mode: 1
99
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -35,6 +35,7 @@ GraphicsSettings:
3535
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
3636
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
3737
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
38+
- {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
3839
m_PreloadedShaders: []
3940
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
4041
type: 0}
@@ -59,3 +60,5 @@ GraphicsSettings:
5960
m_AlbedoSwatchInfos: []
6061
m_LightsUseLinearIntensity: 0
6162
m_LightsUseColorTemperature: 0
63+
m_LogWhenShaderIsCompiled: 0
64+
m_AllowEnlightenSupportForUpgradedProject: 0

‎Unity Projects/Package2Folder Master/ProjectSettings/InputManager.asset‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ InputManager:
1414
altNegativeButton: a
1515
altPositiveButton: d
1616
gravity: 3
17-
dead: .00100000005
17+
dead: 0.001
1818
sensitivity: 3
1919
snap: 1
2020
invert: 0
@@ -30,7 +30,7 @@ InputManager:
3030
altNegativeButton: s
3131
altPositiveButton: w
3232
gravity: 3
33-
dead: .00100000005
33+
dead: 0.001
3434
sensitivity: 3
3535
snap: 1
3636
invert: 0
@@ -46,7 +46,7 @@ InputManager:
4646
altNegativeButton:
4747
altPositiveButton: mouse 0
4848
gravity: 1000
49-
dead: .00100000005
49+
dead: 0.001
5050
sensitivity: 1000
5151
snap: 0
5252
invert: 0
@@ -62,7 +62,7 @@ InputManager:
6262
altNegativeButton:
6363
altPositiveButton: mouse 1
6464
gravity: 1000
65-
dead: .00100000005
65+
dead: 0.001
6666
sensitivity: 1000
6767
snap: 0
6868
invert: 0
@@ -74,11 +74,11 @@ InputManager:
7474
descriptiveName:
7575
descriptiveNegativeName:
7676
negativeButton:
77-
positiveButton: left cmd
77+
positiveButton: left shift
7878
altNegativeButton:
7979
altPositiveButton: mouse 2
8080
gravity: 1000
81-
dead: .00100000005
81+
dead: 0.001
8282
sensitivity: 1000
8383
snap: 0
8484
invert: 0
@@ -94,7 +94,7 @@ InputManager:
9494
altNegativeButton:
9595
altPositiveButton:
9696
gravity: 1000
97-
dead: .00100000005
97+
dead: 0.001
9898
sensitivity: 1000
9999
snap: 0
100100
invert: 0
@@ -111,7 +111,7 @@ InputManager:
111111
altPositiveButton:
112112
gravity: 0
113113
dead: 0
114-
sensitivity: .100000001
114+
sensitivity: 0.1
115115
snap: 0
116116
invert: 0
117117
type: 1
@@ -127,7 +127,7 @@ InputManager:
127127
altPositiveButton:
128128
gravity: 0
129129
dead: 0
130-
sensitivity: .100000001
130+
sensitivity: 0.1
131131
snap: 0
132132
invert: 0
133133
type: 1
@@ -143,7 +143,7 @@ InputManager:
143143
altPositiveButton:
144144
gravity: 0
145145
dead: 0
146-
sensitivity: .100000001
146+
sensitivity: 0.1
147147
snap: 0
148148
invert: 0
149149
type: 1
@@ -158,7 +158,7 @@ InputManager:
158158
altNegativeButton:
159159
altPositiveButton:
160160
gravity: 0
161-
dead: .189999998
161+
dead: 0.19
162162
sensitivity: 1
163163
snap: 0
164164
invert: 0
@@ -174,7 +174,7 @@ InputManager:
174174
altNegativeButton:
175175
altPositiveButton:
176176
gravity: 0
177-
dead: .189999998
177+
dead: 0.19
178178
sensitivity: 1
179179
snap: 0
180180
invert: 1
@@ -190,7 +190,7 @@ InputManager:
190190
altNegativeButton:
191191
altPositiveButton:
192192
gravity: 1000
193-
dead: .00100000005
193+
dead: 0.001
194194
sensitivity: 1000
195195
snap: 0
196196
invert: 0
@@ -206,7 +206,7 @@ InputManager:
206206
altNegativeButton:
207207
altPositiveButton:
208208
gravity: 1000
209-
dead: .00100000005
209+
dead: 0.001
210210
sensitivity: 1000
211211
snap: 0
212212
invert: 0
@@ -222,7 +222,7 @@ InputManager:
222222
altNegativeButton:
223223
altPositiveButton:
224224
gravity: 1000
225-
dead: .00100000005
225+
dead: 0.001
226226
sensitivity: 1000
227227
snap: 0
228228
invert: 0
@@ -238,7 +238,7 @@ InputManager:
238238
altNegativeButton:
239239
altPositiveButton:
240240
gravity: 1000
241-
dead: .00100000005
241+
dead: 0.001
242242
sensitivity: 1000
243243
snap: 0
244244
invert: 0
@@ -254,7 +254,7 @@ InputManager:
254254
altNegativeButton:
255255
altPositiveButton: joystick button 0
256256
gravity: 1000
257-
dead: .00100000005
257+
dead: 0.001
258258
sensitivity: 1000
259259
snap: 0
260260
invert: 0
@@ -270,7 +270,7 @@ InputManager:
270270
altNegativeButton:
271271
altPositiveButton: space
272272
gravity: 1000
273-
dead: .00100000005
273+
dead: 0.001
274274
sensitivity: 1000
275275
snap: 0
276276
invert: 0
@@ -286,7 +286,7 @@ InputManager:
286286
altNegativeButton:
287287
altPositiveButton: joystick button 1
288288
gravity: 1000
289-
dead: .00100000005
289+
dead: 0.001
290290
sensitivity: 1000
291291
snap: 0
292292
invert: 0

0 commit comments

Comments
 (0)