Merge branch 'master' of https://github.com/BRNSystems/GeoJam2021

_
Update EditorUserSettings.asset
2021-07-23 17:35:32 +02:00 · 2021-07-23 17:16:48 +02:00 · 2021-07-23 17:16:30 +02:00 · 2021-07-23 17:00:30 +02:00 · 2021-07-23 16:26:49 +02:00 · 2021-07-23 16:25:24 +02:00
27 changed files with 20593 additions and 1292 deletions
--- a/Assets/Scenes/Finish.unity
+++ b/Assets/Scenes/Finish.unity
@@ -260,7 +260,7 @@ MonoBehaviour:
    was my first game in Unity, so it was a bit crappy.

    I also want to thank
-    @Tucan444 and his very helpful parrot Kio for helping me out.
+    @Tucan444 and his very helpful parrot Kyo for helping me out.

    I hope you
    enjoyed it.
--- a/Assets/Scenes/Level2.unity
+++ b/Assets/Scenes/Level2.unity
@@ -305,7 +305,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  width: 20
  height: 0
-  speed: 4
+  speed: 8
 --- !u!1 &252954236
 GameObject:
  m_ObjectHideFlags: 0
@@ -742,8 +742,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  width: 0
-  height: 20
-  speed: 4
+  height: 15
+  speed: 6
 --- !u!50 &614575552
 Rigidbody2D:
  serializedVersion: 4
--- a/Assets/Scenes/Level3.unity
+++ b/Assets/Scenes/Level3.unity
--- a/Assets/Scenes/Level4.unity
+++ b/Assets/Scenes/Level4.unity
@@ -187,11 +187,11 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 109409225}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 49.929996, y: 0.20000029, z: 0.70835644}
+  m_LocalPosition: {x: 49.929996, y: 12.049999, z: 0.70835644}
  m_LocalScale: {x: 30, y: 2, z: 1}
  m_Children: []
  m_Father: {fileID: 1985907937}
-  m_RootOrder: 1
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!50 &109409227
 Rigidbody2D:
@@ -303,9 +303,9 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 20c0ecf95ac68c343bdf7b8295ff699c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  width: 30
+  width: 20
  height: 0
-  speed: 6
+  speed: 5
 --- !u!1 &219660005
 GameObject:
  m_ObjectHideFlags: 0
@@ -333,11 +333,11 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 219660005}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -4.2, y: 116.399994, z: 0}
+  m_LocalPosition: {x: -78.4, y: 123.1, z: 0}
  m_LocalScale: {x: 4, y: 4, z: 1}
  m_Children: []
  m_Father: {fileID: 343801489}
-  m_RootOrder: 8
+  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!58 &219660007
 CircleCollider2D:
@@ -455,7 +455,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 220224344}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 50.55, y: 96.2, z: 0}
+  m_LocalPosition: {x: -23.650003, y: 102.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 242202550}
@@ -5384,153 +5384,6 @@ ParticleSystem:
        m_PostInfinity: 2
        m_RotationOrder: 4
    vectorLabel1_3: W
--- !u!1 &246033624
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 246033625}
-  - component: {fileID: 246033629}
-  - component: {fileID: 246033628}
-  - component: {fileID: 246033627}
-  - component: {fileID: 246033626}
-  m_Layer: 3
-  m_Name: Floor (2)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &246033625
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 246033624}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 103, y: -14, z: 0.70835644}
-  m_LocalScale: {x: 30, y: 2, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1985907937}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &246033626
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 246033624}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 20c0ecf95ac68c343bdf7b8295ff699c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  width: 0
-  height: 60
-  speed: 5
--- !u!50 &246033627
-Rigidbody2D:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 246033624}
-  m_BodyType: 2
-  m_Simulated: 1
-  m_UseFullKinematicContacts: 0
-  m_UseAutoMass: 0
-  m_Mass: 1
-  m_LinearDrag: 0
-  m_AngularDrag: 0.05
-  m_GravityScale: 1
-  m_Material: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
-  m_Interpolate: 0
-  m_SleepingMode: 1
-  m_CollisionDetection: 0
-  m_Constraints: 0
--- !u!61 &246033628
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 246033624}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1, y: 1}
-    newSize: {x: 1, y: 1}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1}
-  m_EdgeRadius: 0
--- !u!212 &246033629
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 246033624}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
-  m_Color: {r: 0, g: 1, b: 0.5628011, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!1 &252954236
 GameObject:
  m_ObjectHideFlags: 0
@@ -5558,7 +5411,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 252954236}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 17.7, y: 0.20000029, z: 0.70835644}
+  m_LocalPosition: {x: 17.7, y: 12.049999, z: 0.70835644}
  m_LocalScale: {x: 30, y: 2, z: 1}
  m_Children: []
  m_Father: {fileID: 343801489}
