Clean up git merge on Game.cpp added assets

assets/maps/kaiju-city-map.tiled-session

@@ -20,11 +20,14 @@
             "scaleInEditor": 4
         },
         "kaiju-city-map.json": {
-            "scale": 3,
-            "selectedLayer": 1,
+            "expandedObjectLayers": [
+                3
+            ],
+            "scale": 4,
+            "selectedLayer": -1,
             "viewCenter": {
-                "x": 86.16666666666666,
-                "y": 10.666666666666671
+                "x": 132.75,
+                "y": 137.875
             }
         },
         "kaiju-city-map.json#kaiju-city": {
@@ -34,10 +37,13 @@
             "scale": 1.4114285714285715,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 232.38866396761134,
-                "y": 218.21862348178138
+                "x": 232.3886639676113,
+                "y": 218.57287449392717
             }
         },
+        "kaiju-city-map.tmj#kaiju-city": {
+            "scaleInDock": 1
+        },
         "kaiju-city-map.tmx": {
             "scale": 1.4114285714285715,
             "selectedLayer": 0,
@@ -83,14 +89,14 @@
     ],
     "project": "kaiju-city-map.tiled-project",
     "recentFiles": [
+        "kaiju-city-map.json",
+        "kaiju-city-map.tmj",
+        "kaiju-city.tsj",
         "testmap.json",
         "kaiju-tokyo.tsj",
-        "kaiju-city-map.json",
         "kaiju-city.tsx",
         "br-tiles.tsj",
-        "kaiju-city-map.tmx",
-        "kaiju-city-map.tmj",
-        "kaiju-city.tsj"
+        "kaiju-city-map.tmx"
     ],
     "tileset.lastUsedFilter": "JSON tileset files (*.tsj *.json)",
     "tileset.lastUsedFormat": "json",

src/config/intro.json

@@ -0,0 +1,7 @@
+{
+  "intro": {
+    "1": "IN THE YEAR\n23YY ...\nHUMAN\nPARANOIA\nRUNS WILD\nCONSUMED\nBY FEAR\nAND GREED",
+    "2": "THEY DESTROY\nEACH OTHER\nAND EARTH\nWHO CAN\nSAVE THEM?\n",
+    "3": "SURELY NOT\nANOTHER\nHUMAN?!?\nPERHAPS\nONLY A\nGREATER\nMONSTER..."
+  }
+}

src/game/Game.cpp

@@ -145,7 +145,6 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
         }
         
         std::string kaijuTex = Game::projPath + "assets/textures/actors/kaijuturtle.png";
-<<<<<<< HEAD
         std::string fontTex = Game::projPath + "assets/textures/ui/ui-font-lorez5.png";
         std::string textBoxTex = Game::projPath + "assets/textures/ui/ui-element-bubble.png";
         std::string musicFile = Game::projPath + "assets/audio/music/sillypuppy.ogg";
@@ -154,13 +153,6 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
         assets->AddTexture("player", kaijuTex.c_str());
         assets->AddTexture("font", fontTex.c_str());
         assets->AddTexture("textBox", textBoxTex.c_str());
-=======
-
-        assets->AddTexture("player", kaijuTex.c_str());
-        assets->AddTexture("font", "assets/textures/ui/ui-font-lorez5.png");
-        assets->AddTexture("textBox", "assets/textures/ui/ui-element-bubble.png");
-        assets->AddTexture("collider","assets/textures/ColTex.png");
->>>>>>> f449eda43f6cbd3f90508029e94741f4c2de1f9b
         
         assets->AddMusicTrack("simonZ",musicFile.c_str());