Merge pull request #119 from paulsapps/installer

Installer update, at least runable converted data

QGearsMain/src/core/ScriptManager.cpp

@@ -338,21 +338,6 @@ ScriptManager::AddEntity(const ScriptManager::Type type, const Ogre::String& ent
             table["entity"] = boost::ref(*entity);
         }
 
-        // check "on_init" script
-        if (luabind::type(table["on_init"]) == LUA_TFUNCTION)
-        {
-            QueueScript script;
-            script.function = "on_init";
-            script.priority = 0;
-            script.state = lua_newthread(m_LuaState);
-            // we dont want thread to be garbage collected so we store it
-            script.state_id = luaL_ref(m_LuaState, LUA_REGISTRYINDEX);
-            script.seconds_to_wait = 0;
-            script.wait = false;
-            script.yield = false;
-            script_entity.queue.push_back(script);
-        }
-
         // check "on_start" script
         if(luabind::type(table["on_start"]) == LUA_TFUNCTION)
         {

dependencies/SUDM

@@ -1 +1 @@
-Subproject commit f1aacf05c52ea2ac034fdc5d517e862e3bbb040b
+Subproject commit 457488098c98423cae0f61ffcab63c8df2344f32

utilities/q-gears-launcher/src/ff7DataInstaller.cpp

@@ -419,6 +419,11 @@ static void FF7PcFieldToQGearsField(
 
                 xmlEntityScript->SetAttribute("direction", "0");
 
+                // TODO: This isn't quite right, the models animation translation seems to be inverted?
+                xmlEntityScript->SetAttribute("scale", "0.03125 0.03125 0.03125");
+                xmlEntityScript->SetAttribute("root_orientation", "0.7071067811865476 0.7071067811865476 0 0");
+
+
                 element->LinkEndChild(xmlEntityScript.release());
 
             }
@@ -670,8 +675,16 @@ static bool IsAFieldFile(Ogre::String& resourceName)
 static bool IsTestField(Ogre::String& resourceName)
 {
     if (
-       // resourceName == "startmap" ||
-        resourceName == "md1stin"
+        resourceName == "startmap" ||
+        resourceName == "md1stin" ||
+        resourceName == "md1_1" ||
+        resourceName == "md1_2" ||
+        resourceName == "nmkin_1" ||
+        resourceName == "nmkin_2" ||
+        resourceName == "nmkin_3" ||
+        resourceName == "nrthmk" ||
+        resourceName == "elevtr1" ||
+        resourceName == "tin_2"
         )
     {
         return true;

utilities/q-gears-launcher/src/mainwindow.cpp

@@ -19,7 +19,7 @@ MainWindow::MainWindow(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainWin
 #ifdef _DEBUG
     // Hard coded prebaked paths for debugging to save time
     ui->lineInput->setText("C:\\Games\\FF7\\data");
-    ui->lineDataDir->setText("C:\\Users\\paul\\Desktop\\q-gears\\output\\_data");
+    ui->lineDataDir->setText("C:\\Users\\paul\\Desktop\\q-gears\\output\\data");
 #endif
 }
 
@@ -127,7 +127,7 @@ void MainWindow::on_btnGO_clicked()
 	}
 	else
 	{
-		QMessageBox::information(this,tr("Converting Data"),tr("Attempt to convert with \n Input: %1 \n Output: %2").arg(ui->lineInput->text(),ui->lineDataDir->text()));
+		//QMessageBox::information(this,tr("Converting Data"),tr("Attempt to convert with \n Input: %1 \n Output: %2").arg(ui->lineInput->text(),ui->lineDataDir->text()));
 
 		QString input = QDir::fromNativeSeparators(ui->lineInput->text());
 		if (!input.endsWith("/"))