@@ -5687,7 +5540,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 257621625}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -18.9, y: 145.5, z: 0}
+  m_LocalPosition: {x: -93.1, y: 159.29999, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1921484424}
@@ -5762,7 +5615,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 286945036}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 43.91, y: 96.2, z: 0}
+  m_LocalPosition: {x: -30.290003, y: 102.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1240505895}
@@ -5914,11 +5767,11 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 288585695}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -27.199997, y: 122.8, z: 0.70835644}
+  m_LocalPosition: {x: -101.4, y: 129.5, z: 0.70835644}
  m_LocalScale: {x: 30, y: 2, z: 1}
  m_Children: []
  m_Father: {fileID: 343801489}
-  m_RootOrder: 5
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!50 &288585697
 Rigidbody2D:
@@ -6046,7 +5899,6 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 252954237}
-  - {fileID: 1196936240}
  - {fileID: 1985907937}
  - {fileID: 418549211}
  - {fileID: 1489042155}
@@ -6085,8 +5937,9 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 2033623434}
+  - {fileID: 824791897}
  m_Father: {fileID: 343801489}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &448048076
 GameObject:
@@ -6136,6 +5989,156 @@ MonoBehaviour:
  blendDistance: 0
  weight: 1
  sharedProfile: {fileID: 11400000, guid: f293c0209739a5248b5cf4f586e42777, type: 2}
+--- !u!1 &464318691
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 464318692}
+  - component: {fileID: 464318696}
+  - component: {fileID: 464318695}
+  - component: {fileID: 464318694}
+  - component: {fileID: 464318693}
+  m_Layer: 3
+  m_Name: Floor (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &464318692
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 464318691}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 42.199997, y: 86.90001, z: 0.70835644}
+  m_LocalScale: {x: 30, y: 2, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1985907937}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &464318693
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 464318691}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4366df60f8ac7f428d235d55b5dfc13, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rotation_center: {fileID: 824791896}
+  static_center: 1
+  right_rotation: 0
+  flipping: 1
+  speed: 0.3
+  flip_angle: 1.57
+--- !u!50 &464318694
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 464318691}
+  m_BodyType: 2
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!61 &464318695
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 464318691}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 1, y: 1}
+    newSize: {x: 1, y: 1}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1}
+  m_EdgeRadius: 0
+--- !u!212 &464318696
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 464318691}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
+  m_Color: {r: 0, g: 1, b: 0.5628011, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &500090627
 GameObject:
  m_ObjectHideFlags: 0
@@ -6164,7 +6167,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 500090627}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 47.95, y: 96.2, z: 0}
+  m_LocalPosition: {x: -26.250002, y: 102.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 970640617}
@@ -6383,7 +6386,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 519420028}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 16.04, y: 2.2000003, z: -10}
+  m_LocalPosition: {x: 16.04, y: 14.049999, z: -10}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
@@ -6461,7 +6464,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 609569528}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 46.5, y: 96.2, z: 0}
+  m_LocalPosition: {x: -27.7, y: 102.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1132703104}
@@ -6611,7 +6614,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 653418596}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 101.4, y: 16.3, z: 0}
+  m_LocalPosition: {x: 50, y: 28.149998, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1921484424}
@@ -6891,7 +6894,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 685738179}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 8.900002, y: 3.0500002, z: 0}
+  m_LocalPosition: {x: 8.900002, y: 14.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1137646168}
@@ -6968,7 +6971,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 737155566}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 62.529984, y: 15.241393, z: 90}
+  m_LocalPosition: {x: 23.6826, y: 15.858, z: 90}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 48681355}
@@ -7019,7 +7022,7 @@ SpriteRenderer:
  m_FlipX: 0
  m_FlipY: 0
  m_DrawMode: 2
