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

10425 commits

Author SHA1 Message Date
lachwright 87968c946b Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice 2020-11-24 14:56:22 +11:00
GoldenTails 930b5ea442 Replace credits with original authors 2020-11-23 21:42:33 -06:00
GoldenTails 8fef61aa29 Split dehacked.c into multiple files. 2020-11-23 21:42:26 -06:00
GoldenTails d806655769 Fix a dumb typo of luaL_checklstring i made whoops 2020-11-23 21:20:17 -06:00
Jaime Ita Passos 5bdee63117 Fix a crash 2020-11-23 12:53:59 -03:00
SMS Alfredo fe066b3ef2 ...snickerdoodles 2020-11-23 09:23:02 -06:00
SMS Alfredo ea7e06a616 Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE 2020-11-23 09:21:00 -06:00
SMS Alfredo 7b05ffd92d Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING" 
This reverts commit ad9bf6085f.
 2020-11-23 09:18:05 -06:00
SMS Alfredo 7bbd563b73 Remove unneeded S_PLAY_ROLL check 2020-11-22 23:23:35 -06:00
LJ Sonic 7ff6443659 Fix PlayerCmd not handling angle and aiming correctly 2020-11-23 01:23:34 +01:00
James R 8d71559afe Merge branch 'make-some-lua-globals-rw' into 'next' 
Make several Lua global variables writable.

See merge request STJr/SRB2!1233
 2020-11-22 18:47:53 -05:00
James R 8a30576d81 Merge branch 'plane-sorting-fix-part-3' into 'next' 
Improved sprite sorting against 3d floors

See merge request STJr/SRB2!1235
 2020-11-22 18:31:23 -05:00
James R f39300ac74 Merge branch 'master' into no-dd-make 2020-11-22 15:29:37 -08:00
James R 6d9e036c7f Merge branch 'master' into next 2020-11-22 15:23:12 -08:00
James R b059ed40c6 Merge remote-tracking branch 'origin/what-is-a-standard-2' 2020-11-22 15:19:39 -08:00
James R 40e954779e Resolve one last conflict in splat sorting 
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
 2020-11-22 15:12:34 -08:00
