Skip to content

Commit

Permalink
Merge pull request #2 from sirskunkalot/master
Browse files Browse the repository at this point in the history 
Modified for 0.10.1
  • Loading branch information
@leafi
leafi committed Feb 28, 2016
2 parents 8e7e093 + d6d7c94 commit f99178e
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 47 deletions.
6 changes: 3 additions & 3 deletions .rockspec
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package = "LOVE2D"
version = "0.9.2"
version = "0.10.1"
flags = { ee = true }
description = {
summary = "LOVE2D 0.9.2 Execution Environment",
detailed = [[ LOVE2D 0.9.2 Execution Environment Support ]],
summary = "LOVE2D 0.10.1 Execution Environment",
detailed = [[ LOVE2D 0.10.1 Execution Environment Support ]],
licence = "zlib/libpng",
homepage = "http://www.love2d.org",
}
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Lucky for you, installation is a breeze thanks to the latest in archiving techno

# Building it yourself

The api.zip is built using https://github.com/leafi/love-api-to-ldt-luadoc, a tool which *itself* takes the LOVE2D API definitions from https://github.com/rm-code/love-api. Phew!
The api.zip is built using https://github.com/leafi/love-api-to-ldt-luadoc, a tool which *itself* takes the LOVE2D API definitions from https://github.com/love2d-community/love-api. Phew!

1. Go to https://github.com/leafi/love-api-to-ldt-luadoc and follow the instructions in the README - carefully.
2. With those instructions thoroughly followed, you now find yourself with an api.zip file.
Expand All @@ -40,4 +40,4 @@ Current TODOs:

Original Koneki (pre-LDT) API files: https://github.com/mkosler/LOVELuaDoc

And https://github.com/rm-code/love-api/ is the definition set we produce api.zip from nowadays.
And https://github.com/love2d-community/love-api is the definition set we produce api.zip from nowadays.
Binary file modified api.zip
View file
Binary file not shown.
76 changes: 40 additions & 36 deletions templates/default/conf.lua
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,45 @@
function love.conf(t)
-- Commented out defaults shown below.
-- See https://www.love2d.org/wiki/Config_Files for more information.
-- Commented out defaults shown below.
-- See https://www.love2d.org/wiki/Config_Files for more information.

-- t.identity = nil -- The name of the save directory (string)
-- t.version = "0.9.2" -- The LÖVE version this game was made for (string)
-- t.console = false -- Attach a console (boolean, Windows only)
-- t.identity = nil -- The name of the save directory (string)
-- t.version = "0.10.1" -- The LÖVE version this game was made for (string)
-- t.console = false -- Attach a console (boolean, Windows only)
-- t.accelerometerjoystick = true -- Enable the accelerometer on iOS and Android by exposing it as a Joystick (boolean)
-- t.externalstorage = false -- True to save files (and read from the save directory) in external storage on Android (boolean)
-- t.gammacorrect = false -- Enable gamma-correct rendering, when supported by the system (boolean)

