Commit graph

3646 commits

Author SHA1 Message Date
toasterbabe
b17629aee6 * Remove ability to change speed of chains.
* Fix ability to turn chains (still disabled by default, just at least want the option...)
* Replace max speed setting with a "minimum chainlink distance" setting - if greater than zero, that many chains will not be spawned from the center outwards. Doesn't affect the head of the chain at all, since otherwise what's the point? :V
2018-04-01 22:05:59 +01:00
toasterbabe
1ac48b08d0 Mace optimisation!
* Handle all chain objects as a hnext/hprev chain.
* When removing mobjs with hnext/hprev, "repair the chain" (make the h links meet).
* Fix hidden slings, which I accidentially broke when I revamped maces the first time.
* Kill MF2_MACEROTATE. Not needed for anything anymore.
* P_MaceRotate now available to Lua to make up for it.
* Related: Made modifying hnext/hprev using Lua safer, so it keeps the reference counts in play.
2018-04-01 20:54:19 +01: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
Monster Iestyn
7f7b459f69 Cleanup of the code I've tweaked for skies, added SLOPEPARAMS macro to R_StoreWallRange for use in getting seg end z positions 2018-02-03 18:30:49 +00:00
Monster Iestyn
c41b3a186a Pushing all my work to make OpenGL consistent with my changes to software's sky so far 2018-02-01 22:04:04 +00:00
toasterbabe
c444a460a3 cv_playername already has a valid default value of "Sonic". We do NOT need to expose things like this. 2018-01-30 22:48:53 +00:00
toasterbabe
e03e97edc8 Stop leaking names. 2018-01-30 21:25:28 +00:00
Monster Iestyn
d6427c4148 some cleanup of software's seg rendering code, moved Red's polyobject plane hack to R_StoreWallRange since it doesn't actually need to be done every column draw
(I suspect polyobject planes don't actually need the minx/maxx hacks anymore, but I haven't the time to test that tonight nor is this branch really suited for it anyway)
2018-01-29 22:05:04 +00:00
Monster Iestyn
26578a8952 More sky fixes for software:
* Thok barriers with slopes now render fine in software
* The solid "sky walls" between different-height thok barriers adjacent to each other are gone. Forever.
2018-01-28 22:08:58 +00:00
Monster Iestyn
aabf2b096f Fix skies in software being displayed backwards
(I'll get round to OpenGL later)
2018-01-27 19:29:41 +00:00
Monster Iestyn
2a75523be9 Move sky plane-drawing code from R_DrawPlanes to a new function called by R_DrawSinglePlane
This potentially allows FOFs and polyobjects to display sky flats on them properly, unless skyboxes are involved in which case they'd fail either way

I also updated or added comments to some places of the sky drawing code and related where useful
2018-01-27 19:18:17 +00:00
Monster Iestyn
bf849ffba2 Merge branch 'next' into lua-archive-crash-hotfixes 2018-01-20 21:33:03 +00:00
Monster Iestyn
7dd919f3f8 Some fixes to prevent bad table key types causing Lua panic errors for joining players in netgames:
* ArchiveTables: print an error if invalid key, to alert script author potentially
* UnArchiveTables: if the key is found to be nil after reading key and value, print an error and don't set them in the table
2018-01-20 21:18:16 +00:00
Monster Iestyn
6067e94dc2 Prevent SV_SpawnPlayer from being able to freeze the game if gametic is 0. Additionally add a sanity check to prevent the loop going on more than necessary anyway
This commit fixes -playdemo and -timedemo params for command line, allowing them to actually work again
2018-01-16 15:21:49 +00:00
Monster Iestyn
19e93c8394 Fix missing semicolon 2018-01-12 20:05:09 +00:00
Monster Iestyn
00fe750722 G_DoPlayDemo: prepend srb2home to the demo name (if an external file) so that demos in custom home paths can be loaded 2018-01-11 16:55:42 +00:00
Monster Iestyn
edb11b84d8 W_IsLumpWad: check if the file is a PK3, so it can bail out if it isn't 2018-01-10 19:13:29 +00:00