Merge pull request #176 from chaoticgd/asset_system

Merge the asset system and launcher

.gitignore

@@ -1,14 +1,26 @@
-.directory
-__pycache__
-/CMakeCache.txt
-/CMakeFiles
-/Makefile
-/cmake_install.cmake
-/wrench
-/.vscode
-/libimgui.a
-/imgui.ini
+# cmake
+CMakeCache.txt
+CMakeFiles
+Makefile
+cmake_install.cmake
+CMakeDoxyfile.in
+CMakeDoxygenDefaults.cmake
+CMakeLists.txt.user
+CTestTestfile.cmake
+
+# build
 /bin
-/lib
-/cache
-wrench_settings.ini
+_generated_*
+*.a
+
+# tools
+/.vscode
+__pycache__
+.directory
+
+# config
+*.ini
+
+# misc
+*.dump
+/dumps

.gitmodules

@@ -5,9 +5,6 @@
 	path = thirdparty/json
 	url = https://github.com/nlohmann/json
 	branch = master
-[submodule "thirdparty/toml11"]
-	path = thirdparty/toml11
-	url = https://github.com/ToruNiina/toml11
 [submodule "thirdparty/glfw"]
 	path = thirdparty/glfw
 	url = https://github.com/glfw/glfw