From fef6629d96f375b98ebb81382c0e8b4ee9b0f48b Mon Sep 17 00:00:00 2001
From: XaviDCR92 <xavi.dcr@gmail.com>
Date: Fri, 29 Dec 2017 02:57:40 +0100
Subject: * New LEVEL2.LVL was not being displayed correctly as I forgot to
 include the new tiles on Game.c. * Some work done on runway exit detection,
 but still TODO. * Minor change in LoadMenu.c.

---
 Source/MapEditor/MapEditor.pro.user |  8 ++++----
 Source/MapEditor/settings.ini       |  2 +-
 Source/MapEditor/tileset.ini        | 15 ++++++++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'Source/MapEditor')

diff --git a/Source/MapEditor/MapEditor.pro.user b/Source/MapEditor/MapEditor.pro.user
index f81fd63..5393ece 100644
--- a/Source/MapEditor/MapEditor.pro.user
+++ b/Source/MapEditor/MapEditor.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.3, 2017-12-27T11:30:21. -->
+<!-- Written by QtCreator 4.0.3, 2017-12-27T14:24:53. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -62,7 +62,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.0 MinGW 32bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.0 MinGW 32bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.win32_mingw53_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -291,8 +291,8 @@
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">MapEditor.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory">C:/cygwin/home/Xavier/Airport/Source/MapEditor</value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">C:/cygwin/home/Xavier/Airport/Source/build-MapEditor-Desktop_Qt_5_7_0_MinGW_32bit-Debug</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">C:/cygwin/home/Xavier/Airport/Source/MapEditor</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
diff --git a/Source/MapEditor/settings.ini b/Source/MapEditor/settings.ini
index af1583e..ca3d2c8 100644
--- a/Source/MapEditor/settings.ini
+++ b/Source/MapEditor/settings.ini
@@ -1,2 +1,2 @@
 [app_settings]
-last_dir=C:/cygwin/home/Xavier/Airport/Levels/LEVEL2.LVL
+last_dir=C:/cygwin/home/Xavier/Airport/Levels/LEVEL1.LVL
diff --git a/Source/MapEditor/tileset.ini b/Source/MapEditor/tileset.ini
index 8718aa8..81fe066 100644
--- a/Source/MapEditor/tileset.ini
+++ b/Source/MapEditor/tileset.ini
@@ -5,4 +5,17 @@ tile2 = "Water"
 tile3 = "Asphalt"
 tile4 = "Runway mid"
 tile5 = "Runway start/end 1"
-tile6 = "Runway start/end 2"
\ No newline at end of file
+tile6 = "Runway start/end 2"
+tile7 = "Parking 1"
+tile8 = "Parking 2"
+tile9 = "Taxiway crossing, grass border"
+tile10 = "Taxiway, grass border"
+tile11 = "Taxiway corner, grass border 1"
+tile12 = "Water grass border 1"
+tile13 = "Water grass border 2"
+tile14 = "Runway holding point 1"
+tile15 = "Runway holding point 2"
+tile16 = "Runway enter/exit, asphalt border 1"
+tile17 = "Taxiway corner, grass border 2"
+tile18 = "Taxiway 4-way crossing, grass border"
+tile19 = "Runway enter/exit, asphalt border 2"
\ No newline at end of file
-- 
cgit v1.2.3