summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2016-05-24 18:45:49 +0200
committerAki <nthirtyone@gmail.com>2016-05-24 18:45:49 +0200
commiteb8c23fb8fff5c8faefa84e6f166bc0f3234a1ec (patch)
tree1b81fc55790dbf29578a10c3d799e010de0f2c6d
parentf600564657dc5a8a4f36043c46e7a34651d0c4a5 (diff)
downloadroflnauts-eb8c23fb8fff5c8faefa84e6f166bc0f3234a1ec.zip
roflnauts-eb8c23fb8fff5c8faefa84e6f166bc0f3234a1ec.tar.gz
roflnauts-eb8c23fb8fff5c8faefa84e6f166bc0f3234a1ec.tar.bz2
Quick push
-rw-r--r--.gitignore3
-rw-r--r--camera.lua4
-rw-r--r--menu.lua12
3 files changed, 16 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 5d14d56..f3bc7b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.xcf
-assets/font.png \ No newline at end of file
+assets/font.png
+maps/emo.lua \ No newline at end of file
diff --git a/camera.lua b/camera.lua
index b33313c..535e0ac 100644
--- a/camera.lua
+++ b/camera.lua
@@ -80,7 +80,7 @@ function Camera:translatePoints(...)
end
return r
end
-
+
-- Shake it
-- Really bad script, but for now it works
function Camera:shake ()
@@ -121,7 +121,7 @@ function Camera:follow ()
end
end
x = x / i - love.graphics.getWidth()/self.scale/2
- y = y / i - love.graphics.getHeight()/self.scale/2 + 10*self.scale -- hotfix
+ y = y / i - love.graphics.getHeight()/self.scale/2 + 4*self.scale -- hotfix
return x,y
end
diff --git a/menu.lua b/menu.lua
new file mode 100644
index 0000000..9ba2df2
--- /dev/null
+++ b/menu.lua
@@ -0,0 +1,12 @@
+-- `Menu`
+-- It is one of the last things I will need to mess around with. I'm happy and surprised everything works so far.
+-- For sure I have learnt a lot about lua during this journey. Still a lot ahead. I will continue writing in the same style though, to not make it even worse.
+
+-- WHOLE CODE HAS FLAG OF "need a cleanup"
+
+-- Metatable of `Menu`
+Menu = {}
+
+-- Constructor of `Menu`
+function Menu:new ()
+end \ No newline at end of file