Updated font rendering, changed radial menu

universalsubset · Sep 9, 2019 · f09696f · f09696f
1 parent 6400e14
commit f09696f
Show file tree

Hide file tree

Showing 37 changed files with 5 additions and 4,944 deletions.
diff --git a/assets/fonts/tahoma.ttf b/assets/fonts/tahoma.ttf
diff --git a/assets/skins/ro.json b/assets/skins/ro.json
@@ -15,7 +15,10 @@
     "colorblurred": "FFFFFFAA",
     "texture": "assets/textures/skins/ro.png",
     "font": "assets/fonts/tahoma",
-    "radialfont": "tahomabig",
+    "radialfont": {
+      "name": "tahoma",
+      "size": 15
+    },
     "window": {
         "title": {
             "fontcolor": "000000",

diff --git a/assets/textures/skins/ro.png b/assets/textures/skins/ro.png
diff --git a/blib b/blib
diff --git a/bromedit/externals/assimp_build/ALL_BUILD.vcxproj b/bromedit/externals/assimp_build/ALL_BUILD.vcxproj
diff --git a/bromedit/externals/assimp_build/ALL_BUILD.vcxproj.filters b/bromedit/externals/assimp_build/ALL_BUILD.vcxproj.filters
diff --git a/bromedit/externals/assimp_build/CMakeFiles/3.10.1/CompilerIdC/CompilerIdC.vcxproj b/bromedit/externals/assimp_build/CMakeFiles/3.10.1/CompilerIdC/CompilerIdC.vcxproj
diff --git a/bromedit/externals/assimp_build/CMakeFiles/3.10.1/CompilerIdCXX/CompilerIdCXX.vcxproj b/bromedit/externals/assimp_build/CMakeFiles/3.10.1/CompilerIdCXX/CompilerIdCXX.vcxproj
diff --git a/bromedit/externals/assimp_build/CMakeFiles/3.10.1/VCTargetsPath.vcxproj b/bromedit/externals/assimp_build/CMakeFiles/3.10.1/VCTargetsPath.vcxproj
diff --git a/bromedit/externals/assimp_build/INSTALL.vcxproj b/bromedit/externals/assimp_build/INSTALL.vcxproj
diff --git a/bromedit/externals/assimp_build/INSTALL.vcxproj.filters b/bromedit/externals/assimp_build/INSTALL.vcxproj.filters
+2 −0		.gitignore
+25 −5		blib.vcxproj
+15 −0		blib.vcxproj.filters
+158 −24		blib/Font.cpp
+12 −1		blib/Font.h
+27 −5		blib/ResourceManager.h
+8 −4		blib/SpineModel.cpp
+1 −1		blib/SpineModel.h
+11 −7		blib/SpriteBatch.cpp
+1 −1		blib/SpriteBatch.h
+89 −75		blib/audio/AudioManagerOpenAL.cpp
+6 −8		blib/gl/ResourceManager.cpp
+2 −2		blib/gl/ResourceManager.h
+13 −1		blib/gl/Texture.cpp
+3 −0		blib/util/stb_image_resize.cpp
+2,630 −0		blib/util/stb_image_resize.h
+2 −0		blib/util/stb_rect_pack.c
+633 −0		blib/util/stb_rect_pack.h
+3 −0		blib/util/stb_truetype.c
+4,949 −0		blib/util/stb_truetype.h
+43 −26		blib/wm/WM.cpp
+1 −1		blib/wm/WM.h
+1 −1		blib/wm/Window.cpp
+1 −1		blib/wm/widgets/Label.cpp
+1 −1		blib/wm/widgets/TreeView.cpp
+1 −1		blib/wm/widgets/button.cpp
+1 −1		blib/wm/widgets/list.cpp
+5 −5		blib/wm/widgets/textbox.cpp