diff --git a/.gitmodules b/.gitmodules index 9fb458a34..d1afc51aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,8 @@ [submodule "assetnameparser/tinyxml2"] path = assetnameparser/tinyxml2 url = ../tinyxml2.git +[submodule "hecl-gui"] + + path = hecl-gui + + url = ../hecl-gui diff --git a/CMakeLists.txt b/CMakeLists.txt index c3573bbf6..20dfaa54a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,6 +139,20 @@ add_subdirectory(mpcksum) add_subdirectory(gbalink) add_subdirectory(visigen) +# Test for supported Qt version +find_program(QMAKE_EXECUTABLE NAMES qmake HINTS ${QTDIR} ENV QTDIR PATH_SUFFIXES bin) +if (QMAKE_EXECUTABLE) + set(QT_MINIMUM_VERSION 5.3.0) + execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_VERSION OUTPUT_VARIABLE QT_VERSION) + if(QT_VERSION LESS QT_MINIMUM_VERSION) + message("Qt version ${QT_VERSION} does not meet the minimum ${QT_MINIMUM_VERSION} requirement, hecl-gui will not be built") + else() + message("hecl-gui will be built with Qt verion ${QT_VERSION}") + add_subdirectory(hecl-gui) + endif() +else() + message("Qt not found, hecl-gui will not be built") +endif() unset(GIT_EXECUTABLE CACHE) find_package(Git) if(GIT_FOUND) diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-100.png b/Editor/platforms/win/Assets/SplashScreen.scale-100.png new file mode 100644 index 000000000..93cae6a3d Binary files /dev/null and b/Editor/platforms/win/Assets/SplashScreen.scale-100.png differ diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-125.png b/Editor/platforms/win/Assets/SplashScreen.scale-125.png new file mode 100644 index 000000000..7b81b5f39 Binary files /dev/null and b/Editor/platforms/win/Assets/SplashScreen.scale-125.png differ diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-150.png b/Editor/platforms/win/Assets/SplashScreen.scale-150.png new file mode 100644 index 000000000..f6368c56a Binary files /dev/null and b/Editor/platforms/win/Assets/SplashScreen.scale-150.png differ diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-200.png b/Editor/platforms/win/Assets/SplashScreen.scale-200.png new file mode 100644 index 000000000..34d168905 Binary files /dev/null and b/Editor/platforms/win/Assets/SplashScreen.scale-200.png differ diff --git a/Editor/platforms/win/Assets/SplashScreen.scale-400.png b/Editor/platforms/win/Assets/SplashScreen.scale-400.png new file mode 100644 index 000000000..df4eb1f3f Binary files /dev/null and b/Editor/platforms/win/Assets/SplashScreen.scale-400.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-100.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-100.png new file mode 100644 index 000000000..49196d784 Binary files /dev/null and b/Editor/platforms/win/Assets/Square150x150Logo.scale-100.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-125.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-125.png new file mode 100644 index 000000000..4d609219a Binary files /dev/null and b/Editor/platforms/win/Assets/Square150x150Logo.scale-125.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-150.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-150.png new file mode 100644 index 000000000..26dc8dccf Binary files /dev/null and b/Editor/platforms/win/Assets/Square150x150Logo.scale-150.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-200.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 000000000..a5231ccf5 Binary files /dev/null and b/Editor/platforms/win/Assets/Square150x150Logo.scale-200.png differ diff --git a/Editor/platforms/win/Assets/Square150x150Logo.scale-400.png b/Editor/platforms/win/Assets/Square150x150Logo.scale-400.png new file mode 100644 index 000000000..13c6dff4d Binary files /dev/null and b/Editor/platforms/win/Assets/Square150x150Logo.scale-400.png differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-100.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-100.png new file mode 100644 index 000000000..fbd8697a7 Binary files /dev/null and b/Editor/platforms/win/Assets/Square310x310Logo.scale-100.png differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-125.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-125.png new file mode 100644 index 000000000..3ecdbe9ca Binary files /dev/null and b/Editor/platforms/win/Assets/Square310x310Logo.scale-125.png differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-150.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-150.png new file mode 100644 index 000000000..ded323015 Binary files /dev/null and b/Editor/platforms/win/Assets/Square310x310Logo.scale-150.png differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-200.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-200.png new file mode 100644 index 000000000..7eac62681 Binary files /dev/null and b/Editor/platforms/win/Assets/Square310x310Logo.scale-200.png differ diff --git a/Editor/platforms/win/Assets/Square310x310Logo.scale-400.png b/Editor/platforms/win/Assets/Square310x310Logo.scale-400.png new file mode 100644 index 000000000..76e2b8f85 Binary files /dev/null and b/Editor/platforms/win/Assets/Square310x310Logo.scale-400.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-100.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-100.png new file mode 100644 index 000000000..1a5dcbb30 Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.scale-100.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-125.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-125.png new file mode 100644 index 000000000..ffcb08cdd Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.scale-125.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-150.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-150.png new file mode 100644 index 000000000..e4c5dc51e Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.scale-150.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-200.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 000000000..74913b02b Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.scale-200.png differ diff --git a/Editor/platforms/win/Assets/Square44x44Logo.scale-400.png b/Editor/platforms/win/Assets/Square44x44Logo.scale-400.png new file mode 100644 index 000000000..7d43bb6cb Binary files /dev/null and b/Editor/platforms/win/Assets/Square44x44Logo.scale-400.png differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-100.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-100.png new file mode 100644 index 000000000..af28794ae Binary files /dev/null and b/Editor/platforms/win/Assets/Square71x71Logo.scale-100.png differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-125.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-125.png new file mode 100644 index 000000000..68b2d60bb Binary files /dev/null and b/Editor/platforms/win/Assets/Square71x71Logo.scale-125.png differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-150.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-150.png new file mode 100644 index 000000000..0af1159c5 Binary files /dev/null and b/Editor/platforms/win/Assets/Square71x71Logo.scale-150.png differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-200.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-200.png new file mode 100644 index 000000000..f7a26af3d Binary files /dev/null and b/Editor/platforms/win/Assets/Square71x71Logo.scale-200.png differ diff --git a/Editor/platforms/win/Assets/Square71x71Logo.scale-400.png b/Editor/platforms/win/Assets/Square71x71Logo.scale-400.png new file mode 100644 index 000000000..d1968488e Binary files /dev/null and b/Editor/platforms/win/Assets/Square71x71Logo.scale-400.png differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-100.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-100.png new file mode 100644 index 000000000..15d694b25 Binary files /dev/null and b/Editor/platforms/win/Assets/Wide310x150Logo.scale-100.png differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-125.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-125.png new file mode 100644 index 000000000..db80104c2 Binary files /dev/null and b/Editor/platforms/win/Assets/Wide310x150Logo.scale-125.png differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-150.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-150.png new file mode 100644 index 000000000..6b0bdc6a6 Binary files /dev/null and b/Editor/platforms/win/Assets/Wide310x150Logo.scale-150.png differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-200.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 000000000..6445e25bc Binary files /dev/null and b/Editor/platforms/win/Assets/Wide310x150Logo.scale-200.png differ diff --git a/Editor/platforms/win/Assets/Wide310x150Logo.scale-400.png b/Editor/platforms/win/Assets/Wide310x150Logo.scale-400.png new file mode 100644 index 000000000..d81e9b641 Binary files /dev/null and b/Editor/platforms/win/Assets/Wide310x150Logo.scale-400.png differ diff --git a/hecl-gui b/hecl-gui new file mode 160000 index 000000000..2113bed95 --- /dev/null +++ b/hecl-gui @@ -0,0 +1 @@ +Subproject commit 2113bed95f80fea497e56deec12ea5364b858a3f