Skip to content

Commit 95d8218

Browse files
FreehandBlock51FreehandBlock51
committed
FINISHED GAME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
BUGFIXES GALORE~!!!!
1 parent 41919e2 commit 95d8218

6 files changed

Lines changed: 176 additions & 4 deletions

File tree

‎Assets/Scripts/EntanglableObject.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void Start()
2525
}
2626

2727
// Update is called once per frame
28-
void Update()
28+
void FixedUpdate()
2929
{
3030
movement = rigidbody.position - prevPos;
3131
if ((Input.GetButtonUp(ExitEntanglementButton) || resetting) && entangled)
@@ -132,6 +132,7 @@ private void OnCollisionExit2D(Collision2D collision)
132132
if (collision.gameObject.GetComponent<Player>())
133133
{
134134
isMoving = false;
135+
rigidbody.velocity = Vector2.zero;
135136
}
136137
}
137138
}

‎Assets/Scripts/Player.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ public void Finish()
112112
public void ResetLevel()
113113
{
114114
SetPauseState(false);
115+
HUDCanvas.gameObject.SetActive(true);
116+
finishCanvas.gameObject.SetActive(false);
115117
Respawn();
116118
foreach (var e in Object.FindObjectsOfType<ResettableMonoBehaviour>())
117119
{

‎Logs/shadercompiler-UnityShaderCompiler.exe0.log‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,3 +481,4 @@ Cmd: compileSnippet
481481
Cmd: compileSnippet
482482
insize=5634 file=Assets/DefaultResourcesExtra/Hidden/TextCore/Distance Field SSD pass=Pass 0 cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW= dKW=UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=56 ok=1 outsize=1118
483483

484+
Cmd: shutdown

‎ProjectSettings/DynamicsManager.asset‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ PhysicsManager:
77
m_Gravity: {x: 0, y: -9.81, z: 0}
88
m_DefaultMaterial: {fileID: 0}
99
m_BounceThreshold: 2
10+
m_DefaultMaxDepenetrationVelocity: 10
1011
m_SleepThreshold: 0.005
1112
m_DefaultContactOffset: 0.01
1213
m_DefaultSolverIterations: 6
@@ -19,7 +20,7 @@ PhysicsManager:
1920
m_ContactsGeneration: 1
2021
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
2122
m_AutoSimulation: 1
22-
m_AutoSyncTransforms: 0
23+
m_AutoSyncTransforms: 1
2324
m_ReuseCollisionCallbacks: 1
2425
m_ClothInterCollisionSettingsToggle: 0
2526
m_ClothGravity: {x: 0, y: -9.81, z: 0}

‎ProjectSettings/Physics2DSettings.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Physics2DSettings:
2121
m_DefaultContactOffset: 0.01
2222
m_JobOptions:
2323
serializedVersion: 2
24-
useMultithreading: 0
24+
useMultithreading: 1
2525
useConsistencySorting: 0
2626
m_InterpolationPosesPerJob: 100
2727
m_NewContactsPerJob: 30
@@ -43,7 +43,7 @@ Physics2DSettings:
4343
m_QueriesStartInColliders: 1
4444
m_CallbacksOnDisable: 1
4545
m_ReuseCollisionCallbacks: 1
46-
m_AutoSyncTransforms: 0
46+
m_AutoSyncTransforms: 1
4747
m_AlwaysShowColliders: 0
4848
m_ShowColliderSleep: 1
4949
m_ShowColliderContacts: 0

‎ProjectSettings/SceneTemplateSettings.json‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
{
2+
"templatePinStates": [],
3+
"dependencyTypeInfos": [
4+
{
5+
"userAdded": false,
6+
"type": "UnityEngine.AnimationClip",
7+
"ignore": false,
8+
"defaultInstantiationMode": 0,
9+
"supportsModification": true
10+
},
11+
{
12+
"userAdded": false,
13+
"type": "UnityEditor.Animations.AnimatorController",
14+
"ignore": false,
15+
"defaultInstantiationMode": 0,
16+
"supportsModification": true
17+
},
18+
{
19+
"userAdded": false,
20+
"type": "UnityEngine.AnimatorOverrideController",
21+
"ignore": false,
22+
"defaultInstantiationMode": 0,
23+
"supportsModification": true
24+
},
25+
{
26+
"userAdded": false,
27+
"type": "UnityEditor.Audio.AudioMixerController",
28+
"ignore": false,
29+
"defaultInstantiationMode": 0,
30+
"supportsModification": true
31+
},
32+
{
33+
"userAdded": false,
34+
"type": "UnityEngine.ComputeShader",
35+
"ignore": true,
36+
"defaultInstantiationMode": 1,
37+
"supportsModification": true
38+
},
39+
{
40+
"userAdded": false,
41+
"type": "UnityEngine.Cubemap",
42+
"ignore": false,
43+
"defaultInstantiationMode": 0,
44+
"supportsModification": true
45+
},
46+
{
47+
"userAdded": false,
48+
"type": "UnityEngine.GameObject",
49+
"ignore": false,
50+
"defaultInstantiationMode": 0,
51+
"supportsModification": true
52+
},
53+
{
54+
"userAdded": false,
55+
"type": "UnityEditor.LightingDataAsset",
56+
"ignore": false,
57+
"defaultInstantiationMode": 0,
58+
"supportsModification": false
59+
},
60+
{
61+
"userAdded": false,
62+
"type": "UnityEngine.LightingSettings",
63+
"ignore": false,
64+
"defaultInstantiationMode": 0,
65+
"supportsModification": true
66+
},
67+
{
68+
"userAdded": false,
69+
"type": "UnityEngine.Material",
70+
"ignore": false,
71+
"defaultInstantiationMode": 0,
72+
"supportsModification": true
73+
},
74+
{
75+
"userAdded": false,
76+
"type": "UnityEditor.MonoScript",
77+
"ignore": true,
78+
"defaultInstantiationMode": 1,
79+
"supportsModification": true
80+
},
81+
{
82+
"userAdded": false,
83+
"type": "UnityEngine.PhysicMaterial",
84+
"ignore": false,
85+
"defaultInstantiationMode": 0,
86+
"supportsModification": true
87+
},
88+
{
89+
"userAdded": false,
90+
"type": "UnityEngine.PhysicsMaterial2D",
91+
"ignore": false,
92+
"defaultInstantiationMode": 0,
93+
"supportsModification": true
94+
},
95+
{
96+
"userAdded": false,
97+
"type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile",
98+
"ignore": false,
99+
"defaultInstantiationMode": 0,
100+
"supportsModification": true
101+
},
102+
{
103+
"userAdded": false,
104+
"type": "UnityEngine.Rendering.PostProcessing.PostProcessResources",
105+
"ignore": false,
106+
"defaultInstantiationMode": 0,
107+
"supportsModification": true
108+
},
109+
{
110+
"userAdded": false,
111+
"type": "UnityEngine.Rendering.VolumeProfile",
112+
"ignore": false,
113+
"defaultInstantiationMode": 0,
114+
"supportsModification": true
115+
},
116+
{
117+
"userAdded": false,
118+
"type": "UnityEditor.SceneAsset",
119+
"ignore": false,
120+
"defaultInstantiationMode": 0,
121+
"supportsModification": false
122+
},
123+
{
124+
"userAdded": false,
125+
"type": "UnityEngine.Shader",
126+
"ignore": true,
127+
"defaultInstantiationMode": 1,
128+
"supportsModification": true
129+
},
130+
{
131+
"userAdded": false,
132+
"type": "UnityEngine.ShaderVariantCollection",
133+
"ignore": true,
134+
"defaultInstantiationMode": 1,
135+
"supportsModification": true
136+
},
137+
{
138+
"userAdded": false,
139+
"type": "UnityEngine.Texture",
140+
"ignore": false,
141+
"defaultInstantiationMode": 0,
142+
"supportsModification": true
143+
},
144+
{
145+
"userAdded": false,
146+
"type": "UnityEngine.Texture2D",
147+
"ignore": false,
148+
"defaultInstantiationMode": 0,
149+
"supportsModification": true
150+
},
151+
{
152+
"userAdded": false,
153+
"type": "UnityEngine.Timeline.TimelineAsset",
154+
"ignore": false,
155+
"defaultInstantiationMode": 0,
156+
"supportsModification": true
157+
}
158+
],
159+
"defaultDependencyTypeInfo": {
160+
"userAdded": false,
161+
"type": "<default_scene_template_dependencies>",
162+
"ignore": false,
163+
"defaultInstantiationMode": 1,
164+
"supportsModification": true
165+
},
166+
"newSceneOverride": 0
167+
}

0 commit comments

Comments
 (0)