lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,383 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

11383 Commits

Author SHA1 Message Date
James R 50e15840fb Merge branch 'udmf-multitag' into 'next' 
UDMF: Multitag support

See merge request STJr/SRB2!1097
 2020-11-14 19:18:14 -05:00
James R d3199ac779 Fix one last instance of printing address diff 2020-11-14 16:18:54 -08:00
James R 2a35e0d59f Merge branch 'lua-musicfuncs' into 'next' 
Expose more music functions to Lua

See merge request STJr/SRB2!1230
 2020-11-14 18:51:22 -05:00
James R dfeddafc03 Merge branch 'nolua2' into 'next' 
Don't let Lua set cvars that have CV_NOLUA

See merge request STJr/SRB2!1245
 2020-11-14 18:37:21 -05:00
James R 11bb835a45 Merge branch 'precip-bad-access' into 'next' 
Fix potential crash with precipitation in OpenGL

See merge request STJr/SRB2!1249
 2020-11-14 18:33:58 -05:00
James R bd9b11a40c Merge branch 'mobjspawnscale' into 'next' 
Reallow P_MobjSpawn to change the scale of objects spawned from mapthings

Closes #328

See merge request STJr/SRB2!1251
 2020-11-14 18:08:40 -05:00
Nev3r 3a8b2a6fb7 Better documentation. 2020-11-14 20:50:34 +01:00
Nev3r cc98be4d23 Add documentation for the iterator macros. 2020-11-14 20:25:00 +01:00
lachwright a65fc9f622 Reallow P_MobjSpawn to change the scale of objects spawned from mapthings 2020-11-15 02:53:10 +11:00
James R e3c8415627 OpenGL: don't access field that doesn't exist in precipmobj_t 2020-11-13 00:46:03 -08:00
Nev3r 072e1889e2 Fix size_t/INT32 compare. 2020-11-12 13:59:21 +01:00
Nev3r 2c8a99f25a Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00
Nev3r a8f554075f Extern the global tag groups properly. 2020-11-12 12:25:02 +01:00
Nev3r a931d09e7d Forgot to change %d to %s for sizeu1(). 2020-11-10 13:11:42 +01:00
Nev3r 56c3e93d3a Remove unused tag parameter. 2020-11-10 13:10:01 +01:00
Nev3r a405f17d0b Missing prototype. 2020-11-10 13:09:30 +01:00
Nev3r 676f7f5dbf Use memmove() 2020-11-10 12:45:30 +01:00
Nev3r b65211d148 Use sizeu1() 2020-11-10 12:34:08 +01:00
Nev3r d5355a11b0 Indent 2020-11-10 12:23:30 +01:00
Nev3r 95a61a226b rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
Nev3r 1d542d3676 Add copyright notices. 2020-11-10 12:12:16 +01:00
Nev3r fb9432ae57 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 2020-11-10 11:46:53 +01:00
James R b62a3b623a Don't let Lua cvar setting functions work on CV_NOLUA vars 2020-11-09 18:54:00 -08:00
James R 4fcca22343 Merge branch 'step-up-goofs-2' into 'next' 
Fix disabling step up/down not working

See merge request STJr/SRB2!1219
 2020-11-09 17:52:41 -05:00
James R 202d2126c9 Merge branch 'fix-leave-div-by-0' into 'next' 
Fix stupid divide-by-zero error when leaving servers

See merge request STJr/SRB2!1240
 2020-11-09 17:52:19 -05:00
GoldenTails fae4709f4b Fix stupid divide-by-zero error 2020-11-08 23:28:20 -06:00
Steel Titanium bcaed4b95b Remove unused music types 2020-11-08 21:33:12 -05:00
Steel Titanium 050a22f1ce Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-musicfuncs 2020-11-08 21:20:07 -05:00
James R 876aeb6a31 Merge branch 'allowshaders' into 'next' 
Let the server or an admin toggle clients' custom shaders

See merge request STJr/SRB2!1181
 2020-11-08 21:09:56 -05:00
Jaime Passos b8f668b2e0 rename 2020-11-08 23:02:05 -03:00
James R 16f08d28e2 Merge branch 'hyperwalls-fix' into 'next' 
Fix hyperwalls

See merge request STJr/SRB2!1232
 2020-11-08 20:59:28 -05:00
James R 9e6f64ea22 Merge branch 'x' into 'next' 
Whitelist missing graphics

See merge request STJr/SRB2!1189
 2020-11-08 20:48:25 -05:00
James R b2dc35864e Merge branch 'pngpal-compare' into 'next' 
Compare PNG palettes with the game's palette, instead of assuming they are the same

See merge request STJr/SRB2!1185
 2020-11-08 20:46:07 -05:00
James R bbd003976b Merge branch 'write-thingies' into 'next' 
The lump is not needed for P_WriteThings

See merge request STJr/SRB2!1231
 2020-11-08 20:35:51 -05:00
James R 049237e50f Merge branch 'gif-dynamic-delay-v2' into 'next' 
EMERGENCY: By default use the old gif_dynamicdelay v1 behavior, but keep v2 as an option.

See merge request STJr/SRB2!1236
 2020-11-08 19:33:03 -05:00
James R 097f204ceb Merge branch 'register-metatables' into 'next' 
Improve support for metatables in netgames

See merge request STJr/SRB2!1224
 2020-11-08 19:30:51 -05:00
Louis-Antoine 9f851dc285 Return explicitly when failing to register a metatable 2020-11-09 00:16:40 +01:00
Louis-Antoine 87206a8c21 Show a console error if the gamestate contains too many tables 2020-11-08 17:33:49 +01:00
Louis-Antoine e52cb7f6fa Throw an error if too many metatables are registered 2020-11-08 17:20:25 +01:00
LJ Sonic 9b151ca45c Merge branch 'resend-gamestate' into 'next' 
Resend gamestate when resynching

See merge request STJr/SRB2!829
 2020-11-07 13:14:32 -05:00
GoldenTails 9d11d8eec9 Remove 3 wasteful bytes of guaranteed blank memory from some place where it's not gonna matter that much 2020-11-07 03:49:21 -06:00
GoldenTails d031bb5357 fix dumb memcpy 2020-11-07 03:43:55 -06:00
GoldenTails e473bfd4cd By default use the old gif_dynamicdelay v1 behavior, but keep v2 as an option. 2020-11-07 03:02:21 -06:00
James R 4ca994a05b Merge branch 'gif-dynamic-delay-v2' into 'next' 
Give the GIF recorder some memory so frame delays are a little more accurate

See merge request STJr/SRB2!1198
 2020-11-06 17:10:45 -05:00
GoldenTails 1f7df8a790 Fix hyperwalls 2020-11-03 20:11:39 -06:00
Steel Titanium d9bc621d17 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-musicfuncs 
# Conflicts:
#	src/dehacked.c
 2020-11-01 23:22:03 -05:00
James R 998a10e8ad Merge remote-tracking branch 'origin/master' into next 2020-11-01 20:01:22 -08:00
James R a653406e7a Merge branch 'lua_expose-gamestate' into 'next' 
Expose gamestate to Lua

See merge request STJr/SRB2!1229
 2020-11-01 22:57:52 -05:00
James R 56d2290778 Merge branch 'cmake-fullscreen-fix' into 'master' 
Cmake: fullscreen fix

See merge request STJr/SRB2!1226
 2020-11-01 22:57:27 -05:00
James R f2e15fc4f1 Merge branch 'cmake-curl-internal-fix' into 'master' 
Fix compiling using cmake if internal libs is used

See merge request STJr/SRB2!1225
 2020-11-01 22:57:12 -05:00