summaryrefslogtreecommitdiff
path: root/Data
diff options
context:
space:
mode:
Diffstat (limited to 'Data')
-rw-r--r--Data/Resources/Font/consola.ttfbin0 -> 459180 bytes
-rw-r--r--Data/Resources/Font/consolab.ttfbin0 -> 397896 bytes
-rw-r--r--Data/Resources/Font/consolai.ttfbin0 -> 467584 bytes
-rw-r--r--Data/Resources/Font/consolaz.ttfbin0 -> 407956 bytes
-rw-r--r--Data/Resources/Font/msyhbd.ttcbin0 -> 16829116 bytes
-rw-r--r--Data/Resources/Shaders/Editor-Text.glsl2
-rw-r--r--Data/Scripts/EditorApplication.lua2
7 files changed, 2 insertions, 2 deletions
diff --git a/Data/Resources/Font/consola.ttf b/Data/Resources/Font/consola.ttf
new file mode 100644
index 0000000..e881ca4
--- /dev/null
+++ b/Data/Resources/Font/consola.ttf
Binary files differ
diff --git a/Data/Resources/Font/consolab.ttf b/Data/Resources/Font/consolab.ttf
new file mode 100644
index 0000000..77f5d60
--- /dev/null
+++ b/Data/Resources/Font/consolab.ttf
Binary files differ
diff --git a/Data/Resources/Font/consolai.ttf b/Data/Resources/Font/consolai.ttf
new file mode 100644
index 0000000..2de4de8
--- /dev/null
+++ b/Data/Resources/Font/consolai.ttf
Binary files differ
diff --git a/Data/Resources/Font/consolaz.ttf b/Data/Resources/Font/consolaz.ttf
new file mode 100644
index 0000000..d9df211
--- /dev/null
+++ b/Data/Resources/Font/consolaz.ttf
Binary files differ
diff --git a/Data/Resources/Font/msyhbd.ttc b/Data/Resources/Font/msyhbd.ttc
new file mode 100644
index 0000000..7949a5f
--- /dev/null
+++ b/Data/Resources/Font/msyhbd.ttc
Binary files differ
diff --git a/Data/Resources/Shaders/Editor-Text.glsl b/Data/Resources/Shaders/Editor-Text.glsl
index c58bd48..34412e3 100644
--- a/Data/Resources/Shaders/Editor-Text.glsl
+++ b/Data/Resources/Shaders/Editor-Text.glsl
@@ -36,7 +36,7 @@ out vec4 FragColor;
void main()
{
//vec2 uv = vec2(uv.x, 1 - uv.y);
- vec4 sampled = vec4(1,1,1,texture(gamelab_main_tex, uv).r);
+ vec4 sampled = vec4(0.8,0.8,0.8,texture(gamelab_main_tex, uv).r);
sampled *= color;
// vec4 sampled = vec4(1,1,1,1);
FragColor = sampled;
diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua
index 535136b..103dcdf 100644
--- a/Data/Scripts/EditorApplication.lua
+++ b/Data/Scripts/EditorApplication.lua
@@ -113,7 +113,7 @@ local fsh = [[
BeforeMainLoop()
-local font = Engine.GUI.Font.New("./Resources/Font/msyh.ttc", {512, 512}, 5, 5)
+local font = Engine.GUI.Font.New("./Resources/Font/consola.ttf", {512, 512}, 5, 5)
_G["default_font"] = font
while true do