Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a

Assets/Prefabs/Map Sections/Width 5/Backbelt 5-1.prefab

@@ -1226,7 +1226,12 @@ PrefabInstance:
     - target: {fileID: 7954546918817141591, guid: bb9ffc1c11072174694465b720cdb319,
         type: 3}
       propertyPath: isSpawnable
-      value: 1
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7954546918817141591, guid: bb9ffc1c11072174694465b720cdb319,
+        type: 3}
+      propertyPath: isCollectableSpawnable
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
       propertyPath: m_LocalPosition.x
@@ -2811,7 +2816,7 @@ PrefabInstance:
     - target: {fileID: 7954546918817141591, guid: bb9ffc1c11072174694465b720cdb319,
         type: 3}
       propertyPath: isSpawnable
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
       propertyPath: m_LocalPosition.x
@@ -3345,7 +3350,7 @@ PrefabInstance:
     - target: {fileID: 7954546918817141591, guid: bb9ffc1c11072174694465b720cdb319,
         type: 3}
       propertyPath: isCollectableSpawnable
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
       propertyPath: m_LocalPosition.x

Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs

@@ -110,7 +110,7 @@ public class RacetrackGameMode : GameMode
 
         //We check for track sections we need to add/remove
         mapManager.checkTrack();
-        //spawn.wakeup();
+        spawn.wakeup();
 
         //Move the camera forward at a steady rate each round
         /*if (scrollSpeed > 0.0f)

Assets/Scripts/Managers/GameManager.cs

@@ -179,7 +179,7 @@ public class GameManager : MonoBehaviour
             }
         }
         //spawn collectible logic blocks
-        //spawnBlock.Spawn();
+        spawnBlock.Spawn();
 
 
         //Reset some player Data

Assets/Textures/Icon.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c963d84120be6c9dbd55078d72c6872b193294304954c55db22267f0d5317452
+size 7257

Assets/Textures/Icon.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: dbcdf8b485d366b489f13c8f6dc8fecc
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/EditorBuildSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1890d8b9d4cb6c52f70ca8e818b21a7f57189e3c35841758de9fc21b4fd1bbe0
-size 2232
+oid sha256:7be799905646e6d7aaab37702ab8e14db03f14e8814c42bb9471fdcb8028125e
+size 1282

ProjectSettings/GraphicsSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06f2c9c42c3e01f1143d4c15cfe4f316cfab490aba17fde694e466c130d4e3a4
-size 2359
+oid sha256:758221ccdd8ed2b386a3367cc69cc6c5466fe975c0b4a77ac65f68abcdaa7ffd
+size 2428

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3227dc2661fccc064a73220d2846fe530fb7aafdffe3b10140f080c84310528d
-size 20392
+oid sha256:33ce654bd4b3898466537593d9c857378b5209e6a58a289ec29fb28490560b89
+size 20897