Skip to content

Commit 59f6f73

Browse files
Andrew McWattersAndrew McWatters
authored andcommitted
Update to Grid 7.2.0
1 parent 724cd23 commit 59f6f73

File tree

7 files changed

+30
-20
lines changed

7 files changed

+30
-20
lines changed

scripts/docs/articles.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
require( "scripts/docs" )
88

9-
filesystem.createDirectory( "docs" )
9+
love.filesystem.createDirectory( "docs" )
1010

1111
local insert = table.insert
1212
local len = string.len
@@ -91,6 +91,10 @@ local function writeMethods( section, methods, separator )
9191
-- Location
9292
local v = docs.findModule( section )
9393
insert( md, r_header2( "Source" ) )
94+
if ( type( v[ method ] ) ~= "function" ) then
95+
return
96+
end
97+
9498
local info = debug.getinfo( v[ method ], "S" )
9599
local path = info.short_src
96100
local line = info.linedefined
@@ -144,7 +148,7 @@ local function writeMethods( section, methods, separator )
144148
end
145149

146150
md = concat( md, "\r\n" )
147-
filesystem.write( "docs/" .. filename .. ".md", md )
151+
love.filesystem.write( "docs/" .. filename .. ".md", md )
148152
end
149153
end
150154

scripts/docs/concommand.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--
55
--============================================================================--
66

7-
filesystem.createDirectory( "docs" )
7+
love.filesystem.createDirectory( "docs" )
88

99
local markdown = {}
1010
table.insert( markdown, "List of console commands" )
@@ -15,7 +15,7 @@ table.insert( markdown, "| ---- | ----------- |" )
1515

1616
local concommands = {}
1717

18-
for name in pairs( concommand.concommands ) do
18+
for name in pairs( concommand._concommands ) do
1919
table.insert( concommands, name )
2020
end
2121

@@ -34,4 +34,4 @@ end
3434

3535
table.insert( markdown, "" )
3636
markdown = table.concat( markdown, "\r\n" )
37-
filesystem.write( "docs/List_of_console_commands.md", markdown )
37+
love.filesystem.write( "docs/List_of_console_commands.md", markdown )

scripts/docs/convar.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--
55
--============================================================================--
66

7-
filesystem.createDirectory( "docs" )
7+
love.filesystem.createDirectory( "docs" )
88

99
local markdown = {}
1010
table.insert( markdown, "List of console variables" )
@@ -15,7 +15,7 @@ table.insert( markdown, "| ---- | ------- | --- | --- | ----------- |" )
1515

1616
local convars = {}
1717

18-
for name in pairs( convar.convars ) do
18+
for name in pairs( convar._convars ) do
1919
table.insert( convars, name )
2020
end
2121

@@ -42,4 +42,4 @@ end
4242

4343
table.insert( markdown, "" )
4444
markdown = table.concat( markdown, "\r\n" )
45-
filesystem.write( "docs/List_of_console_variables.md", markdown )
45+
love.filesystem.write( "docs/List_of_console_variables.md", markdown )

scripts/docs/init.lua

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
local debug = debug
88
local error = error
9-
local filesystem = filesystem
109
local gui = gui
1110
local ipairs = ipairs
11+
local love = love
1212
local pairs = pairs
1313
local rawtype = rawtype
1414
local require = require
@@ -181,11 +181,11 @@ function getInterfacesAndLibraries()
181181
end
182182

183183
-- network interface
184-
table.insert( packages, "network" )
184+
-- table.insert( packages, "network" )
185185

186186
-- socket interfaces
187-
table.insert( packages, "http" )
188-
table.insert( packages, "https" )
187+
-- table.insert( packages, "http" )
188+
-- table.insert( packages, "https" )
189189

190190
-- Lua 5.1.5 base library extensions
191191
table.insert( packages, "math" )
@@ -215,14 +215,16 @@ end
215215
function getPanels()
216216
local panels = {}
217217
local blacklist = {
218+
"autoloader",
218219
"console",
219220
"debugoverlaypanel",
221+
"handlers",
220222
"init",
221223
"optionsmenu",
222224
"scheme",
223225
"testframe"
224226
}
225-
local files = filesystem.getDirectoryItems( "engine/client/gui" )
227+
local files = love.filesystem.getDirectoryItems( "engine/client/gui" )
226228
for _, panel in ipairs( files ) do
227229
local extension = "%." .. ( string.fileextension( panel ) or "" )
228230
panel = string.gsub( panel, extension, "" )

scripts/docs/payload.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--
55
--============================================================================--
66

7-
filesystem.createDirectory( "docs" )
7+
love.filesystem.createDirectory( "docs" )
88

99
local insert = table.insert
1010
local sort = table.sort
@@ -88,4 +88,4 @@ for _, name in ipairs( payloads ) do
8888
end
8989

9090
md = concat( md, "\r\n" )
91-
filesystem.write( "docs/List_of_payloads.md", md )
91+
love.filesystem.write( "docs/List_of_payloads.md", md )

scripts/docs/sections.lua

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
require( "scripts/docs" )
88

9-
filesystem.createDirectory( "docs" )
9+
love.filesystem.createDirectory( "docs" )
1010

1111
local insert = table.insert
1212
local concat = table.concat
@@ -57,8 +57,12 @@ local function r_purpose( section )
5757
v = getFirstLuaFunction( v )
5858
end
5959

60+
if ( v == nil ) then
61+
return ""
62+
end
63+
6064
local src = debug.getinfo( v, "S" ).short_src
61-
src = filesystem.read( src )
65+
src = love.filesystem.read( src )
6266
local _, _, purpose = find( src, "-- Purpose:%s(.-\r\n)" )
6367
return purpose
6468
end
@@ -137,7 +141,7 @@ local function writeSection( section )
137141
end
138142

139143
md = concat( md, "\r\n" )
140-
filesystem.write( "docs/" .. section .. ".md", md )
144+
love.filesystem.write( "docs/" .. section .. ".md", md )
141145
end
142146

143147
local sections = {}

scripts/docs/sidebar.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
require( "scripts/docs" )
88

9-
filesystem.createDirectory( "docs" )
9+
love.filesystem.createDirectory( "docs" )
1010

1111
local function renderSidebarSection( header, list )
1212
local markdown = {}
@@ -45,4 +45,4 @@ table.insert( markdown, renderSidebarSection(
4545
) )
4646

4747
markdown = table.concat( markdown, "\r\n" )
48-
filesystem.write( "docs/_Sidebar.md", markdown )
48+
love.filesystem.write( "docs/_Sidebar.md", markdown )

0 commit comments

Comments
 (0)