Merge branch 'milek-dev' into gfx-work

2026-07-18 20:29:17 +02:00 · 2018-10-12 23:29:53 +02:00
parent b7a61071ba 047988219b
commit cd8ffd5024
34 changed files with 52 additions and 1528 deletions
--- a/application.cpp
+++ b/application.cpp
@@ -14,11 +14,8 @@ http://mozilla.org/MPL/2.0/.
 #include "editormode.h"

 #include "Globals.h"
-#include "keyboardinput.h"
-#include "drivermouseinput.h"
-#include "gamepadinput.h"
-#include "Console.h"
 #include "simulation.h"
+#include "Train.h"
 #include "sceneeditor.h"
 #include "renderer.h"
 #include "uilayer.h"