Add support to load .tmx files

enigma-dev · Jul 2, 2022 · 4cd3972 · 4cd3972
1 parent 45f4993
commit 4cd3972
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/MainWindow.cpp b/MainWindow.cpp
@@ -465,7 +465,7 @@ void MainWindow::on_actionOpen_triggered() {
       tr("All supported formats (*.egm *.yyp *.project.gmx *.gm81 *.gmk *.gm6 *.gmd);;GameMaker: Studio 2 Projects "
          "(*.yyp);;GameMaker: Studio Projects (*.project.gmx);;Classic "
          "GameMaker Files (*.gm81 *.gmk *.gm6 *.gmd);;"
-         "Tiled Tilesets (*.tsx);;All Files (*)"));
+         "Tiled Tilesets (*.tsx);;Tiled Maps (*.tmx);;All Files (*)"));
 
   if (!fileName.isEmpty()) openFile(fileName);
 }

diff --git a/Submodules/enigma-dev b/Submodules/enigma-dev
+2 −0		CommandLine/libEGM/file-format.cpp
+344 −0		CommandLine/libEGM/tmx.cpp
+16 −0		CommandLine/libEGM/tmx.h
+193 −49		CommandLine/libEGM/tsx.cpp
+19 −0		CommandLine/libEGM/tsx.h
+18 −10		shared/protos/Background.proto
+10 −10		shared/protos/Room.proto
+1 −0		shared/protos/options.proto