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

10308 commits

Author SHA1 Message Date
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
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
Zolton Auburn d1f16e0f77 Continue 2020-10-20 15:56:41 -04: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
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
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
sphere a2ff89f007 Make record attack's quick retry more consistent. 2020-10-14 17:39:23 +02:00
James R b35633bb61 brug 2020-10-14 01:19:43 -07:00
James R cce55ccf90 Merge branch 'ffloorclip-2' into 'next' 
Software 3D floor rendering optimization (second attempt)

See merge request STJr/SRB2!1184
 2020-10-14 03:10:44 -04:00
James R f7e9772e10 Merge branch 'i-pity-you' into 'next' 
Allow JumpSpin abilities to be used with non-ability shields

Closes #277

See merge request STJr/SRB2!1146
 2020-10-14 03:08:20 -04:00
Jaime Passos ab526e47cc Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
Jaime Passos a8a66f698a [Software] Use the light at the bottom of the object for splats 2020-10-13 23:14:05 -03:00
James R bc23f582fe Don't need to set this actually 2020-10-13 19:11:18 -07:00
James R 5fca04c3dd Apply step up/down to opposite plane too 2020-10-13 19:04:52 -07:00
Jaime Passos 4b7bfce95e Implement sloped floor sprites 2020-10-13 22:42:07 -03:00
Jaime Passos fccbc00cac Fix the wrong freeing function call being used in Patch_FreeData 2020-10-13 19:18:01 -03:00
Jaime Passos 63e471d902 Correctly return the output patch's size in Picture_PatchConvert 2020-10-13 19:16:25 -03:00
Zippy_Zolton 6fd226eb29 Crosshair fix, no GAMEQUIT 2020-10-13 16:41:39 -05:00
Jaime Passos 0e62cb2ada Fix infinitely long splat spans 2020-10-13 17:03:50 -03:00
Zippy_Zolton 5d699591c7 more!!!!! :3 2020-10-13 14:23:56 -05:00
Jaime Passos 4273896311 Implement relative and absolute sprite offsets for objects (mobjs) 
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
 2020-10-13 12:57:36 -03:00
Zippy_Zolton 45b52e3729 good night 2020-10-13 02:19:20 -05:00
Zippy_Zolton 2ba1017dab More whitelists :D 2020-10-13 02:13:35 -05:00
Jaime Passos 87e5d63723 Improve sorting between sprites and floor sprites 2020-10-13 02:24:18 -03:00
Jaime Passos 95d0097df6 Improve splat sorting: 
Adjust the sort scale of splats
Do splat sorting in R_CreateDrawNodes if either vissprite is a splat, instead of if both are
 2020-10-13 01:45:18 -03:00
Jaime Passos 7dbd34345c Fix splat sorting 2020-10-13 01:09:17 -03:00
Jaime Passos f2aca01e2b Fix other uninitialized variable warnings 2020-10-13 00:14:27 -03:00
Jaime Passos 1ea3bd8fff Fix uninitialized variable warning 2020-10-12 22:08:45 -03:00
Jaime Passos 453f49cb77 Fix floorsprites not being rendered when viewed from the bottom 2020-10-12 22:07:11 -03:00
James R cb8f6097cf Merge branch 'save-netvars' into 'next' 
Save netvars

See merge request STJr/SRB2!1179
 2020-10-12 19:03:01 -04:00
Jaime Passos 831ccccdd6 OpenGL support for splats, fix some shadow draw bugs in Software 2020-10-12 19:53:21 -03:00
James R 58464771a8 Merge branch 'addfile-vararg' into 'next' 
Give the addfile command variable argument support.

See merge request STJr/SRB2!1176
 2020-10-12 18:32:20 -04:00
lachwright 6a73e81227 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
James R d73fbd8616 Merge branch 'slight-shader-cleanup' into 'next' 
Shader code cleanup

See merge request STJr/SRB2!1103
 2020-10-12 18:22:08 -04:00
