Wolfy
c8eb016404
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal
2018-04-05 03:55:03 -05:00
Wolfy
c6fc425648
THZ Hardcoding
...
Feel free to reorganize as necessary.
2018-04-05 03:23:27 -05:00
Alam Ed Arias
afa68c8ccb
Merge branch 'public_next' into master
2018-04-03 16:09:11 -04:00
Alam Ed Arias
1e76cb8a88
Merge branch 'master' into next
2018-03-14 14:29:42 -04:00
Alam Ed Arias
93e143e26f
Merge remote-tracking branch 'public/master'
2018-03-14 14:26:07 -04:00
colette
1151f4bba3
Merge branch 'credits_update' into 'master'
...
Credits update
See merge request STJr/SRB2!231
2018-03-14 12:56:27 -04:00
toasterbabe
5f4fa843c2
i suck at the alphabet!
2018-03-14 16:55:33 +00:00
toasterbabe
cb0511a912
oh yeah this guy's name needs changing too
2018-03-14 16:49:10 +00:00
toasterbabe
429a293a1b
down with cis
2018-03-14 16:47:19 +00:00
MonsterIestyn
632c7dd5ce
Merge pull request #239 from LJSonik/net-archive-fix
...
Fix Lua panic when archiving a table element with an userdata key
2018-03-09 16:13:12 +00:00
Louis-Antoine
dc02ef886f
Fix Lua panic when archiving a table element with an userdata key
2018-03-09 16:40:34 +01:00
Monster Iestyn
651e773c7e
Merge branch 'master' into next
2018-03-08 19:35:51 +00:00
Monster Iestyn
9a1a29508e
Merge branch 'download-filename-trunc-fix' into 'master'
...
Download filename trunc fix
See merge request STJr/SRB2!230
2018-03-08 14:33:57 -05:00
Monster Iestyn
3f61a1608d
shrunk buffer from 32 to 28 so that all of "Downloading "extremely...longname.wad"" can fit on screen at once.
2018-03-06 20:52:55 +00:00
Monster Iestyn
b060d98c28
replace the 3 strncpys with a snprintf
2018-03-06 20:20:27 +00:00
Monster Iestyn
426983ff11
rewrite download file screen code:
...
* fix screen to properly truncate the filename to just the real name only
* if the real name itself is too long, use ellipsis and paste in parts of the start and end of the actual name
note: I haven't actually tested if this works or compiles yet, I haven't the time right now
2018-03-05 22:24:03 +00:00
Monster Iestyn
aad441ff74
Merge branch 'zoning-out' into 'master'
...
Zoning out
See merge request STJr/SRB2Internal!133
2018-03-04 14:19:25 -05:00
Monster Iestyn
c11a2ad9b6
Merge branch 'public_next'
...
# Conflicts:
# src/sdl/i_system.c
2018-03-04 19:18:13 +00:00
Monster Iestyn
ced141d596
Merge branch 'master' into next
2018-03-04 19:10:01 +00:00
Monster Iestyn
f25eb1705a
Merge branch 'linux-limbo' into 'master'
...
Linux limbo
See merge request STJr/SRB2!228
2018-03-04 14:08:21 -05:00
Monster Iestyn
8b586690a8
Merge branch 'soc-sanitizing' into 'next'
...
SOC sanitizing
See merge request STJr/SRB2!227
2018-03-04 14:07:30 -05:00
Monster Iestyn
084e718414
Merge branch 'console-key-breakfast' into 'master'
...
Console key breakfast
See merge request STJr/SRB2!226
2018-03-04 14:06:40 -05:00
Monster Iestyn
39949392ca
more I_GetFreeMem fixes: don't attempt to set *total to 0L if total itself is NULL
2018-02-23 20:40:19 +00:00
Monster Iestyn
a4637a6dec
Use __linux__ instead of LINUX/LINUX64
...
Turns out compiling for Linux 32-bit using the Makefiles never actually defines LINUX! Apart from that, most of the existing Linux-specific code in SRB2's source code (except for tmap.s) actually uses __linux__ instead anyway
2018-02-23 20:21:16 +00:00
Monster Iestyn
ce78df03d0
Eat unprintable keys too, since there's no reason to feed them to G_Responder anyway when the console is open
2018-02-23 20:08:02 +00:00
Monster Iestyn
628f9921a8
removing stupid dumb useless code fish
2018-02-21 22:45:51 +00:00
Monster Iestyn
bef710aa8f
Make CON_Responder eat Ctrl+key combos that have no effect, instead of passing the key on to G_Responder
2018-02-20 17:06:03 +00:00
Monster Iestyn
64eba82692
Added Z_TotalUsage as a shortcut for Z_TagsUsage(0, INT32_MAX)
2018-02-16 20:32:43 +00:00
Monster Iestyn
5c6755df7f
Total reorganisation of z_zone.c/h, added doxygen-compatible comments to all functions and additional regular comments where appropriate, changed purge tag macros to an enum list
2018-02-15 22:09:24 +00:00
Monster Iestyn
afe4178fd7
updating comment for Z_TagsUsage in the .c file
2018-02-15 16:53:58 +00:00
Monster Iestyn
c5261c1133
Z_FreeTag and Z_TagUsage are now both macros of their respective two arg variants
2018-02-15 16:31:05 +00:00
Monster Iestyn
4383d1fdd2
added a quick Z_FreeTag function as a shortcut to Z_FreeTags(tag, tag) where both tags are the same
2018-02-14 23:16:16 +00:00
Monster Iestyn
fa1173ed10
Clean up z_zone.h's function protos to look more readable like m_random.h, don't name functions with "2" if not using PARANOIA or ZDEBUG
...
also, Z_Malloc/Calloc/Realloc are now macros of the "Align" versions, regardless of ZDEBUG or not
2018-02-14 22:52:25 +00:00
Alam Ed Arias
f1fa3855e5
Merge branch 'public_next' into private
2018-02-14 10:34:36 -05:00
Alam Ed Arias
8722b369a3
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
Alam Arias
d23d0e0e5b
Merge pull request #231 from LJSonik/net-command-leak-fix
...
Fix net commands not always being freed
2018-02-14 10:28:32 -05:00
Louis-Antoine
64a108e24a
Don't allocate memory for net commands already executed, as it would cause them to be never freed
2018-02-14 15:09:52 +01:00
Monster Iestyn
c44a1dc543
Merge branch 'file-loading-cleanup' into 'master'
...
File loading cleanup
See merge request STJr/SRB2Internal!129
2018-02-13 16:18:55 -05:00
Monster Iestyn
f5035e70ea
Don't attempt to load the "Lua/" or "SOCs/" folder lumps themselves as Lua/SOC lumps
2018-02-13 21:12:42 +00:00
Monster Iestyn
02862511ae
Fix SOC/Lua loading messages to display full names or even display at all (for PK3s at least), and otherwise some cleanup of existing code for the messages.
...
Also, I moved lua_lumploading on/offing to LUA_LoadFile.
2018-02-09 22:43:08 +00:00
Monster Iestyn
fb6c96de00
Merge branch 'stopleakingnames' into 'master'
...
Stop leaking names via metadata.
See merge request STJr/SRB2!223
2018-02-08 16:14:15 -05:00
Monster Iestyn
46704455bb
Merge branch 'master' into file-loading-cleanup
2018-02-08 20:32:59 +00:00
Monster Iestyn
78d3ddcb34
Merge branch 'public_next'
2018-02-08 20:31:53 +00:00
Monster Iestyn
6f491daa94
Merge branch 'playdemo-custom-home-fix' into 'next'
...
Fix for "playdemo" not working with custom home paths
See merge request STJr/SRB2!221
2018-02-08 15:29:39 -05:00
Monster Iestyn
a550ff6692
Merge branch 'lua-archive-crash-hotfixes' into 'next'
...
Hotfix for "LUA PANIC" crash when joining a netgame
See merge request STJr/SRB2!222
2018-02-08 15:29:20 -05:00
Monster Iestyn
8a9bbb9a2b
Merge branch 'general-sky-fixes' into 'master'
...
General sky fixes
See merge request STJr/SRB2Internal!132
2018-02-08 13:41:57 -05:00
Monster Iestyn
2692d6f9dc
optimised R_ExpandPlane too
2018-02-07 18:11:32 +00:00
Monster Iestyn
5533c97c69
Fixed sky-sky thok barriers showing HOM (turns out the floor and ceiling share the same plane, so I've modified the code to account for this)
...
Additionally, place some optimisations in both software and OpenGL; in particular one has been added for when all of back and front sector (floor and ceiling) is sky: since everything is "open" anyway, we can simply the usual checks involved.
2018-02-07 17:46:01 +00:00
Monster Iestyn
17bedfbd87
Correct backwards skies for OpenGL too
2018-02-03 21:39:36 +00:00
Monster Iestyn
e95987f4ae
Added proper support for upside-down thok barriers, in both renderers
...
Thankfully it was really just a copy+paste of the code I already tinkered with for the normal ceiling sky based thok barriers, but tweaked for floors instead
2018-02-03 19:48:18 +00:00