-  m_Size: {x: 400, y: 500}
+  m_Size: {x: 477.6949, y: 501.23328}
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
@@ -7159,7 +7162,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 796506222}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 27.619999, y: 5.58, z: 3}
+  m_LocalPosition: {x: 27.619999, y: 17.43, z: 3}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 964927014}
@@ -7209,6 +7212,36 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  spawnpoint: {x: 0, y: 0, z: 0}
+--- !u!1 &824791896
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 824791897}
+  m_Layer: 0
+  m_Name: center (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &824791897
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 824791896}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 21.9, y: 65.8, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 418549211}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &842737243
 GameObject:
  m_ObjectHideFlags: 0
@@ -7237,7 +7270,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 842737243}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 45.14, y: 96.2, z: 0}
+  m_LocalPosition: {x: -29.060003, y: 102.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1413890304}
@@ -7396,7 +7429,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.84000015, y: 2.04}
+  m_AnchoredPosition: {x: -0.84000015, y: 13.889999}
  m_SizeDelta: {x: 20, y: 4.4791}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &879779304
@@ -17265,7 +17298,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 999192582}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 18.87, y: 120.06, z: 3}
+  m_LocalPosition: {x: -55.33, y: 126.76, z: 3}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 964927014}
@@ -17404,11 +17437,11 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1050230245}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 18.6, y: 115.2, z: 0}
+  m_LocalPosition: {x: -55.600006, y: 121.9, z: 0}
  m_LocalScale: {x: 4, y: 4, z: 1}
  m_Children: []
  m_Father: {fileID: 343801489}
-  m_RootOrder: 7
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!58 &1050230247
 CircleCollider2D:
@@ -22360,7 +22393,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1143995378}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 49.2, y: 96.2, z: 0}
+  m_LocalPosition: {x: -25.000002, y: 102.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 932432541}
@@ -22517,137 +22550,6 @@ Transform:
  m_Father: {fileID: 48681355}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1196936239
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1196936240}
-  - component: {fileID: 1196936243}
-  - component: {fileID: 1196936242}
-  - component: {fileID: 1196936241}
-  m_Layer: 3
-  m_Name: Floor (2)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &1196936240
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1196936239}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 90.4, y: 94.6, z: 0.70835644}
-  m_LocalScale: {x: 30, y: 2, z: 1}
-  m_Children: []
-  m_Father: {fileID: 343801489}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &1196936241
-Rigidbody2D:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1196936239}
-  m_BodyType: 2
-  m_Simulated: 1
-  m_UseFullKinematicContacts: 0
-  m_UseAutoMass: 0
-  m_Mass: 1
-  m_LinearDrag: 0
-  m_AngularDrag: 0.05
-  m_GravityScale: 1
-  m_Material: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
-  m_Interpolate: 0
-  m_SleepingMode: 1
-  m_CollisionDetection: 0
-  m_Constraints: 0
--- !u!61 &1196936242
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1196936239}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1, y: 1}
-    newSize: {x: 1, y: 1}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1}
-  m_EdgeRadius: 0
--- !u!212 &1196936243
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1196936239}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
-  m_Color: {r: 0.97034955, g: 1, b: 0, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!1 &1232501489
 GameObject:
  m_ObjectHideFlags: 0
@@ -22673,7 +22575,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1232501489}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 15.8, y: 14.8, z: 0}
+  m_LocalPosition: {x: -35.600006, y: 26.65, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1921484424}
@@ -27552,7 +27454,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1257805570}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 42.46, y: 96.2, z: 0}
+  m_LocalPosition: {x: -31.740004, y: 102.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 2082928781}
@@ -32664,11 +32566,11 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1489042154}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 52, y: 94.6, z: 0.70835644}
+  m_LocalPosition: {x: -22.200003, y: 101.299995, z: 0.70835644}
  m_LocalScale: {x: 30, y: 2, z: 1}
  m_Children: []
  m_Father: {fileID: 343801489}