GoldenTails 87a5e1d30c Futureproof against strict buildbots. 2020-10-12 17:14:32 -05:00
James R d7b8d5d0f3 Merge branch 'penalty-of-death' into 'next' 
I am going to die :D (closes #337)

Closes #337

See merge request STJr/SRB2!1183
 2020-10-12 18:11:09 -04:00
James R 5a5024faf4 Merge branch 'skip-credits-gone-wrong' into 'next' 
Fix clients being able to skip credits AGAIN (closes #339)

Closes #339

See merge request STJr/SRB2!1182
 2020-10-12 18:09:48 -04:00
James R d4bef36c19 Merge branch 'specialstagecheck' into 'next' 
A special stage is a special stage, even outside of coop.

Closes #211

See merge request STJr/SRB2!1180
 2020-10-12 18:08:02 -04:00
James R d1c8d41f94 Merge branch 'no-demo-visit' into 'next' 
Don't count demo playback as visiting a level.

Closes #327 and #340

See merge request STJr/SRB2!1177
 2020-10-12 18:05:43 -04:00
GoldenTails 94f6d0b002 Fix gzip failing to compress SRB2's objdump on non-Windows. 2020-10-12 16:59:47 -05:00
James R 35c666514b Merge branch 'splitscreen-parameter' into 'next' 
Add `-splitscreen` commandline parameter

See merge request STJr/SRB2!1175
 2020-10-12 17:46:55 -04:00
James R 9538ca696a Merge branch 'ceilingz' into 'next' 
Add P_CeilingzAtPos function

See merge request STJr/SRB2!1164
 2020-10-12 17:44:51 -04:00
Jaime Passos b620f4835a Support spritexscale and spriteyscale in OpenGL 
Fix papersprite scaling with spritexscale and spriteyscale in Software
 2020-10-12 17:25:18 -03:00
Zippy_Zolton da27f720da Whitelist the "X" shown in the HUD 2020-10-11 23:22:16 -05:00
Jaime Passos cc97e22e2f Changes to sprite rendering: 
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
 2020-10-12 00:13:22 -03:00
Jaime Passos b808b3ef41 Move calculation of rotated patch dimensions into its own function 
Simplify rotation code when the pivot isn't in the center
 2020-10-11 03:39:31 -03:00
James R 7f8ec74c27 Use the macro in sectorlines_num too 2020-10-10 17:40:01 -07:00
James R 8bc8946be8 Turn the lua sector lines hack into a macro 2020-10-10 16:43:09 -07:00
Jaime Passos 6145442a34 Fix rotated flipped patches 2020-10-10 19:06:29 -03:00
Jaime Passos b2f45986ad Add r_patchrotation.h 2020-10-10 18:53:05 -03:00
Jaime Passos 6e5f71dd45 Refactor patch rotation 2020-10-10 18:43:26 -03:00
Jaime Passos b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
Hannu Hanhi 465693b242 Put newline to end of m_perfstats.h 2020-10-10 22:23:33 +03:00
Hannu Hanhi 4f20a20165 Performance stats 2020-10-10 22:12:34 +03:00
Jaime Passos 06c0932ab4 Only check the tRNS (trans) chunk if the image is still palettized 2020-10-10 14:17:53 -03:00
Jaime Passos 4d847f4223 Compare the PNG's palette with the game's palette instead of assuming they are the same 2020-10-10 14:17:42 -03:00
Jaime Passos 0021a9aeaf Fix bug 2020-10-10 13:37:23 -03:00
Jaime Passos c5a3a61b28 Make 3D floors cull areas below or above them to reduce overdraw (2) 2020-10-10 01:00:39 -03:00
James R 4b5cb8025b Show revert value of cvar with help command 2020-10-09 16:28:03 -07:00
James R b67807dd04 When save/loading config use revert value for netvars if you are not the server 2020-10-09 16:22:17 -07:00
James R f5e4d076b9 Add CV_NETVAR to server affecting cvars 
showjoinaddress
maxplayers
joindelay
rejointimeout
resynchattempts
blamecfail
maxsend
noticedownload
downloadspeed
jointimeout
maxping
pingtimeout
servername
 2020-10-09 15:23:16 -07:00
James R aa102dcea0 Add CV_SAVE to netvars 
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime

tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
 2020-10-09 15:06:09 -07:00
Zippy_Zolton 1c751fdf0f I am going to die :D 2020-10-09 15:42:55 -05:00
James R a17446f905 Oops, go straight to evaluation if not in a netgame 
serverrunning means that you are actually the server.
 2020-10-09 13:16:56 -07:00
sphere 76d16473b9 how did this even happen 2020-10-09 05:55:10 -04:00
Jaime Passos 0811f60b2a Let the server or an admin toggle clients' custom shaders 2020-10-09 02:06:13 -03:00
James R 15008f31a7 Merge branch 'sanity-meter-empty' into 'next' 
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
 2020-10-08 22:02:25 -04:00
James R 7c72eab58b Merge branch 'manifest-stuff' into 'next' 
Provide a default exe manifest

See merge request STJr/SRB2!1174
 2020-10-08 22:01:17 -04:00
James R ddb6823fe5 Merge branch 'fix-theoretical-lua-exposure-crashes' into 'next' 
Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions in Lua.

See merge request STJr/SRB2!1173
 2020-10-08 22:01:02 -04:00
James R 45b9e23895 Merge branch 'ogl-driver-error' into 'next' 
Add error message when the GDI Generic OpenGL renderer is encountered in Windows

See merge request STJr/SRB2!1172
 2020-10-08 22:00:43 -04:00
James R 933381fb8f Merge branch 'expose-modversion-to-lua' into 'next' 
Expose MODVERSION to Lua (because for some reason it wasn't).

See merge request STJr/SRB2!1158
 2020-10-08 21:57:38 -04:00
James R d83a112fc5 Merge branch 'next' into 'next' 
Updated 16 bit momentum values to 32 bit in demos, changed demo version

See merge request STJr/SRB2!1157
 2020-10-08 21:56:30 -04:00
Jaime Passos 63d4c1dffc Merge remote-tracking branch 'origin' into slight-shader-cleanup 2020-10-08 22:45:39 -03:00
James R c3c34c489b Merge branch 'lua-sectorsounds' into 'next' 
Support sectors as sound origins in Lua

See merge request STJr/SRB2!1144
 2020-10-08 21:05:01 -04:00
James R 355cc1a697 Merge branch 'autocomplete-aliases' into 'next' 
Autocomplete aliases in console

See merge request STJr/SRB2!1113
 2020-10-08 20:30:07 -04:00
James R 88b3a3cd2e Merge branch 'v-string-colormap-lua-exposure' into 'next' 
Expose V_GetStringColormap to Lua via v.getStringColormap().

See merge request STJr/SRB2!1111
 2020-10-08 20:28:25 -04:00
James R 95a5bb888a Merge branch 'chain-attraction-homing' into 'next' 
Chain Homing with Attraction Shield

See merge request STJr/SRB2!1109
 2020-10-08 20:19:21 -04:00
sphere b71c75d2ec A special stage is a special stage, even outside of coop. 2020-10-08 18:45:20 +02:00
James R b3d8ed7d43 Revert netvars after leaving a netgame 2020-10-06 23:32:11 -07:00
James R dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Zachary McAlpin 0f3c87a705 Made states unmodifable in CMD building code 2020-10-06 16:54:23 -05:00
Zachary McAlpin e393093e73 Update comment 2020-10-06 16:43:14 -05:00
sphere f210316d8a Only set MV_MP in multiplayer or a netgame. 2020-10-06 19:06:06 +02:00
sphere 48ca58f580 Don't count demo playback as visiting a level. 2020-10-06 16:49:53 +02:00
GoldenTails d5848e78fc Update help message to mention supported file extensions, and change the description to "Load add-ons" 2020-10-06 03:37:23 -05:00
Zachary McAlpin 1681371fbd Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into playercmd-kart-port 2020-10-06 02:07:05 -05:00
GoldenTails 2d3a589167 Add warning when files are skipped due to being previously processed. 2020-10-04 21:03:29 -05:00
GoldenTails 0b74818771 Give the addfile command variable argument support. 2020-10-04 21:02:20 -05:00
gm3k4g 2cc8de2bdd Added splitscreen command line parameter 2020-10-05 00:12:13 +03:00
Steel Titanium 0aa1b16fd1 Provide a default exe manifest 2020-10-03 19:53:59 -04:00
GoldenTails 2ae5c02050 Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions. 2020-10-03 13:24:47 -05:00
Louis-Antoine e49032eaf7 Let Lua scripts access userdata metatables 2020-10-03 18:40:37 +02:00
Hannu Hanhi 684b868524 Add error message when the GDI Generic OpenGL renderer is encountered in Windows 2020-10-03 18:45:56 +03:00
Louis-Antoine 121c7da809 Let Lua scripts relink tables to their metatables when unarchiving 
This is done through the new "registermetatable" function,
in a somewhat similar fashion to "freeslot" but for metatables:
it must be called at script load to tell SRB2 your metatable
can be automatically relinked during the unarchiving process.
 2020-10-03 16:31:04 +02:00
James R 17ce7d57c3 Merge branch 'update-228' into 'next' 
2.2.8 prep

See merge request STJr/SRB2!1170
 2020-10-03 01:45:06 -04:00
James R b1d59c6641 Merge branch 'picfmt-pngfix' into 'next' 
Fix uninitialized variable issue in patches with missing grAb chunks

See merge request STJr/SRB2!1171
 2020-10-02 20:24:10 -04:00
James R 27d96bb21c Merge branch 'fartification' into 'next' 
Prevent Canarivore gas from teleporting up walls

See merge request STJr/SRB2!1154
 2020-10-02 20:23:36 -04:00
James R 8beee3761e Merge branch 'windows-console-go-brrr' into 'next' 
Fix #178

Closes #178

See merge request STJr/SRB2!1112
 2020-10-02 20:23:20 -04:00
James R c35c5ad568 Merge branch 'remove-renderer-notice' into 'next' 
Remove "The OpenGL renderer is incomplete" notice (closes #281)

Closes #281

See merge request STJr/SRB2!1169
 2020-10-02 20:22:38 -04:00
Jaime Passos ebf50aad44 Use leftoffset and topoffset, not loffs and toffs 2020-10-02 20:40:42 -03:00
James R 401508e9d4 Update Srb2win.rc 2020-10-02 16:11:39 -07:00
James R c51a4c8fb1 Update version to 2.2.8 2020-10-02 16:10:21 -07:00
James R 1c6c51744c Update patch.pk3 2020-10-02 16:07:15 -07:00
Jaime Passos aaa9cff6ac Fix PNG issue in OpenGL + optimize PNG sprite loading 2020-10-02 19:48:13 -03:00
James R be4c5751f8 Revert "Warn when going to OpenGL from the menu" 
This reverts commit 569453ee93.

And one line from b6089ccdaf.
 2020-10-02 15:37:23 -07:00
Steel Titanium 386db4b7a1 Model fallback 2020-10-02 15:45:43 -04:00
James R 8a8e0ceda2 Move HU_LoadGraphics after startuppwads are loaded 
This is needed for graphics replacements to take effect.
 2020-10-02 11:54:58 -07:00
James R 61cae79bd4 Fix off by one 2020-10-01 16:55:17 -07:00
James R 1cfb1f673b Add wads from the -file parameter after netvars are registered 
This is so netvars registered by any lua scripts will load in the correct order.
 2020-10-01 16:50:31 -07:00
sphere a9a0137d22 Remove "RC3" 2020-09-30 20:25:55 +02:00
sphere d45d5b4e20 Merge branch 'credits-changes' into 'next' 
Credits changes

See merge request STJr/SRB2!1161
 2020-09-30 13:25:39 -04:00
lachwright e715b2f01a Update ICNS icon for macOS 
Replaced some of the lower resolution variants with some smoother downscales. The 16x16 one is even Sonic's 1-up icon from the game!
 2020-10-01 02:47:24 +10:00
Snu bfd8bd7564 comment typo 2020-09-30 08:44:43 +01:00
Snu 8a00b47b38 Make the function ACTUALLY work 2020-09-30 08:40:21 +01:00
Snu 82ceddb2be god damnit 2020-09-30 08:10:28 +01:00
Snu feb011ee52 Expose function to Lua 2020-09-30 07:58:41 +01:00
Snu ca88db00cd Create P_CeilingzAtPos function 2020-09-30 07:56:57 +01:00
Snu afcadb3232 Remove all instances of PF_CANBUSTFLOORS 2020-09-29 20:16:06 +01:00
sphere 2642df4c98 Fix Arrietty's name being misspelled. 2020-09-29 18:06:50 +02:00
sphere 2ebe731bd4 Game design is a team effort. 2020-09-29 17:23:44 +02:00
Snu cd4f755e53 Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively. 2020-09-29 13:52:35 +01:00
Snu 75042d781f Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls. 2020-09-29 13:47:48 +01:00
Snu 90fbb752fa Add functionality to PF_CANBREAKFLOORS 2020-09-29 12:58:36 +01:00