From 9e139779956ddba89333eece8104bd7b1b4ff2e7 Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Mon, 31 Oct 2016 20:23:52 +0100 Subject: [PATCH 1/6] Added release date for 0.10.2 --- changes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes.txt b/changes.txt index 66a501d4f..5b50368ca 100644 --- a/changes.txt +++ b/changes.txt @@ -1,7 +1,7 @@ LOVE 0.10.2 [Super Toast] ------------------------- -Released: N/A +Released: 2016-10-31 * Added lovec.exe in Windows. It is the same as love.exe but built with the Console subsystem, so it always uses or provides a console. * Added the ability to restart the game via love.event.quit("restart"). From 3336accb8fbfdaf35f2220a451fc5389feefcb44 Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Mon, 31 Oct 2016 20:23:56 +0100 Subject: [PATCH 2/6] Added tag 0.10.2 for changeset afc69c4f7145 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 67d680e02..69c60352e 100644 --- a/.hgtags +++ b/.hgtags @@ -10,3 +10,4 @@ e0f98d53debb62347c6433ca0534a0f77f15f76f 0.8.0 a5e405cdf14d030b71d09a105086797942ae91a9 0.9.2 14717f0fb5d96d380c10fe6f41b74b7652c7d836 0.10.0 3cb3559eebb89803c0b7fa83d51d8e48a2b20b7a 0.10.1 +afc69c4f714534c64e6f8c8660b724b5b736d7f3 0.10.2 From de855f30d527a9d30314c2109bdb709240305cbc Mon Sep 17 00:00:00 2001 From: xpol Date: Fri, 4 Nov 2016 11:37:38 +0800 Subject: [PATCH 3/6] Better love.arg.parse_options(): 1. use string.match for we are mean to match 2. better match pattern which now do not allow somthing like `not-a-valid--console` 3. use while loop which allows change loop var. --HG-- branch : better-parse-options --- src/scripts/boot.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index 552827e1d..e3de9d4ed 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -134,15 +134,17 @@ function love.arg.parse_options() local game local argc = #arg - for i=1,argc do + local i = 1 + while i <= argc do -- Look for options. - local s, e, m = string.find(arg[i], "%-%-(.+)") + local m = string.match(arg[i], "^%-%-(.+)") if m and love.arg.options[m] then i = love.arg.parse_option(love.arg.options[m], i+1) elseif not game then game = i end + i = i + 1 end if not love.arg.options.game.set then From c28a6c51c49c5d1acba4645e3f29097d3fa010a3 Mon Sep 17 00:00:00 2001 From: Xpol Wan Date: Fri, 4 Nov 2016 22:27:49 +0800 Subject: [PATCH 4/6] love.arg.parse_option just return how many extra arg the current option consumes. --HG-- branch : better-parse-options --- src/scripts/boot.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index e3de9d4ed..50b31c6e6 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -122,11 +122,10 @@ function love.arg.parse_option(m, i) m.arg = {} for j=i,i+m.a-1 do table.insert(m.arg, arg[j]) - i = j end end - return i + return m.a end function love.arg.parse_options() @@ -140,7 +139,7 @@ function love.arg.parse_options() local m = string.match(arg[i], "^%-%-(.+)") if m and love.arg.options[m] then - i = love.arg.parse_option(love.arg.options[m], i+1) + i = i + love.arg.parse_option(love.arg.options[m], i+1) elseif not game then game = i end From c647317a749bc1872c41d503c7b177b2167a826c Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 5 Nov 2016 17:33:32 -0300 Subject: [PATCH 5/6] Re-generated boot.lua.h. --- src/scripts/boot.lua.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index 90d13adf8..55c317952 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -218,30 +218,33 @@ const unsigned char boot_lua[] = 0x64, 0x6f, 0x0a, 0x09, 0x09, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x28, 0x6d, 0x2e, 0x61, 0x72, 0x67, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x6a, 0x5d, 0x29, 0x0a, - 0x09, 0x09, 0x09, 0x69, 0x20, 0x3d, 0x20, 0x6a, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x0a, - 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x0a, + 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6d, 0x2e, 0x61, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, 0x67, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x28, 0x29, 0x0a, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x0a, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x61, 0x72, 0x67, 0x63, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x72, 0x67, 0x0a, - 0x09, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x3d, 0x31, 0x2c, 0x61, 0x72, 0x67, 0x63, 0x20, 0x64, 0x6f, 0x0a, + 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x0a, + 0x09, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, 0x69, 0x20, 0x3c, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x63, 0x20, 0x64, + 0x6f, 0x0a, 0x09, 0x09, 0x2d, 0x2d, 0x20, 0x4c, 0x6f, 0x6f, 0x6b, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x0a, - 0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x73, 0x2c, 0x20, 0x65, 0x2c, 0x20, 0x6d, 0x20, 0x3d, 0x20, - 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x66, 0x69, 0x6e, 0x64, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, - 0x2c, 0x20, 0x22, 0x25, 0x2d, 0x25, 0x2d, 0x28, 0x2e, 0x2b, 0x29, 0x22, 0x29, 0x0a, + 0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6d, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, + 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x2c, 0x20, 0x22, 0x5e, 0x25, + 0x2d, 0x25, 0x2d, 0x28, 0x2e, 0x2b, 0x29, 0x22, 0x29, 0x0a, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6d, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, 0x67, 0x2e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5b, 0x6d, 0x5d, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, - 0x09, 0x09, 0x09, 0x69, 0x20, 0x3d, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, 0x67, 0x2e, 0x70, 0x61, - 0x72, 0x73, 0x65, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, - 0x67, 0x2e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5b, 0x6d, 0x5d, 0x2c, 0x20, 0x69, 0x2b, 0x31, 0x29, 0x0a, + 0x09, 0x09, 0x09, 0x69, 0x20, 0x3d, 0x20, 0x69, 0x20, 0x2b, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, + 0x67, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6c, 0x6f, 0x76, + 0x65, 0x2e, 0x61, 0x72, 0x67, 0x2e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5b, 0x6d, 0x5d, 0x2c, 0x20, + 0x69, 0x2b, 0x31, 0x29, 0x0a, 0x09, 0x09, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x09, 0x09, 0x09, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x69, 0x0a, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, + 0x09, 0x09, 0x69, 0x20, 0x3d, 0x20, 0x69, 0x20, 0x2b, 0x20, 0x31, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, 0x67, 0x2e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x2e, 0x73, 0x65, 0x74, 0x20, 0x74, 0x68, From b0849343111200cf3e67365643cec8ac2a4dbf79 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Wed, 16 Nov 2016 17:37:43 +0000 Subject: [PATCH 6/6] Fix Shader:send and sendColor ignoring the last argument for shader uniform arrays. --- src/modules/graphics/opengl/wrap_Shader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/graphics/opengl/wrap_Shader.cpp b/src/modules/graphics/opengl/wrap_Shader.cpp index e13cc7926..0a3b5f149 100644 --- a/src/modules/graphics/opengl/wrap_Shader.cpp +++ b/src/modules/graphics/opengl/wrap_Shader.cpp @@ -48,7 +48,7 @@ int w_Shader_getWarnings(lua_State *L) static int _getCount(lua_State *L, int startidx, const Shader::UniformInfo *info) { - return std::min(std::max(lua_gettop(L) - startidx, 1), info->count); + return std::min(std::max(lua_gettop(L) - startidx + 1, 1), info->count); } template