-  m_RootOrder: 4
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!50 &1489042156
 Rigidbody2D:
@@ -37894,7 +37796,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1744140755}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -19.899998, y: 127.500015, z: 3}
+  m_LocalPosition: {x: -94.1, y: 134.20001, z: 3}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 964927014}
@@ -38138,7 +38040,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1750757246}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -43.6, y: 130.3, z: 0}
+  m_LocalPosition: {x: -117.799995, y: 137, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 883602336}
@@ -38172,7 +38074,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1809578486}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 41.1, y: 96.2, z: 0}
+  m_LocalPosition: {x: -33.100006, y: 102.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1520518861}
@@ -38452,7 +38354,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1827974989}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 54.5, y: 98.8, z: 3}
+  m_LocalPosition: {x: -19.700003, y: 105.50001, z: 3}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 964927014}
@@ -38589,7 +38491,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1916920124}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 159.7, y: 83.5, z: 0}
+  m_LocalPosition: {x: 108.299995, y: 83.5, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1921484424}
@@ -38698,11 +38600,11 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1938238705}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 30.1, y: 96.5, z: 0}
+  m_LocalPosition: {x: -44.100006, y: 103.200005, z: 0}
  m_LocalScale: {x: 4, y: 4, z: 1}
  m_Children: []
  m_Father: {fileID: 343801489}
-  m_RootOrder: 6
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!58 &1938238707
 CircleCollider2D:
@@ -38819,11 +38721,11 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 246033625}
  - {fileID: 109409226}
  - {fileID: 2041384883}
+  - {fileID: 464318692}
  m_Father: {fileID: 343801489}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2033623433
 GameObject:
@@ -38849,7 +38751,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2033623433}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 117.8, y: 59.8, z: 0}
+  m_LocalPosition: {x: 22.999998, y: 25.9, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 418549211}
@@ -43687,11 +43589,11 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2041384882}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 147.30002, y: 39.1, z: 0.70835644}
+  m_LocalPosition: {x: 99.4, y: 27.600002, z: 0.70835644}
  m_LocalScale: {x: 30, y: 2, z: 1}
  m_Children: []
  m_Father: {fileID: 1985907937}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2041384884
 MonoBehaviour:
@@ -43709,8 +43611,8 @@ MonoBehaviour:
  static_center: 1
  right_rotation: 1
  flipping: 1
-  speed: 0.5
-  flip_angle: 5
+  speed: 0.2
+  flip_angle: 2
 --- !u!50 &2041384885
 Rigidbody2D:
  serializedVersion: 4
@@ -48638,7 +48540,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2113548399}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 66, y: 126.3, z: 0}
+  m_LocalPosition: {x: -8.200003, y: 133, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1921484424}
--- a/Assets/Scenes/Level5.unity
+++ b/Assets/Scenes/Level5.unity
@@ -5300,7 +5300,7 @@ MonoBehaviour:
  m_LightCookieSprite: {fileID: 0}
  m_UseNormalMap: 0
  m_LightOrder: 0
-  m_AlphaBlendOnOverlap: 0
+  m_AlphaBlendOnOverlap: 1
  m_ShadowIntensity: 0
  m_ShadowVolumeIntensity: 0
  m_PointLightInnerAngle: 360
@@ -62489,7 +62489,7 @@ MonoBehaviour:
  m_LightCookieSprite: {fileID: 0}
  m_UseNormalMap: 0
  m_LightOrder: 0
-  m_AlphaBlendOnOverlap: 0
+  m_AlphaBlendOnOverlap: 1
  m_ShadowIntensity: 0
  m_ShadowVolumeIntensity: 0
  m_PointLightInnerAngle: 360
