lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11492 commits 1 branch 29 tags 122 MiB
Commit graph

10158 commits

Author SHA1 Message Date
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
Riku Salminen 3dff612f3c Try to add cvars for old camera 2020-11-10 13:21:34 +02:00
Riku Salminen 33725a58b4 Update p_tick.c, Replacing mobj angle with cmd angleturn 2020-11-10 13:21:34 +02:00
Riku Salminen aea35171c2 Update p_tick.c, got rid of an useless angle change function 2020-11-10 13:21:34 +02:00
Riku Salminen 2832586274 Make the replay camera follow the player 2020-11-10 13:21:33 +02: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
Riku Salminen 3daee0ebf8 Made height/spinheight and height change values in replays more accurate 2020-11-09 17:01:20 +02:00
GoldenTails fae4709f4b Fix stupid divide-by-zero error 2020-11-08 23:28:20 -06:00
GoldenTails 9e6c0c31be Add skincolor vars to the NetSave 2020-11-08 20:43:16 -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
James R 0d97903573 Do not factor height into sprite thickseg sorting 2020-11-05 18:45:52 -08:00
James R 8d63a994f0 Remove unused stuff 2020-11-05 18:45:51 -08:00
James R 81cbf35560 Check that top of sprite is above plane or bottom is below 
This fixes slightly raised fofs drawing on top of sprites that should be in
front of them. Previously would check that the bottom of the object was above
the plane. Now also uses sprite offsets like the fof seg sorting does.
 2020-11-05 18:45:43 -08:00
GoldenTails c70d5a9773 Make mapmusflags and mapmusname writable. 2020-11-05 18:12:35 -06:00
GoldenTails 365e02bb32 Make skincolor_* CTF color variables writable. 2020-11-05 17:38:32 -06:00
GoldenTails 2b39a971ac Make stoppedclock writable. 2020-11-05 15:22:45 -06:00
GoldenTails f42dee1871 Make displayplayer writable. 2020-11-05 13:43:33 -06:00
GoldenTails 8a0f55e4ad Make gravity writable. 2020-11-05 12:39:03 -06:00
GoldenTails 113e6b6585 Make token writable. 2020-11-05 12:38:47 -06:00
GoldenTails a502b09929 Make emeralds writable. 2020-11-05 12:37:49 -06:00
Jaime Passos a655257f4b Remove RF_VOXELSPRITE 2020-11-05 00:44:10 -03:00
Jaime Passos 36550725f3 P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope 2020-11-05 00:42:14 -03:00
Jaime Passos 8f65b98c24 Remove NOWATER define 2020-11-05 00:00:08 -03:00
Jaime Passos c07c80fd9e Plane optimization and cleanup 2020-11-04 23:46:34 -03:00
Jaime Passos 805818d48e R_DrawSplatSprite -> R_DrawFloorSprite 2020-11-04 21:43:16 -03: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
James R 4fc0e44c23 Merge branch 'copyright-fixes' into 'next' 
Fix some copyright statements in new files

See merge request STJr/SRB2!1223
 2020-11-01 22:56:58 -05:00
James R 18365f3820 Merge branch 'udmf-seg-length-crash-fix' into 'next' 
UDMF Seg length crash fix

See merge request STJr/SRB2!1221
 2020-11-01 22:55:13 -05:00
James R f4b82f27db Merge branch 'fix-objectplace-silent' into 'next' 
Fix objectplace -silent

See merge request STJr/SRB2!1214
 2020-11-01 22:52:46 -05:00