Jaime Ita Passos 5293c52bca Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
James R 54da9552de Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3 2020-11-22 14:41:42 -08:00
James R 30792e7820 Merge branch 'flame-orb' into 'next' 
Flame Shield & Thunder Shield Adjustment (Closes #363)

Closes #363

See merge request STJr/SRB2!1220
 2020-11-22 17:31:23 -05:00
James R 92625483a4 Merge branch 'replay-height-fix' into 'next' 
Made height/spinheight and height change values in replays more accurate

See merge request STJr/SRB2!1241
 2020-11-22 17:25:41 -05:00
James R bec85c033a Merge branch 'replay-camera-update' into 'next' 
Make the replay camera follow the player

See merge request STJr/SRB2!1243
 2020-11-22 17:23:38 -05:00
James R eb28532244 Merge branch 'remove-unused-music-types' into 'next' 
Remove unused music type enums

See merge request STJr/SRB2!1253
 2020-11-22 17:16:35 -05:00
James R 6d6eb79226 Merge branch 'uncap-palettes' into 'next' 
Uncap palette lump palettes & allow flashpal palettes to display during pause

See merge request STJr/SRB2!1255
 2020-11-22 17:16:21 -05:00
James R b2a84a9376 Merge remote-tracking branch 'origin/master' into no-dd-make 2020-11-22 14:14:43 -08:00
Jaime Ita Passos 2e21168395 Free GPU textures when adding a file 2020-11-22 18:23:35 -03:00
Riku Salminen b9fa50f7ef No need to reset tokens twice 2020-11-22 23:23:32 +02:00
Riku Salminen f51be77aa2 Now the fix actually does what the MR says... +lua banks 2020-11-22 23:19:24 +02:00
Jaime Ita Passos 0645c642d2 Improve GPU texture management. 2020-11-22 18:18:26 -03:00
Jaime Ita Passos abe35fd008 Some interface fixes 2020-11-22 17:22:18 -03:00
Jaime Ita Passos 152c540c1e Fix sprite textures in models 2020-11-22 17:10:10 -03:00
Jaime Ita Passos 9ab3acae2d Change how texture deletion works in OpenGL 2020-11-22 17:03:04 -03:00
Jaime Ita Passos 071ec73389 Some fixes for spritestuff2 2020-11-22 03:47:15 -03:00
GoldenTails e3c6d1cef3 Add NOECHOFILENAMES, if people don't want logspam. 2020-11-21 22:21:18 -06:00
James R 79bbb3fe46 Remove Direct Draw from the Makefiles 
MINGW/MINGW64 implies SDL.
 2020-11-21 15:19:54 -08:00
James R 5a8e653cd5 More concise 2020-11-21 13:43:32 -08:00
James R 377a9c10f0 Lua: disallow bitwise not on anything but number values 
This fixes a crash.
 2020-11-21 13:37:45 -08:00
GoldenTails 8cfa21fb20 Echo filenames when compiling without ECHO=1 2020-11-19 15:17:56 -06:00
GoldenTails 55f169f3c9 Move the GIF downscaling menu option up one to create some parity. 2020-11-19 13:45:04 -06:00
GoldenTails 12ac096a95 Add a menu option for aPNG downscaling. 2020-11-19 13:45:04 -06:00
GoldenTails 949c0c181d Add aPNG downscaling, and its associated consvar. 2020-11-19 13:45:04 -06:00
Jaime Ita Passos 389763a550 Update R_DrawFloorSprite_NPO2_8 and R_DrawTranslucentFloorSprite_NPO2_8 to have the lastest NPO2 optimizations 2020-11-19 00:59:37 -03:00
Jaime Ita Passos 5e890ee6f8 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
SMS Alfredo 9163e73092 Allow no spin characters to water skip while spinning 2020-11-18 12:35:40 -06:00
SMS Alfredo 7ad8aa1477 Allow the Forcespin sector type to be used with intangible fofs 
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
 2020-11-18 12:27:09 -06:00
SMS Alfredo 01a03a4daa lmao formatting 2020-11-18 12:03:48 -06:00
SMS Alfredo 09644d69c0 Don't force S_PLAY_SPIN when landing with PF_SPINNING if you have certain PA flags 2020-11-18 12:01:06 -06:00
SMS Alfredo 16fd754a39 Allow forcespin sectors to work on no spin characters 2020-11-18 11:49:17 -06:00
SMS Alfredo ad9bf6085f Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING 2020-11-18 11:28:31 -06:00
James R 85c5fa9527 Merge branch 'unfuck-icon-mac' into 'next' 
Use SDL version of executable icon at runtime on macOS

See merge request STJr/SRB2!1250
 2020-11-17 20:24:42 -05:00
SMS Alfredo fb40a28365 Do deh thing 2020-11-17 11:47:33 -06:00
lachwright 5454068843 Uncap palette lump palettes & allow flashpal palettes to display during pause 2020-11-16 17:37:12 +11:00
lachwright 26b6b33220 Add parentheses 2020-11-15 15:52:55 +11:00
Louis-Antoine b03d2b16ed Delete unneeded check 2020-11-15 01:24:12 +01:00
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
Louis-Antoine 13ba25f4fe Only call the Lua API for overridden actions 2020-11-15 01:15:58 +01:00
James R 33193db146 Remove unused music type enums 2020-11-14 15:56:40 -08:00
Louis-Antoine 7e7de16e6b Fix typo 2020-11-15 00:53:46 +01:00
Louis-Antoine f0fdcfb92b Delete outdated comment 2020-11-15 00:52:51 +01: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
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
Riku Salminen 0a1beab8c8 Reset a couple of other variables while we're at it 2020-11-14 20:17:35 +02:00
Riku Salminen 8814980a06 Emeralds and tokens now reset when restarting marathon mode in first level 2020-11-14 19:18:36 +02:00
lachwright a65fc9f622 Reallow P_MobjSpawn to change the scale of objects spawned from mapthings 2020-11-15 02:53:10 +11:00
lachwright 8f570eaa97 Use SDL version of executable icon at runtime on macOS 2020-11-15 01:13:41 +11:00
Louis-Antoine 01124f2076 Fix Lua stacktrace not showing in various situations 2020-11-13 19:12:25 +01:00
Louis-Antoine de70934552 Add missing lua_pop call 2020-11-13 18:19:13 +01:00
Louis-Antoine 04826d2615 Replace lua_pop(-1) with lua_settop(0) 2020-11-13 15:31:11 +01:00
Nev3r 1a8ec39f6c Remove direct definition for D__USE_MINGW_ANSI_STDIO, as the latest standards consider this to be deprecated. 2020-11-13 11:33:27 +01: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
Riku Salminen 91a34575a7 Declared the cvar in netcmd to get rid of warnings 2020-11-10 13:53:31 +02: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
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
Steel Titanium d26172661d Remove spritedef field 2020-11-08 13:31:59 -05:00
Steel Titanium 83a87042f1 Push skin->sprites as light userdata 2020-11-08 13:25:56 -05: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
Steel Titanium 1320f10839 Allow access to skin.sprites[] 
Only numframes so far though, as there's already a function for what spriteframe provides.
 2020-11-07 23:55:37 -05:00
James R c0dbc562bb Fix floating point math 2020-11-07 13:48:37 -08: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
James R 515d7eeb9e Let's try an experiment: move the epoch forward as I_GetTime is called 
This will make it even longer until time wraps around. Have you ever run a
srb2 server for 4 years straight?
 2020-11-07 01:57:09 -08: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
James R b72789b0c9 Huge perfstats refactor 
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
 2020-11-07 01:32:59 -08:00
James R e5f37523b8 Use precise time for gif timing 2020-11-07 01:32:25 -08:00
James R 84ce53db60 Use high precision timer, replace I_GetTimeMicros with I_GetPreciseTime and I_PreciseToMicros 2020-11-07 01:31:24 -08: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 425b56c288 Remove win32 specific timer 2020-11-06 14:14:12 -08: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 9278f04fbf Delete ban.txt if no bans to save 2020-10-24 15:59:11 -07:00
James R 288ffebea7 Do not save cleared ban list when reloading bans 2020-10-24 15:52:02 -07: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
Louis-Antoine 37c11e0f2e Fix unfortunate typos 2020-10-22 00:08:06 +02:00
Louis-Antoine d349e9bf83 Only invoke the Lua API for mobj hooks that need it 2020-10-21 22:48:00 +02:00
James R ba4b6ec400 Reset wait period for COM_BufInsertText 2020-10-21 12:34:26 -07:00
Louis-Antoine 5091c19abf Kick clients that fail to catch up with server gamelogic 2020-10-21 20:25:29 +02:00
Zippy_Zolton 88c882fa9c 81 2020-10-20 19:59:33 -05:00
James R 39ccd12f04 Add CV_Set, CV_SetValue, CV_StealthSet, CV_StealthSetValue and CV_AddValue to Lua 
CV_SetValue merged with CV_Set (same with CV_StealthSetValue and CV_StealthSet).
 2020-10-20 16:08:34 -07:00
GoldenTails 1e0beab254 Add i_threads.h too 2020-10-20 15:58:34 -05:00
GoldenTails 31c410656c Add multithreading option for CMake 2020-10-20 15:44:01 -05:00
Zippy_Zolton 0f771edfd5 SonicX orange 2020-10-20 15:11:00 -05:00
Zippy_Zolton 03198ab31d SonicX aqua 2020-10-20 14:59:30 -05:00
Zolton Auburn d1f16e0f77 Continue 2020-10-20 15:56:41 -04:00
Zippy_Zolton 45dd26476a SonicX8000 purple, peridot, rosy 2020-10-20 14:52:25 -05:00
Zippy_Zolton b65ac1df30 sonicx azure 2020-10-20 14:40:10 -05:00
Zippy_Zolton 0b48f1052a pencilvoid aqua 2020-10-20 14:03:27 -05:00
Zippy_Zolton 4e985d7145 blue & red really seem like a hassle don't they 2020-10-19 20:36:59 -05:00
Zippy_Zolton 04eae86d0a t 2020-10-19 19:58:50 -05:00
Steel Titanium d6c0e0cf30 Fix G_GhostTicker crashing trying to read netvars as ghost data 
Also fixed possible issue with incorrectly reading the demo pointer due to the wrong type being passed to sizeof in G_ConsGhostTic
 2020-10-19 20:20:08 -04:00
Zippy_Zolton 81c9d2eae9 forgot to send this like 3 hours ago 2020-10-19 18:41:23 -05:00
Jaime Passos dfc85ec21a Include p_local.h 2020-10-19 17:38:02 -03:00
Jaime Passos a21685812f Rename R_DrawVisSplat to R_DrawSplatSprite, move into r_splats.c 2020-10-19 17:36:29 -03:00
Jaime Passos dbc149f85a Remove FLOORSPLATS define 2020-10-19 17:33:16 -03:00
Zippy_Zolton d633f2495a red abd bkyue sikbucx 2020-10-19 14:12:28 -05:00
Zippy_Zolton e5c891932a improvement 2020-10-18 23:47:14 -05:00
Zippy_Zolton fed2fffaa1 better colors 2020-10-18 22:52:40 -05:00
Zippy_Zolton 5dc90289dc thanks goldie 2020-10-18 21:59:34 -05:00
Zippy_Zolton e2d686ba42 update 2020-10-18 17:45:46 -05:00
Zippy_Zolton 2403cbd57b possibly final 2020-10-18 17:01:31 -05:00
Zippy_Zolton 94cee68d41 Calloc 2020-10-18 16:41:14 -05:00
Zippy_Zolton 14aec09d13 possibly fixed 2020-10-18 16:21:06 -05:00
Zippy_Zolton 3b79ca4fae Improved text colormaps 2020-10-18 16:00:01 -05:00
James R 1cd73315f1 Merge branch 'model-fallback' into 'next' 
Model fallback

See merge request STJr/SRB2!1167
 2020-10-18 16:52:42 -04:00
James R 7f65023891 Merge branch 'bustflags' into 'next' 
Bustable Wall and Floor flags.

See merge request STJr/SRB2!1163
 2020-10-18 16:42:15 -04:00
Hannu Hanhi 382ed1c31e Remove leftover commented code from previous commit 2020-10-18 23:04:01 +03:00
James R d279489753 Merge branch 'perfstats' into 'next' 
Performance stats

See merge request STJr/SRB2!1186
 2020-10-18 15:33:20 -04:00
Hannu Hanhi 23e02d17c0 NPO2 span function optimization 2020-10-18 21:27:22 +03:00
Jaime Passos 3ac175660c Don't render sprites with negative xscale or yscale in OpenGL 2020-10-17 22:40:49 -03:00
Zippy_Zolton e8419ea876 Credits Changes 2020-10-17 20:13:29 -05:00
Hannu Hanhi 7941a5fb63 R_FindPlane optimization 2020-10-18 01:27:01 +03:00
Zippy_Zolton f602944efd titlecard 2020-10-17 15:51:22 -05:00
GoldenTails 00f38d41e5 Give the GIF dynamic delay memory to base future delays off of, instead of calculating for the current frame and being jank 2020-10-17 07:10:24 -05:00
James R 4b0725f36f Use FIELDFROM in lua polyobject code 2020-10-15 16:17:51 -07:00
James R 374c19f915 Merge remote-tracking branch 'origin/next' into reverse-offsetof-macro 2020-10-15 16:15:20 -07:00
James R d6b314951e Merge branch 'step-down-ceiling' into 'next' 
Apply step up/down to opposite plane too

See merge request STJr/SRB2!1192
 2020-10-15 19:11:13 -04:00
James R bd9fda8ceb Merge branch 'lua-polyobjects' into 'next' 
Lua polyobjects

Closes #19

See merge request STJr/SRB2!1140
 2020-10-15 19:08:54 -04:00
James R 31977878e1 Merge branch 'raretry-fix' into 'next' 
Make record attack's quick retry more consistent.

Closes #80

See merge request STJr/SRB2!1193
 2020-10-15 19:02:34 -04:00
Jaime Passos 70ada935ec Don't free PU_HWRCACHE and PU_HWRCACHE_UNLOCKED memory tags in HWR_ClearAllTextures. 
Probably fixes a random annoying crash around that function.
(I was also suspecting renderer switching was doing other slightly weird stuff.)
 2020-10-15 14:31:16 -03:00
Jaime Passos 060c25c14d [Software floor sprites] Set the colormap and translation outside of the loop 2020-10-15 14:12:19 -03:00
Jaime Passos bf9ed39ec3 Change vis->transmap statement 2020-10-15 14:05:18 -03:00
Jaime Passos bc3ac7615f Remove unnecessarily duplicated code in R_GetSpriteTranslation 2020-10-15 11:32:21 -03:00
Jaime Passos 8294479a5f Merge branch 'next' into allowshaders 2020-10-15 01:25:11 -03:00
Jaime Passos 4c59f8c615 Fix OpenGL GIF recording crashing with gif_localcolortable disabled 2020-10-15 01:14:16 -03:00
Jaime Passos 50bd8abc78 Fix precipitation 2020-10-15 00:03:32 -03:00
Jaime Passos 3bace37a25 Don't project if rot_y is less than a single fracunit 2020-10-14 21:26:23 -03:00
Jaime Passos bf8bb383ab Simplify the floor splat clipping code a bit 2020-10-14 21:20:37 -03:00
Steel Titanium b19764dc8e Merge branch 'master' into next 2020-10-14 14:58:07 -04:00
Jaime Passos b4294220e5 Fix a crash in R_CalculateSlopeVectors called from R_RenderFloorSplat 2020-10-14 14:08:25 -03:00
Jaime Passos e63efdac13 Only create floor sprite slopes when needed, instead of always allocating them. 
Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
 2020-10-14 13:07:02 -03:00