@@ -87258,7 +87258,7 @@ MonoBehaviour:
  m_LightCookieSprite: {fileID: 0}
  m_UseNormalMap: 0
  m_LightOrder: 0
-  m_AlphaBlendOnOverlap: 0
+  m_AlphaBlendOnOverlap: 1
  m_ShadowIntensity: 0
  m_ShadowVolumeIntensity: 0
  m_PointLightInnerAngle: 360
@@ -103374,7 +103374,7 @@ MonoBehaviour:
  m_LightCookieSprite: {fileID: 0}
  m_UseNormalMap: 0
  m_LightOrder: 0
-  m_AlphaBlendOnOverlap: 0
+  m_AlphaBlendOnOverlap: 1
  m_ShadowIntensity: 0
  m_ShadowVolumeIntensity: 0
  m_PointLightInnerAngle: 360
@@ -104232,7 +104232,7 @@ MonoBehaviour:
  m_LightCookieSprite: {fileID: 0}
  m_UseNormalMap: 0
  m_LightOrder: 0
-  m_AlphaBlendOnOverlap: 0
+  m_AlphaBlendOnOverlap: 1
  m_ShadowIntensity: 0
  m_ShadowVolumeIntensity: 0
  m_PointLightInnerAngle: 360
--- a/Assets/Scenes/Menu.unity
+++ b/Assets/Scenes/Menu.unity
@@ -226,6 +226,7 @@ MonoBehaviour:
    m_Bits: 32
  sfx: {fileID: 1499575167}
  mouse: {fileID: 1949375702}
+  sr: {fileID: 231727548}
 --- !u!50 &231727551
 Rigidbody2D:
  serializedVersion: 4
--- a/Assets/Scenes/Tutorial.unity
+++ b/Assets/Scenes/Tutorial.unity
--- a/Assets/Scripts/CameraTracking.cs
+++ b/Assets/Scripts/CameraTracking.cs
@@ -29,9 +29,7 @@ public class CameraTracking : MonoBehaviour

        difference[0] = player_pos[0] - camera_pos[0];
        difference[1] = player_pos[1] - camera_pos[1];
-
        float smoothing_ = smoothing / Time.deltaTime;
-
        camera_pos[0] += difference[0] / smoothing_;
        camera_pos[1] += difference[1] / smoothing_;

--- a/Assets/Scripts/MenuPlay.cs
+++ b/Assets/Scripts/MenuPlay.cs
@@ -8,6 +8,9 @@ public class MenuPlay : MonoBehaviour
    public LayerMask contactFilter;
    public AudioSource sfx;
    public MenuMouse mouse;