James R 33cfd2c72a Merge branch 'mobjghost-rollangle' into 'next' 
Ghost mobj matches rollangle (Closes #362)

Closes #362

See merge request STJr/SRB2!1211
 2020-11-01 22:49:50 -05:00
James R fdbeafca42 Merge branch 'tailsoverlay-dash' into 'next' 
Dash state for Tails overlay (Closes #325)

Closes #325

See merge request STJr/SRB2!1210
 2020-11-01 22:49:12 -05:00
James R 37931fc253 The lump is not needed for P_WriteThings 2020-11-01 19:31:10 -08:00
Steel Titanium ac7781a3b3 Expose more music functions to Lua 2020-10-31 21:15:41 -04:00
Steel Titanium 41d8210fd5 Expose gamestate to Lua 2020-10-31 16:36:15 -04:00
Hannu Hanhi 54cc9db7a5 Fix CMake SSE3 flag 2020-10-31 18:04:44 +02:00
lachwright bfbcc69108 Draw save files from outwards in 2020-10-31 18:21:14 +11:00
Steel Titanium 62b5b86ed4 CMake: Fix fullscreen toggle not working 
All because of a typo
 2020-10-31 00:59:51 -04:00
Steel Titanium d406340b5d Fix compiling using cmake if internal libs is used 2020-10-30 23:37:34 -04:00
Louis-Antoine 1155d875d5 Use the same names as userdataType() for userdataMetatable() 2020-10-30 15:00:13 +01:00
Louis-Antoine f943f247af Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into register-metatables 2020-10-30 14:46:04 +01:00
Zippy_Zolton 6c00a96755 thunder shield :D 2020-10-29 12:32:42 -05:00
Hannu Hanhi c44120eb87 Fix some copyright statements in new files 2020-10-29 16:04:25 +02:00
Monster Iestyn 5241b83f97 Fix seg->length and flength not being set at all for UDMF maps 2020-10-28 19:36:03 +00:00
Zippy_Zolton 4e56caa196 Flame Shield Changes 2020-10-28 01:23:05 -05:00
Jaime Passos 0f9d85694d Implement an "ignore colormaps" sprite rendering flag 2020-10-27 19:54:50 -03:00
Jaime Passos b03d95c5c6 Bug fixes 2020-10-27 17:02:35 -03:00
Nev3r c62ef355ef Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
 2020-10-27 20:48:25 +01:00
Louis-Antoine e178966367 Remove useless condition 2020-10-27 20:28:54 +01:00
Louis-Antoine 395d1f1b8f Do not pause the client while redownloading the gamestate 2020-10-27 20:23:32 +01:00
Louis-Antoine 804ad44e89 Fix music resetting after reloading the gamestate 2020-10-27 20:22:15 +01:00
Louis-Antoine 5c48b92b2c Fix camera going wild after reloading the gamestate 2020-10-27 20:21:56 +01:00
Jaime Passos b872222b50 Implement blend modes 2020-10-27 00:03:41 -03:00
Louis-Antoine 499bb56436 Only resend the gamestate to one client at a time 2020-10-27 01:22:31 +01:00
Louis-Antoine 7ae53364f2 Add a 15 seconds cooldown between successive gamestate resends 2020-10-27 01:20:05 +01:00
Louis-Antoine 9f5686ef48 Fix underflow in consistancy checking code 2020-10-26 23:15:22 +01:00
James R 18a2e87093 Check maxstep is not disabled before stepping up 
Fixes infinite step up when it should be no step up.
 2020-10-26 14:00:54 -07:00
James R afb8e6e181 Whoops 2020-10-24 20:44:42 -07:00
James R 713b965a85 Merge branch 'playah' into 'next' 
Credits Changes

See merge request STJr/SRB2!1200
 2020-10-24 21:54:40 -04:00
Zolton Auburn 9a0d65a0f1 Update f_finale.c 2020-10-24 20:17:20 -04:00
Zolton Auburn 24596bd8d5 Update f_finale.c 2020-10-24 20:16:21 -04:00
James R 305f58077d Fix objectplace -silent 2020-10-24 15:29:31 -07:00
Hannu Hanhi 244c76250f Use SSE3 in 32-bit x86 binaries 2020-10-25 00:08:24 +03:00
Zippy_Zolton 5d4032fd00 Ghost mobj matches rollangle 2020-10-24 12:38:30 -05:00
Louis-Antoine 50d2c95470 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate 2020-10-24 16:21:44 +02:00
James R e9fce20071 Merge remote-tracking branch 'origin/master' into next 2020-10-23 14:57:13 -07:00
James R 86c38e6d9a Merge branch 'reverse-offsetof-macro' into 'next' 
Turn the lua sector lines hack into a macro

See merge request STJr/SRB2!1187
 2020-10-23 16:44:29 -04:00
James R 687e2d89cc Merge branch 'set-cvars' into 'next' 
Set cvars directly from Lua

See merge request STJr/SRB2!1205
 2020-10-23 16:42:42 -04:00
James R 503e83653e Merge branch 'skip-unused-mobj-hooks' into 'next' 
Only invoke the Lua API for mobj hooks that need it

See merge request STJr/SRB2!1209
 2020-10-23 16:40:07 -04:00
James R fd63b50f44 Merge branch 'insert-wait' into 'next' 
Do not let previous wait commands affect COM_BufInsertText

See merge request STJr/SRB2!1207
 2020-10-23 16:38:46 -04:00
James R 5f772c1850 Merge branch 'fix-ghost-netvar-crash' into 'next' 
Fix G_GhostTicker crashing trying to read netvars as ghost data

See merge request STJr/SRB2!1203
 2020-10-23 16:37:49 -04:00
James R 135d0f91b0 Merge branch 'sw-npo2-span-opt' into 'next' 
NPO2 span function optimization

See merge request STJr/SRB2!1201
 2020-10-23 16:36:18 -04:00
Zolton Auburn 85692ac409 Update info.c 2020-10-23 14:04:02 -04:00
Zippy_Zolton c0571b5fbf g 2020-10-23 01:09:12 -05:00
Zippy_Zolton a4459b6693 Dash state for Tails overlay 2020-10-23 00:47:47 -05:00