-- t.window.title = "Untitled" -- The window title (string)
-- t.window.icon = nil -- Filepath to an image to use as the window's icon (string)
-- t.window.width = 800 -- The window width (number)
-- t.window.height = 600 -- The window height (number)
-- t.window.borderless = false -- Remove all border visuals from the window (boolean)
-- t.window.resizable = false -- Let the window be user-resizable (boolean)
-- t.window.minwidth = 1 -- Minimum window width if the window is resizable (number)
-- t.window.minheight = 1 -- Minimum window height if the window is resizable (number)
-- t.window.fullscreen = false -- Enable fullscreen (boolean)
-- t.window.fullscreentype = "normal" -- Standard fullscreen or desktop fullscreen mode (string)
-- t.window.vsync = true -- Enable vertical sync (boolean)
-- t.window.fsaa = 0 -- The number of samples to use with multi-sampled antialiasing (number)
-- t.window.display = 1 -- Index of the monitor to show the window in (number)
-- t.window.highdpi = false -- Enable high-dpi mode for the window on a Retina display (boolean)
-- t.window.srgb = false -- Enable sRGB gamma correction when drawing to the screen (boolean)
-- t.window.x = nil -- The x-coordinate of the window's position in the specified display (number)
-- t.window.y = nil -- The y-coordinate of the window's position in the specified display (number)
-- t.window.title = "Untitled" -- The window title (string)
-- t.window.icon = nil -- Filepath to an image to use as the window's icon (string)
-- t.window.width = 800 -- The window width (number)
-- t.window.height = 600 -- The window height (number)
-- t.window.borderless = false -- Remove all border visuals from the window (boolean)
-- t.window.resizable = false -- Let the window be user-resizable (boolean)
-- t.window.minwidth = 1 -- Minimum window width if the window is resizable (number)
-- t.window.minheight = 1 -- Minimum window height if the window is resizable (number)
-- t.window.fullscreen = false -- Enable fullscreen (boolean)
-- t.window.fullscreentype = "desktop" -- Choose between "desktop" fullscreen or "exclusive" fullscreen mode (string)
-- t.window.vsync = true -- Enable vertical sync (boolean)
-- t.window.msaa = 0 -- The number of samples to use with multi-sampled antialiasing (number)
-- t.window.display = 1 -- Index of the monitor to show the window in (number)
-- t.window.highdpi = false -- Enable high-dpi mode for the window on a Retina display (boolean)
-- t.window.x = nil -- The x-coordinate of the window's position in the specified display (number)
-- t.window.y = nil -- The y-coordinate of the window's position in the specified display (number)

-- t.modules.audio = true -- Enable the audio module (boolean)
-- t.modules.event = true -- Enable the event module (boolean)
-- t.modules.graphics = true -- Enable the graphics module (boolean)
-- t.modules.image = true -- Enable the image module (boolean)
-- t.modules.joystick = true -- Enable the joystick module (boolean)
-- t.modules.keyboard = true -- Enable the keyboard module (boolean)
-- t.modules.math = true -- Enable the math module (boolean)
-- t.modules.mouse = true -- Enable the mouse module (boolean)
-- t.modules.physics = true -- Enable the physics module (boolean)
-- t.modules.sound = true -- Enable the sound module (boolean)
-- t.modules.system = true -- Enable the system module (boolean)
-- t.modules.timer = true -- Enable the timer module (boolean)
-- t.modules.window = true -- Enable the window module (boolean)
-- t.modules.thread = true -- Enable the thread module (boolean)
-- t.modules.audio = true -- Enable the audio module (boolean)
-- t.modules.event = true -- Enable the event module (boolean)
-- t.modules.graphics = true -- Enable the graphics module (boolean)
-- t.modules.image = true -- Enable the image module (boolean)
-- t.modules.joystick = true -- Enable the joystick module (boolean)
-- t.modules.keyboard = true -- Enable the keyboard module (boolean)
-- t.modules.math = true -- Enable the math module (boolean)
-- t.modules.mouse = true -- Enable the mouse module (boolean)
-- t.modules.physics = true -- Enable the physics module (boolean)
-- t.modules.sound = true -- Enable the sound module (boolean)
-- t.modules.system = true -- Enable the system module (boolean)
-- t.modules.timer = true -- Enable the timer module (boolean), Disabling it will result 0 delta time in love.update
-- t.modules.touch = true -- Enable the touch module (boolean)
-- t.modules.video = true -- Enable the video module (boolean)
-- t.modules.window = true -- Enable the window module (boolean)
-- t.modules.thread = true -- Enable the thread module (boolean)
end
12 changes: 6 additions & 6 deletions templates/default/main.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ function love.load()
end

function love.draw()
-- Draw a coloured rectangle.
love.graphics.setColor(0, 100, 100);
love.graphics.rectangle('fill', x, y, w, h);
-- Draw a coloured rectangle.
love.graphics.setColor(0, 100, 100);
love.graphics.rectangle('fill', x, y, w, h);

end

function love.update(dt)
-- Grow the rectangle.
w = w + 1
h = h + 1
-- Grow the rectangle.
w = w + 1
h = h + 1

end

Expand Down

0 comments on commit f99178e

Please sign in to comment.