+    public SpriteRenderer sr;
+    private bool hover = false;
+    private bool previous_hover = false;
    // Start is called before the first frame update
    void Start()
    {
@@ -17,11 +20,25 @@ public class MenuPlay : MonoBehaviour
    // Update is called once per frame
    void Update()
    {
-        if (Input.GetMouseButtonDown(0)){
-            if(Physics2D.CircleCast(mouse.pos, 1f, Vector2.zero, 0f, contactFilter)){
+        if(Physics2D.CircleCast(mouse.pos, 1f, Vector2.zero, 0f, contactFilter)){
+            if (Input.GetMouseButtonDown(0)){
                sfx.Play();
                SceneManager.LoadScene("Tutorial");
            }
+
+            previous_hover = hover;
+            hover = true;
+        } else {
+            previous_hover = hover;
+            hover = false;
+        } 
+
+        if (hover != previous_hover) {
+            if(hover) {
+                sr.color = new Color(202f / 255f, 202f / 255f, 242f / 255f, 201f / 255f);
+            } else {
+                sr.color = new Color(149f / 255f, 189f / 255f, 253f / 255f, 201f / 255f);
+            }
        }
    }
 }
--- a/Assets/Scripts/MovingPlatform.cs
+++ b/Assets/Scripts/MovingPlatform.cs
@@ -7,7 +7,7 @@ public class MovingPlatform : MonoBehaviour

    public float width;
    public float height;
-    [Range(0.1f, 8)] [SerializeField] private float speed = 1;
+    [Range(0.1f, 80 )] [SerializeField] private float speed = 1;

    private bool movingLeft = false;
    private bool movingUp = false;
--- a/Assets/Scripts/Rotation.cs
+++ b/Assets/Scripts/Rotation.cs
@@ -10,7 +10,7 @@ public class Rotation : MonoBehaviour
    public bool static_center = true;
    public bool right_rotation = true;
    public bool flipping = false;
-    [Range(1f, 180f)] public float speed = 1;
+    [Range(0.1f, 180f)] public float speed = 1;
    [Range(0, (float)Math.PI * 2)] public float flip_angle = 0;

    private float angle;
--- a/Assets/Sprites/Logos/geojam_banner.png
+++ b/Assets/Sprites/Logos/geojam_banner.png
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -558,7 +558,7 @@ PlayerSettings:
  webGLTemplate: APPLICATION:Default
  webGLAnalyzeBuildSize: 0
  webGLUseEmbeddedResources: 0
-  webGLCompressionFormat: 0
+  webGLCompressionFormat: 2
  webGLWasmArithmeticExceptions: 0
  webGLLinkerTarget: 1
  webGLThreadsSupport: 0
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # GeoJam2021

-Hello this will be my entry to the [GeoJam2021](https://itch.io/jam/geojam-2021) hosted by [Icoso](https://www.youtube.com/channel/UCL7FCx3MrwKGYFEs91Lz0yg)
+Hello this will be my entry to the [GeoJam2021](https://itch.io/jam/geojam-2021)hosted by [Icoso](https://www.youtube.com/channel/UCL7FCx3MrwKGYFEs91Lz0yg)
+
+This game was coded with [@Tucan444](https://github.com/Tucan444/) 

 [Assets](Assets.md)
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -9,31 +9,49 @@ EditorUserSettings:
      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
      flags: 0
    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c7919181e0b22623d28393930
-      flags: 0
-    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c72151802563f22213229
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
-      flags: 0
-    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c73150012147b623d28393930
-      flags: 0
-    RecentlyUsedScenePath-5:
+<<<<<<< Updated upstream
      value: 22424703114646680e0b0227036c731500121478623d28393930
      flags: 0
-    RecentlyUsedScenePath-6:
+    RecentlyUsedScenePath-2:
      value: 22424703114646680e0b0227036c731500121479623d28393930
      flags: 0
+    RecentlyUsedScenePath-3:
+      value: 22424703114646680e0b0227036c73150012147f623d28393930
+=======
+      value: 22424703114646680e0b0227036c73150012147b623d28393930
+      flags: 0
+    RecentlyUsedScenePath-2:
+      value: 22424703114646680e0b0227036c73150012147c623d28393930
+      flags: 0
+    RecentlyUsedScenePath-3:
+      value: 22424703114646680e0b0227036c731500121478623d28393930
+>>>>>>> Stashed changes
+      flags: 0
+    RecentlyUsedScenePath-4:
+      value: 22424703114646680e0b0227036c73150012147c623d28393930
+      flags: 0
+    RecentlyUsedScenePath-5:
+<<<<<<< Updated upstream
+      value: 22424703114646680e0b0227036c7919181e0b22623d28393930
+=======
+      value: 22424703114646680e0b0227036c731500121479623d28393930
+>>>>>>> Stashed changes
+      flags: 0
+    RecentlyUsedScenePath-6:
+      value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
+      flags: 0
    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c73150012147e623d28393930
+<<<<<<< Updated upstream
+      value: 22424703114646680e0b0227036c73150012147b623d28393930
+=======
+      value: 22424703114646680e0b0227036c7919181e0b22623d28393930
+>>>>>>> Stashed changes
      flags: 0
    RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c73150012147f623d28393930
+      value: 22424703114646680e0b0227036c73150012147e623d28393930
      flags: 0
    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c73150012147c623d28393930
+      value: 22424703114646680e0b0227036c72151802563f22213229
      flags: 0
    UnityRemoteCompression:
      value: 337f73
--- a/build/Build.zip
+++ b/build/Build.zip
--- a/build/TemplateData/favicon.ico
+++ b/build/TemplateData/favicon.ico
--- a/build/TemplateData/fullscreen-button.png
+++ b/build/TemplateData/fullscreen-button.png
--- a/build/TemplateData/progress-bar-empty-dark.png
+++ b/build/TemplateData/progress-bar-empty-dark.png
--- a/build/TemplateData/progress-bar-empty-light.png
+++ b/build/TemplateData/progress-bar-empty-light.png
--- a/build/TemplateData/progress-bar-full-dark.png
+++ b/build/TemplateData/progress-bar-full-dark.png
--- a/build/TemplateData/progress-bar-full-light.png
+++ b/build/TemplateData/progress-bar-full-light.png
--- a/build/TemplateData/style.css
+++ b/build/TemplateData/style.css
@@ -0,0 +1,16 @@
+body { padding: 0; margin: 0 }
+#unity-container { position: absolute }
+#unity-container.unity-desktop { left: 50%; top: 50%; transform: translate(-50%, -50%) }
+#unity-container.unity-mobile { width: 100%; height: 100% }
+#unity-canvas { background: #231F20 }
+.unity-mobile #unity-canvas { width: 100%; height: 100% }
+#unity-loading-bar { position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); display: none }
+#unity-logo { width: 154px; height: 130px; background: url('unity-logo-dark.png') no-repeat center }
+#unity-progress-bar-empty { width: 141px; height: 18px; margin-top: 10px; background: url('progress-bar-empty-dark.png') no-repeat center }
+#unity-progress-bar-full { width: 0%; height: 18px; margin-top: 10px; background: url('progress-bar-full-dark.png') no-repeat center }
+#unity-footer { position: relative }
+.unity-mobile #unity-footer { display: none }
+#unity-webgl-logo { float:left; width: 204px; height: 38px; background: url('webgl-logo.png') no-repeat center }
+#unity-build-title { float: right; margin-right: 10px; line-height: 38px; font-family: arial; font-size: 18px }
+#unity-fullscreen-button { float: right; width: 38px; height: 38px; background: url('fullscreen-button.png') no-repeat center }
+#unity-mobile-warning { position: absolute; left: 50%; top: 5%; transform: translate(-50%); background: white; padding: 10px; display: none }
--- a/build/TemplateData/unity-logo-dark.png
+++ b/build/TemplateData/unity-logo-dark.png
--- a/build/TemplateData/unity-logo-light.png
+++ b/build/TemplateData/unity-logo-light.png
--- a/build/TemplateData/webgl-logo.png
+++ b/build/TemplateData/webgl-logo.png
--- a/build/index.html
+++ b/build/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Unity WebGL Player | GeoJam 2021</title>
+    <link rel="shortcut icon" href="TemplateData/favicon.ico">
+    <link rel="stylesheet" href="TemplateData/style.css">
+  </head>
+  <body>
+    <div id="unity-container" class="unity-desktop">
+      <canvas id="unity-canvas" width=960 height=600></canvas>
+      <div id="unity-loading-bar">
+        <div id="unity-logo"></div>
+        <div id="unity-progress-bar-empty">
+          <div id="unity-progress-bar-full"></div>
+        </div>
+      </div>
+      <div id="unity-mobile-warning">
+        WebGL builds are not supported on mobile devices.
+      </div>
+      <div id="unity-footer">
+        <div id="unity-webgl-logo"></div>
+        <div id="unity-fullscreen-button"></div>
+        <div id="unity-build-title">GeoJam 2021</div>
+      </div>
+    </div>
+    <script>
+      var buildUrl = "Build";
+      var loaderUrl = buildUrl + "/WebGL build.loader.js";
+      var config = {
+        dataUrl: buildUrl + "/WebGL build.data",
+        frameworkUrl: buildUrl + "/WebGL build.framework.js",
+        codeUrl: buildUrl + "/WebGL build.wasm",
+        streamingAssetsUrl: "StreamingAssets",
+        companyName: "BRN Systems",
+        productName: "GeoJam 2021",
+        productVersion: "1.0",
+      };
+
+      var container = document.querySelector("#unity-container");
+      var canvas = document.querySelector("#unity-canvas");
+      var loadingBar = document.querySelector("#unity-loading-bar");
+      var progressBarFull = document.querySelector("#unity-progress-bar-full");
+      var fullscreenButton = document.querySelector("#unity-fullscreen-button");
+      var mobileWarning = document.querySelector("#unity-mobile-warning");
+
+      // By default Unity keeps WebGL canvas render target size matched with
+      // the DOM size of the canvas element (scaled by window.devicePixelRatio)
+      // Set this to false if you want to decouple this synchronization from
+      // happening inside the engine, and you would instead like to size up
+      // the canvas DOM size and WebGL render target sizes yourself.
+      // config.matchWebGLToCanvasSize = false;
+
+      if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
+        container.className = "unity-mobile";
+        // Avoid draining fillrate performance on mobile devices,
+        // and default/override low DPI mode on mobile browsers.
+        config.devicePixelRatio = 1;
+        mobileWarning.style.display = "block";
+        setTimeout(() => {
+          mobileWarning.style.display = "none";
+        }, 5000);
+      } else {
+        canvas.style.width = "960px";
+        canvas.style.height = "600px";
+      }
+      loadingBar.style.display = "block";
+
+      var script = document.createElement("script");
+      script.src = loaderUrl;
+      script.onload = () => {
+        createUnityInstance(canvas, config, (progress) => {
+          progressBarFull.style.width = 100 * progress + "%";
+        }).then((unityInstance) => {
+          loadingBar.style.display = "none";
+          fullscreenButton.onclick = () => {
+            unityInstance.SetFullscreen(1);
+          };
+        }).catch((message) => {
+          alert(message);
+        });
+      };
+      document.body.appendChild(script);
+    </script>
+  </body>
+</html>
Author	SHA1	Message	Date
Tucan444	ff48d52f9d	Merge branch 'master' of https://github.com/BRNSystems/GeoJam2021	2021-07-23 17:35:32 +02:00
Tucan444	c9b9ae1cb0	_	2021-07-23 17:16:48 +02:00
BRNSystems	1c5be0cda2	Update EditorUserSettings.asset	2021-07-23 17:16:30 +02:00
Tucan444	4d0551d339	_	2021-07-23 17:00:30 +02:00
Tucan444	ebc97d0d2b	_	2021-07-23 16:26:49 +02:00
Tucan444	0d9989f845	Merge branch 'master' of https://github.com/BRNSystems/GeoJam2021	2021-07-23 16:25:24 +02:00
Tucan444	8d552f561e	_	2021-07-23 16:24:38 +02:00
BRNSystems	01d62e4daf	Merge branch 'master' of https://github.com/BRNSystems/GeoJam2021	2021-07-23 16:18:08 +02:00
Tucan444	c5317dc131	_	2021-07-23 16:17:56 +02:00
BRNSystems	369d4713d7	Update README.md	2021-07-23 16:17:50 +02:00
Tucan444	3a2654da6a	_	2021-07-23 16:05:42 +02:00
Tucan444	acba88a4f4	_	2021-07-23 16:05:01 +02:00
Tucan444	19ebcefa86	_	2021-07-23 15:23:30 +02:00
Tucan444	d614da8a44	_	2021-07-23 15:21:01 +02:00
BRNSystems	5381aa88d2	Trust me I am a game dev	2021-07-23 15:09:43 +02:00
BRNSystems	d1fab9b434	Some error correction	2021-07-23 13:55:58 +02:00
BRNSystems	a4ddd9c7b6	Update geojam_banner.png	2021-07-23 10:53:05 +02:00