summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2016-08-02 12:16:12 +0200
committerAki <nthirtyone@gmail.com>2016-08-02 12:16:12 +0200
commit1b9b0193c00e0d54cf1b50635d33b3bbce60e872 (patch)
treef74d8052024750775789adcaa1109d98a5295f7b
parentf28674114986a4b345c50b4815fbef11766b1b51 (diff)
downloadroflnauts-1b9b0193c00e0d54cf1b50635d33b3bbce60e872.zip
roflnauts-1b9b0193c00e0d54cf1b50635d33b3bbce60e872.tar.gz
roflnauts-1b9b0193c00e0d54cf1b50635d33b3bbce60e872.tar.bz2
Clean-up obsolete fonts
-rw-r--r--assets/font-big.png (renamed from assets/font3.png)bin1118 -> 1118 bytes
-rw-r--r--assets/font-normal.pngbin0 -> 1689 bytes
-rw-r--r--assets/font2.pngbin3539 -> 0 bytes
-rw-r--r--main.lua8
4 files changed, 4 insertions, 4 deletions
diff --git a/assets/font3.png b/assets/font-big.png
index 48b2e82..48b2e82 100644
--- a/assets/font3.png
+++ b/assets/font-big.png
Binary files differ
diff --git a/assets/font-normal.png b/assets/font-normal.png
new file mode 100644
index 0000000..12dae64
--- /dev/null
+++ b/assets/font-normal.png
Binary files differ
diff --git a/assets/font2.png b/assets/font2.png
deleted file mode 100644
index 20ac02f..0000000
--- a/assets/font2.png
+++ /dev/null
Binary files differ
diff --git a/main.lua b/main.lua
index 2669ef8..cb9b1f2 100644
--- a/main.lua
+++ b/main.lua
@@ -10,7 +10,8 @@ end
-- Should be moved to scene/camera
function getScale()
- return math.max(1, math.floor(love.graphics.getWidth() / 320)-1, math.floor(love.graphics.getHeight() / 180)-1)
+ return getRealScale()
+ --return math.max(1, math.floor(love.graphics.getWidth() / 320)-1, math.floor(love.graphics.getHeight() / 180)-1)
end
function getRealScale()
return math.max(love.graphics.getWidth() / 320, love.graphics.getHeight() / 180)
@@ -46,9 +47,8 @@ function love.load()
love.graphics.setDefaultFilter("nearest", "nearest")
-- Font
- -- 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-,!:()[]{}<>
- Font = love.graphics.newImageFont("assets/font4.png", " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.,:;-_/\\!@#$%^&*?=+~`|'\"()[]{}<>", -1)
- Bold = love.graphics.newImageFont("assets/font3.png", " 0123456789AEFILNORSTUW", -2)
+ Font = love.graphics.newImageFont("assets/font-normal.png", " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.,:;-_/\\!@#$%^&*?=+~`|'\"()[]{}<>", -1)
+ Bold = love.graphics.newImageFont("assets/font-big.png", " 0123456789AEFILNORSTUW", -2)
Font:setLineHeight(9/16)
love.graphics.setFont(Font)