Commit graph

13362 commits

Author SHA1 Message Date
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
46bd7344c5 Rename 'sector.extracolormap' to just 'sector.colormap' 2023-11-23 13:39:24 -03:00
Lactozilla
563ce141ce Fix P_GetSectorColormapAt 2023-11-23 13:38:36 -03:00
Lactozilla
0a3f2ec4f8 Merge remote-tracking branch 'stjr/next' into lua-extracolormap 2023-11-23 13:38:31 -03:00
Gustaf Alhäll
3c921044a3
Fix Windows build 2023-11-22 20:26:55 +01:00
Gustaf Alhäll
977cd0db24
Fix LAN discovery for SRB2 servers 2023-11-22 20:17:44 +01:00
Lactozilla
fddcb5cfdc Fix P_GetSectorColormapAt 2023-11-21 21:15:09 -03:00
Lactozilla
0763bc1117 Merge remote-tracking branch 'stjr/next' into lua-colorlib 2023-11-21 21:13:08 -03:00
Lactozilla
6c1b9b8678 Make translation field return the name of the translation 2023-11-21 16:46:32 -03:00
Lactozilla
803fe613d2 Fix possible overflow in PaletteRemap_AddDesaturation 2023-11-21 16:26:01 -03:00
Lactozilla
f3ee20dde0 Merge remote-tracking branch 'stjr/next' into translations 2023-11-21 12:09:48 -03:00
Gustaf Alhäll
e6dfeace84
Fix anisotropic and FOV settings not saving 2023-11-19 13:27:48 +01:00
Gustaf Alhäll
fa050cdebf
Redesign search mechanism 2023-11-18 20:44:26 +01:00
Gustaf Alhäll
13aed6ad25
Add apropos console command 2023-11-18 14:44:59 +01:00
LJ Sonic
8cc7a88c5f Make module music volume more accurate 2023-11-16 22:00:23 +01:00
Zwip-Zwap Zapony
db9b26c876 Use INT32_MAX 2023-11-16 20:36:08 +00:00
Gustaf Alhäll
6a6b65ddc4
Optimize Z position functions on sloped sectors 2023-11-16 21:03:06 +01:00
Krabs
7962b243de Merge branch 'interpolate-captions' into 'next'
Interpolate captions, Untie captions from resolution

See merge request STJr/SRB2!1930
2023-11-14 04:47:50 +00:00
Krabs
e327b5fdf2 Merge branch 'quake-fix' into 'next'
Implement epicenter and radius support for quakes.

See merge request STJr/SRB2!1797
2023-11-14 04:22:45 +00:00
Krabs
177bdd6868 Merge branch 'platformpmomz' into 'next'
Do not apply pmomz when jumping/bouncing through a platform

Closes #72

See merge request STJr/SRB2!1955
2023-11-14 04:02:39 +00:00
Gustaf Alhäll
2450a0df70
Do not send disconnected players' statuses to the MS 2023-11-11 19:09:39 +01:00
Gustaf Alhäll
c6cd14c156
Allow specifying interface for IPv6 addresses 2023-11-11 14:12:51 +01:00
Alam Ed Arias
2062553d22 Update i_system.c
Add a check for overflowing the TERIOS buffer
2023-11-09 20:21:04 -05:00
SMS Alfredo
7c986c6d29 Make sure bot has CA_FLY or CA2_SPINDASH for their behaviors 2023-11-09 17:01:27 -06:00
Krabs
55444cf204 Update version num (no, .14 isn't releasing yet) 2023-11-09 10:31:03 -05:00
Lactozilla
879ac8dcd5 Merge remote-tracking branch 'stjr/next' into translations 2023-11-06 22:58:25 -03:00
Gustaf Alhäll
b10b9c35ed
Add support for multiple admin passwords 2023-11-06 19:09:43 +01:00
SMS Alfredo
c2c157603b Merge branch 'next' into 'setflip'
# Conflicts:
#   src/p_local.h
2023-11-06 00:47:51 +00:00
Gustaf Alhäll
4cf1d7fe10
Cache and reuse removed mobjs when spawning mobjs 2023-11-05 13:52:23 +01:00
Gustaf Alhäll
5deee87bd2
Fix keyhandler menus not blocking in-game movement 2023-11-04 19:12:23 +01:00
Krabs
5fc7a5c2da Merge branch 'add-auto-kick-idle-players' into 'next'
Add auto-kick for inactive players

See merge request STJr/SRB2!2148
2023-11-04 16:34:46 +00:00
Krabs
7b1939c346 Merge branch 'lua-input-improvements' into 'next'
A few Lua input improvements

See merge request STJr/SRB2!2185
2023-11-04 16:02:09 +00:00
Gustaf Alhäll
5d18822142
Improve file search performance on Linux and FreeBSD 2023-11-04 14:21:17 +01:00
Gustaf Alhäll
80475adabf
Always apply -fwrapv on builds 2023-11-04 11:48:20 +01:00
Alam Ed Arias
9b60fd824a Merge branch 'pickedchar-fix' into 'next'
Fix #1126 and #1127

Closes #1127 and #1126

See merge request STJr/SRB2!2189
2023-11-02 23:53:45 +00:00
Zwip-Zwap Zapony
7e8c0d87a2 Return freeslot name instead of MT_FREESLOT (thanks Zwip-Zwap_Zapony) 2023-11-02 21:21:05 +00:00
Gustaf Alhäll
6d650728f6
Update CMake and XCode build systems 2023-11-02 21:58:36 +01:00
Lactozilla
075dab924c Handle edge case where the callback returns false while registering a variable 2023-11-01 16:16:59 -03:00
Lactozilla
01922d94f1 Add can_change for console variables 2023-11-01 15:50:59 -03:00
Gustaf Alhäll
ede41c474b
Pass -fwrapv to GCC compilation flags 2023-11-01 18:30:37 +01:00
Krabs
39ca3a0582 Merge branch SRB2:next into expos-sky 2023-11-01 17:26:59 +00:00
Gustaf Alhäll
7e7ff84f08
Fix buffer overflow when tag bits are set 2023-11-01 18:22:39 +01:00
Gustaf Alhäll
9013ceeacc
Fix buffer overflow when when fetching typenames on freeslots 2023-11-01 17:31:17 +01:00
Krabs
7fd3c0612a Merge branch SRB2:next into expos-dust 2023-11-01 16:29:58 +00:00
Krabs
d1a6290a69 Merge branch SRB2:next into expos-follow 2023-11-01 16:10:49 +00:00
Krabs
c74163b313 Merge branch SRB2:next into expos-special 2023-11-01 15:34:09 +00:00
Krabs
8a1ebf2f7c Merge branch SRB2:next into expos-dust 2023-11-01 14:31:42 +00:00
Krabs
44c11cccbf Merge branch SRB2:next into expos-follow 2023-11-01 14:19:45 +00:00
Krabs
23b0f67900 Merge branch SRB2:next into expos-special 2023-11-01 14:18:25 +00:00
Krabs
e2a0d742ed Merge branch SRB2:next into expos-sky 2023-11-01 14:16:07 +00:00
Krabs
23666ce64e Merge branch SRB2:next into expos-local 2023-11-01 14:15:43 +00:00
Krabs
93c5b34ac0 Merge branch SRB2:next into expos-sphere 2023-11-01 14:14:16 +00:00
Lactozilla
d6b92de691 Revert these 2023-10-31 16:52:12 -03:00
Lactozilla
e9637322f9 Simplify fix
pickedchar doesn't need to be set in these two places, since G_DeferedInitNew already does that.
2023-10-31 16:45:47 -03:00
Lactozilla
62f3454268 Reduce code duplication 2023-10-31 16:26:51 -03:00
Lactozilla
b65d8d1010 Update copyrights 2023-10-31 15:52:10 -03:00
Lactozilla
19f2535403 OpenGL: Ensure linked objects inherit translation in certain situations 2023-10-31 15:50:25 -03:00
Lactozilla
db47eb512c Fix objects that don't have a color not being translated 2023-10-31 15:42:24 -03:00
Lactozilla
61673fe615 Add built-in translations 'AllWhite', 'AllBlack', and 'DashMode' 2023-10-31 15:30:20 -03:00
Zwip-Zwap Zapony
8cf6e8252c Interpolate captions 2023-10-31 13:30:16 +01:00
Zwip-Zwap Zapony
c2aa6d4c74 Fix captions being over-affected by GUI scale
Captions' pop-in animation now starts 8 GUI pixels above the resting position, instead of (2 x GUI scale) GUI above it
2023-10-31 13:14:36 +01:00
Zwip-Zwap Zapony
36e20ac619 Tiny caption loop optimisation 2023-10-31 13:10:39 +01:00
Lactozilla
4e446d22d6 Fix pickedchar not being set when it should have been 2023-10-31 04:04:01 -03:00
Lactozilla
2064c220a0 Fix warnings 2023-10-31 03:44:20 -03:00
Krabs
4e9915e1ba Merge branch SRB2:next into bind-multi-arg 2023-10-31 04:46:53 +00:00
Alam Ed Arias
419925036b Merge remote-tracking branch 'origin/next' into lua-minmax-plus-bruh-moments 2023-10-30 22:44:44 -04:00
Lactozilla
55a6f0c394 Fix parsing of TRANSLATION_ 2023-10-30 20:57:54 -03:00
Lactozilla
0731272fab Add A_SetTranslation and load TRNSLATE before SOC and Lua scripts 2023-10-30 20:52:28 -03:00
Lactozilla
d479917bb7 Update comment 2023-10-30 17:49:46 -03:00
Lactozilla
4545f954e7 Add translations[] to Lua 2023-10-30 17:45:29 -03:00
Lactozilla
799bbe62ee Copy translation in P_SpawnGhostMobj 2023-10-30 15:12:09 -03:00
Monster Iestyn
165a925220 Merge branch SRB2:next into expose-thrust-funcs-to-lua 2023-10-30 18:10:21 +00:00
Lactozilla
9dbf30e20d Refactor tokenizer 2023-10-30 14:54:32 -03:00
Lactozilla
dcae99a9fb Add 'Grayscale' translation 2023-10-30 14:08:23 -03:00
Krabs
d6a0006b75 Merge branch 'combine-dupx-and-dupy' into 'next'
Combine vid.dupx and vid.dupy

See merge request STJr/SRB2!1118
2023-10-30 04:38:52 +00:00
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00:00
Lactozilla
743926e61e Make static 2023-10-29 23:42:50 -03:00
Lactozilla
6de7fc3223 Add 'translation' object property 2023-10-29 23:34:18 -03:00
Lactozilla
4f873d5f8f WIP ZDoom translations 2023-10-29 20:33:49 -03:00
Logan Arias
2dcf845c7c Merge branch SRB2:next into blue-spring-balls 2023-10-29 18:23:50 +00:00
katsy
340d515754 Fix for "Leader of the Chaotix" name change bug (credit Zwip Zwap Zapony) 2023-10-29 17:43:40 +00:00
Monster Iestyn
512839453b Merge branch 'fix-opengl-saturation' into 'next'
Fix saturation not being applied on colormaps in OpenGL

Closes #920

See merge request STJr/SRB2!2151
2023-10-29 16:37:35 +00:00
Alam Ed Arias
51c3dd3ff5 Merge branch 'master' into constants-global 2023-10-28 23:19:52 -04:00
Alam Ed Arias
97e449bd59 Merge branch 'master' into lua-minmax-plus-bruh-moments 2023-10-28 22:29:19 -04:00
Alam Ed Arias
0c49144c72 Merge branch 'master' into udmf-texture-scaling 2023-10-28 21:35:35 -04:00
Alam Ed Arias
bdc4512565 Merge branch 'master' into quake-fix 2023-10-28 21:02:44 -04:00
Alam Ed Arias
4398d3e104 Merge branch 'master' into ogl-wireframe 2023-10-28 20:43:08 -04:00
Alam Ed Arias
a2e288a4dc Merge branch 'master' into fix-segfault-removemobj-spawn 2023-10-28 20:40:07 -04:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
Alam Ed Arias
c440788c92 Merge branch 'next' into menu-unresponsiveness-fix 2023-10-28 16:45:33 -04:00
Alam Ed Arias
b26cf5248f Merge branch 'master' into next 2023-10-28 16:42:54 -04:00
Gustaf Alhäll
e92787e75f
Fix Windows build 2023-10-28 15:44:45 +02:00
LJ Sonic
8608ded317 Add deprecation TODOs 2023-10-28 15:19:35 +02:00
LJ Sonic
c0146744b7 Normalise 2.3-related TODO comments 2023-10-28 14:46:10 +02:00
Gustaf Alhäll
e264caffe3
Fix dangling pointer in mapthing after removing mobj 2023-10-28 14:42:02 +02:00
LJ Sonic
c3f79a112f Add LUA_SetCFunctionField 2023-10-28 11:06:30 +02:00
LJ Sonic
d1dbdee016 Refactor global userdata registration 2023-10-28 00:24:04 +02:00
LJ Sonic
7a7d4f832a Remove stupid whitespace 2023-10-27 21:34:53 +02:00
LJ Sonic
bc9a378521 Refactor userdata metatable registration 2023-10-27 20:17:27 +02:00
LJ Sonic
4fa4d6e076 Implement input.ignoregameinputs 2023-10-27 17:34:29 +02:00
LJ Sonic
23268bf3e5 Move input-related Lua variables into the library 2023-10-27 16:29:47 +02:00
Gustaf Alhäll
b98d9dfe52
Use nanosleep for I_SleepDuration on *nix 2023-10-26 23:43:07 +02:00
Alam Ed Arias
6613886198 Update v_video.c
Killed `unused variable` warning
2023-10-26 18:36:43 +00:00
Alam Ed Arias
13055a1ae4 Update filesrch.c
Check if S_ISLNK is defined, if not, skip symlink code
2023-10-26 13:15:36 +00:00
Alam Ed Arias
b404c965a6 Update lua_hooklib.c
You need to "void" the functions
2023-10-26 09:47:50 +00:00
Alam Ed Arias
5693dcad44 Merge branch SRB2:next into loadfile 2023-10-25 19:50:55 +00:00
Alam Ed Arias
2b7e38726e Merge branch SRB2:next into bind-multi-arg 2023-10-25 19:50:36 +00:00
Alam Ed Arias
3ef47897e3 Merge branch SRB2:next into expose-thrust-funcs-to-lua 2023-10-25 19:42:15 +00:00
Alam Ed Arias
f5859c3480 Merge branch SRB2:next into blue-spring-balls 2023-10-25 19:41:36 +00:00
Alam Ed Arias
d0cb7707e3 Merge branch SRB2:next into thokking-hell 2023-10-25 19:40:02 +00:00
Alam Ed Arias
f3ad50e654 Merge branch SRB2:next into drawfill-transparency 2023-10-25 19:24:23 +00:00
Alam Ed Arias
277b64f290 Merge branch 'next' into bustablemobjzfix 2023-10-25 15:08:22 -04:00
Alam Ed Arias
26f978a905 Merge branch 'next' into platformpmomz 2023-10-25 15:07:49 -04:00
Alam Ed Arias
f2fa2505cd Merge branch SRB2:next into native-keyboard-layout-support 2023-10-25 19:05:06 +00:00
Alam Ed Arias
43e8e42e09 Merge branch SRB2:next into static-void-drawstaticbox 2023-10-25 19:04:49 +00:00
Alam Ed Arias
45a1b6be18 Merge branch SRB2:next into expos-sphere 2023-10-25 19:02:14 +00:00
Alam Ed Arias
ebd355e563 Merge branch SRB2:next into expos-local 2023-10-25 18:57:35 +00:00
Alam Ed Arias
15d476e3e6 Merge branch SRB2:next into expos-dust 2023-10-25 18:55:40 +00:00
Alam Ed Arias
b3ba4210d9 Merge branch SRB2:next into expos-sky 2023-10-25 18:55:00 +00:00
Alam Ed Arias
38a8eeb80c Merge branch SRB2:next into expos-camreset 2023-10-25 18:34:38 +00:00
Alam Ed Arias
bc2f2b8d2a Merge branch SRB2:next into expos-follow 2023-10-25 18:34:25 +00:00
Alam Ed Arias
79aaf3e613 Merge branch SRB2:next into perfstats-thinkframes 2023-10-25 18:34:06 +00:00
Alam Ed Arias
b75a09bfcf Merge branch SRB2:next into expos-special 2023-10-25 18:31:51 +00:00
Alam Ed Arias
e368f95f3a Merge branch SRB2:next into custom-2.2.10 2023-10-25 18:31:28 +00:00
Alam Ed Arias
3f29140ecb Merge branch SRB2:next into fix-segfault-polyvertex-null 2023-10-25 18:21:13 +00:00
Alam Ed Arias
e3250b460d Merge branch SRB2:next into devmode-hudlines 2023-10-25 18:19:01 +00:00
Alam Ed Arias
9b1374359b Merge branch SRB2:next into interpolate-shield-spawning 2023-10-25 18:12:55 +00:00
Alam Ed Arias
0fb1c64338 Merge branch 'next' into sector-portals 2023-10-25 14:11:58 -04:00
Alam Ed Arias
1590f2a6f8 Merge branch 'master' into fix-sprite-clip-warning 2023-10-25 14:10:47 -04:00
Alam Ed Arias
47833469d1 Merge branch SRB2:next into pandoradev 2023-10-25 18:08:33 +00:00
Alam Ed Arias
774cce8f28 Merge branch SRB2:next into blockedexposed 2023-10-25 18:07:18 +00:00
Alam Ed Arias
e5d16e7112 Merge branch SRB2:next into setflip 2023-10-25 18:05:24 +00:00
Alam Ed Arias
59fc021d97 Merge branch 'next' into renderhitbox-nightsitems 2023-10-25 14:03:23 -04:00
Alam Ed Arias
67b6172f82 Merge branch SRB2:next into pit-savior 2023-10-25 18:01:12 +00:00
Alam Ed Arias
fd41bf188d sidenum[0] is an uint32_t, not uint16_t 2023-10-25 12:16:10 -04:00
Alam Ed Arias
ec1b629609 spriteframe_t only gave 1D array, not 2D for rotated 2023-10-25 08:00:04 -04:00
Alam Ed Arias
229d0364d4 Fixed lookup sides for 32-bit systems 2023-10-25 07:40:55 -04:00
Alam Ed Arias
316cbab3a6 Merge branch 'lua-extracolormap' into lua-colorlib 2023-10-25 07:31:03 -04:00
Alam Ed Arias
9d650b0ddc Makefile: add lua_colorlib.c 2023-10-25 07:27:35 -04:00
Alam Ed Arias
dea519637a Merge branch 'next' into lua-extracolormap 2023-10-23 14:49:44 -04:00
Alam Ed Arias
befd9596df Merge branch 'next' into lua-colorlib 2023-10-23 14:49:26 -04:00
Alam Ed Arias
955d54e11e Merge branch 'next' into mapcommand 2023-10-23 14:49:02 -04:00
Alam Ed Arias
b9dddfbb23 Merge branch 'next' into raise-side-limits 2023-10-23 14:47:25 -04:00
Alam Ed Arias
bd9aa75f8a Merge branch 'next' into kill-hud-feetoffset 2023-10-23 14:45:49 -04:00
Alam Ed Arias
ffbe5dba15 Merge branch 'next' into fix-ungrabbed-keydown 2023-10-23 14:44:34 -04:00
Alam Ed Arias
5a12d65150 Merge branch SRB2:next into fix-opengl-saturation 2023-10-23 18:37:40 +00:00
Alam Ed Arias
a4dc67cba7 Merge branch SRB2:next into fix-opengl-saturation-console 2023-10-23 18:36:50 +00:00
Alam Ed Arias
1e1298b182 Merge branch SRB2:next into theyseemerollingtheybraking 2023-10-23 18:33:47 +00:00
Alam Ed Arias
41fbfda870 Merge branch SRB2:next into fix-line-415-buffer-overflow 2023-10-23 18:32:41 +00:00
Alam Ed Arias
52a295d6f7 Merge branch SRB2:next into add-auto-kick-idle-players 2023-10-23 18:29:59 +00:00
Alam Ed Arias
d1fb9e191a Merge branch SRB2:next into configurable-spam-protection 2023-10-23 18:29:32 +00:00
Alam Ed Arias
41dc39630e Merge branch SRB2:next into exitfix 2023-10-23 18:26:53 +00:00
Alam Ed Arias
80a227d719 Merge branch SRB2:next into fix-pointtodist-negative-abs 2023-10-22 23:22:51 +00:00
Logan Arias
ae783f0129 Merge branch 'tb-nonet' into 'master'
Disable libcurl when building without network support

See merge request STJr/SRB2!2182
2023-10-22 16:21:37 +00:00
Logan Arias
6fac101cbe Disable libcurl when building without network support 2023-10-22 11:49:23 -04:00
Alam Ed Arias
a68440c4db Merge branch 'master' into next 2023-10-22 11:14:13 -04:00
Alam Ed Arias
610fd76edb dummy: fixup warnings 2023-10-22 11:09:58 -04:00
Gustaf Alhäll
b544c4202a
Fix FreeBSD build errors (again) 2023-10-20 17:37:32 +02:00
LJ Sonic
9f116c7c9e Fix mouse events not being fired when the mouse is ungrabbed 2023-10-18 16:50:06 +02:00
Alam Ed Arias
33f6deb7f0 Update sc/netcode/commands.c
'i' variable is set but unused in Ban_Load_File()
2023-10-15 23:57:00 -04:00
Alam Ed Arias
a60ac0508f Merge remote-tracking branch 'origin/next' into gitlabcirunnertest 2023-10-15 21:43:35 -04:00
Alam Ed Arias
2865873e70 Update src/lua_baselib.c
No need of counting bots.
2023-10-15 20:35:33 -04:00
Alam Ed Arias
de4a8a193b Update src/d_clisrv.c
Remove unused i var in Ban_Load_File()
2023-10-15 20:35:33 -04:00
Alam Ed Arias
6a37b3c0c6 Update src/hardware/mw_model.c
Restore old code in GeneratePolygonNormals(), add TODO
2023-10-15 20:35:33 -04:00
Alam Ed Arias
1372b60db9 Update src/hardware/mw_md2.c
there are 2 more name buffers that need to be bigger
2023-10-15 16:00:25 -04:00
Alam Ed Arias
b6aaf582d1 Update src/hardware/mw_md2.c
fscanf need 26 chars in the name buffer
2023-10-15 15:29:51 -04:00
Alam Ed Arias
bc852fa099 remove unused variables that was only set 2023-10-15 14:34:53 -04:00
Alam Ed Arias
aaebcc6ce1 Update src/hardware/hw_batching.c
fix misleading indentation
2023-10-15 14:24:20 -04:00
Alam Ed Arias
35f57882e4 signalhandlers are function of NORETURN 2023-10-15 14:16:13 -04:00
Gustaf Alhäll
80e386b16f
Expose lastinputtime to Lua 2023-10-14 21:50:59 +02:00
Alam Ed Arias
806c8f259c Update src/Makefile.d/detect.mk
Support Mingw64 toolchain versions
2023-10-14 08:23:03 -04:00
Alam Ed Arias
8533955da8 Update src/p_map.c
it seems line_t have pointers, clear all of it
2023-10-13 22:52:43 -04:00
Alam Ed Arias
8f00667abe Update src/Makefile.d/*.mk
both Makefile and *.mk should be in the same EOL
2023-10-13 20:18:37 -04:00
Alam Ed Arias
1bf78686e2 let not pass a point of a temp stack var around 2023-10-13 19:33:31 -04:00
Alam Ed Arias
af020810bf fix compiling for GCC 11+ 2023-10-13 17:02:33 -04:00
Alam Ed Arias
a6038dd6f2 Update detect.mk
Add support for GCC 13.2
2023-10-13 19:49:43 +00:00
Alam Ed Arias
dfe1810580 Revert "Undo src/Makefile"
This reverts commit 4f116673f3.
2023-10-12 22:30:26 -04:00
Alam Ed Arias
4f116673f3 Undo src/Makefile
Let see, revert OBJCOPY,OBJDUMP and WINDRES statements
2023-10-12 22:26:43 -04:00
Alam Ed Arias
4e2324216d Makefile
Also allow overwrite of OBJCOPY, OBJDUMP and WINDRES
2023-10-12 19:43:09 -04:00
spherallic
4fc5c9af34 Simplify single-character checks 2023-10-10 16:36:52 +02:00
spherallic
d2996a308c Add shortcuts for current/next map to map command 2023-10-07 00:55:29 +02:00
Gustaf Alhäll
436de21808
Refactor code after review comments 2023-10-07 00:07:56 +02:00
sphere
9925e96365 Merge branch 'if-range-demoversion' into 'next'
Use if-range checks instead of switch for demo versions

See merge request STJr/SRB2!2164
2023-10-06 13:19:48 +00:00
SMS Alfredo
290fc9f81f Restore Ringslinger Collectable Behavior 2023-10-05 12:04:46 -05:00
SMS Alfredo
7632113d57 Oops Whitespace 2023-10-05 11:50:17 -05:00
SMS Alfredo
01491a4d31 Undo Unintentional Changes 2023-10-05 11:36:19 -05:00
SMS Alfredo
c3640c5aa9 Merge branch 'next' into pit-savior 2023-10-05 11:30:02 -05:00
spherallic
733dabe9a0 Coins? 2023-10-02 23:31:21 +02:00
Gustaf Alhäll
12d595399e
Avoid branch prediction slowdowns in R_PointOnSide 2023-10-01 17:34:13 +02:00
Zwip-Zwap Zapony
fb9e6c9c6d Use if-range instead of switch for demo versions 2023-09-22 18:16:54 +02:00
Monster Iestyn
340eee8691 Added some notes related to FEETADJUST for reference, made another tweak 2023-09-21 16:13:55 +01:00
Monster Iestyn
ee0bab2941 Remove adjustfeet parameter from Patch_GetRotatedSprite, remove [2] from spriteframe_t's rotated array.
Following from my previous commit, these things are no longer needed: they existed ONLY for adding FEETADJUST offsets to rotated sprites in Lua HUD code.
2023-09-21 15:50:30 +01:00
Monster Iestyn
5e501bae07 v.getSpritePatch/v.getSprite2Patch fix: Fix offset inconsistency between rotated sprites and non-rotated sprites
This was caused by rotated sprites having FEETADJUST offsets applied, when non-rotated sprites did not. FEETADJUST is not actually needed in the HUD, so I've removed it from the rotated sprites (thankfully this is also the easiest way to fix it too)
2023-09-21 13:19:38 +01:00
Lactozilla
8fd9a82a19 Raise sidedef limits
Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 02:06:06 -03:00
sphere
a373d96d07 Merge branch 'fix-overflow-scrolling-background' into 'next'
Fix buffer overflow when displaying a scrolling background

See merge request STJr/SRB2!2010
2023-09-20 16:10:56 +00:00
sphere
1c4419ee56 Merge branch 'fix-minecart-debug-build' into 'next'
Fix memory leak when other players are riding a minecart

See merge request STJr/SRB2!2146
2023-09-20 15:26:41 +00:00
spherallic
05926ceec8 Group NiGHTS star/chip hitboxes with rings 2023-09-20 15:42:19 +02:00
SMS Alfredo
ab8aa245d6 Add the Other PlayersForExit Conditions 2023-09-19 17:30:46 -05:00
SMS Alfredo
71b0f002c9 Only Consider ExitLevel a Cheat When Used to Cheat 2023-09-19 17:17:00 -05:00
Gustaf Alhäll
a8fe500d0e
Add auto-kick for inactive players 2023-09-19 19:05:43 +02:00
SMS Alfredo
ecf950e749 Add "allowflip" Parameter to P_DoJump 2023-09-19 11:54:51 -05:00
Zwip-Zwap Zapony
cfedee9dc9 Fix CMake compiling 2023-09-19 18:46:05 +02:00
Lactozilla
68e25737c0 Fix minor spelling mistake 2023-09-18 18:51:11 -03:00
LJ Sonic
2a896538d9 Merge branch 'netcode-rerefactor' into 'next'
Re-delete netcode

See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
Gustaf Alhäll
fc20508295
Fix saturation not being applied on colormaps in OpenGL 2023-09-18 18:16:10 +02:00
SMS Alfredo
a977fd6075 Expose P_LineIsBlocking 2023-09-17 18:45:57 -05:00
Gustaf Alhäll
b53b2df7ee
Fix saturation option not being applied on OpenGL 2023-09-17 22:48:26 +02:00
LJ Sonic
8f1618018e Fix free 2023-09-15 19:12:55 +02:00
SMS Alfredo
cca83fe9e9 Merge branch 'next' into pit-savior 2023-09-14 16:07:41 -05:00
SMS Alfredo
62525d34f1 Merge branch 'next' into pandoradev 2023-09-14 16:05:55 -05:00
Gustaf Alhäll
65547ae036
Fix memory leak when other players are riding a minecart 2023-09-14 18:31:05 +02:00
sphere
f02fd19c5a Merge branch 'team-gametype-keep-player-color' into 'next'
Respect the player's skin and color selection

See merge request STJr/SRB2!2100
2023-09-13 07:59:00 +00:00
Alam Ed Arias
6caff62662 Merge remote-tracking branch 'origin/master' into next 2023-09-12 19:40:54 -04:00
Alam Ed Arias
8558d123ee SDL: add version check for SDL_OPenURL() 2023-09-12 19:32:47 -04:00
Lactozilla
ebca345a44 Check if in a game 2023-09-12 19:32:15 -03:00
Lactozilla
69df136e2b Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color 2023-09-12 19:17:07 -03:00
sphere
0f5e80a122 Merge branch 'warpwithoutmapheaderfix' into 'next'
Fix "-warp"ing to a level without a map header crashing the game

Closes #1105

See merge request STJr/SRB2!2143
2023-09-12 20:13:46 +00:00
LJ Sonic
06d4d71b41 Fix missing includes for Linux platforms 2023-09-12 19:52:24 +02:00
Zwip-Zwap Zapony
4f6da8dc0f Fix a "maybe-uninitialized" compiler warning 2023-09-10 16:19:39 +02:00
Lactozilla
5306d2b474 Merge branch 'next' into sector-portals 2023-09-09 22:28:01 -03:00
Logan Arias
02c4720703 Merge branch 'circleci' into 'master'
CircleCi: update buildbot

See merge request STJr/SRB2!2144
2023-09-09 20:53:31 +00:00
Alam Ed Arias
64eb1b0bff backtrace: do not care for junk var 2023-09-09 16:21:04 -04:00
Alam Ed Arias
05223fbc6d backtrace: store result of write() in a junk var 2023-09-09 16:10:42 -04:00
MIDIMan
9b5cfe856c Add a mapheader check to M_CampaignWarpIsCheat 2023-09-08 22:03:25 -04:00
spherallic
a4a3b5b094 2.2.13 2023-09-09 01:16:28 +02:00
katsy
82568f81fc Disable renderhitbox in multiplaye altogether 2023-09-08 17:46:13 -05:00
sphere
0952d31369 Merge branch 'fix-1x1-floorsprite-draw' into 'next'
Fix floorsprite rendering with 1x1 images

Closes #1052

See merge request STJr/SRB2!2141
2023-09-08 22:35:34 +00:00
Lactozilla
27021d2921 Optimize 2023-09-08 17:43:55 -03:00
Lactozilla
14eb589611 Fix floorsprite rendering with 1x1 images 2023-09-08 17:26:42 -03:00
sphere
0f914a4e25 Merge branch 'netvars-fix' into 'next'
Replace CV_NETVAR with CV_NOTINNET for cv_renderhitbox (Fixes #1103)

Closes #1103

See merge request STJr/SRB2!2140
2023-09-08 17:51:30 +00:00
sphere
b5636d9dc9 Merge branch 'lua-supername' into 'next'
Expose skin.supername to Lua

See merge request STJr/SRB2!2138
2023-09-08 17:51:19 +00:00
sphere
afee1cb687 Merge branch 'sprite-clip-optimization' into 'next'
Optimize sprite rendering by ignoring completely occluded sprites

See merge request STJr/SRB2!2131
2023-09-08 17:51:11 +00:00
sphere
d42a96263b Merge branch 'interpolate-hitbox-scaling' into 'next'
Interpolate Hitboxes when Scaling Mobjs

See merge request STJr/SRB2!2124
2023-09-08 17:51:06 +00:00
SteelT
72662efc8d Replace CV_NETVAR with CV_NOTINNET for cv_renderhitbox
The CV_NETVAR flag being used for cvars not registered in a dedicated server context will completely mess with the internal netid to cvar linkage.
And I'm not really keen on registering a cvar purely for rendering on dedicated servers, so let's just prevent renderhitbox from being changed in netgames entirely.
2023-09-08 13:34:56 -04:00
Lactozilla
0377d9e881 Merge remote-tracking branch 'stjr/next' into sector-portals 2023-09-08 14:09:54 -03:00
Zwip-Zwap Zapony
11a2fe8613 Expose skin.supername to Lua 2023-09-06 21:02:04 +02:00
Zwip-Zwap Zapony
e5fdfadce7 Copy interpolation to shields and overlays
Also handle overlays in splitscreen properly
2023-09-06 20:35:20 +02:00
Krabs
858f102ca4 Update hash for patch.pk3 2023-09-06 12:50:51 -04:00
Krabs
49ee744ba1 Update version number 2023-09-06 12:50:32 -04:00
sphere
b5232a4ca4 Merge branch 'nights-noclip-camera' into 'next'
Make camera noclip during NiGHTS gameplay

See merge request STJr/SRB2!2136
2023-09-05 22:27:13 +00:00
sphere
5ce2b93a74 Merge branch 'lua-invalid-field-crash' into 'next'
Fix possible crashes in the Lua API when accessing invalid fields

See merge request STJr/SRB2!2128
2023-09-05 22:24:29 +00:00
sphere
fefdd7987c Merge branch 'title-animation-skip' into 'next'
Allow input during title animation after the first time

See merge request STJr/SRB2!2122
2023-09-05 22:23:57 +00:00
sphere
a90422a30e Merge branch 'dodrawforviewmobj' into 'next'
Don't Copy mobj->dontdrawforviewmobj To MT_OVERLAYs

See merge request STJr/SRB2!2125
2023-09-05 17:56:34 +00:00
spherallic
85fc55bfc1 Prevent title input during negative finalecount 2023-09-05 19:38:45 +02:00
sphere
417928f680 Merge branch 'nobombsphereattract2' into 'next'
Don't attract bomb spheres with Nightopian Helper

See merge request STJr/SRB2!2135
2023-09-05 17:25:42 +00:00
sphere
1ba1f7454b Merge branch 'the_elder_skyscroll_ii_daggerfall' into 'next'
Fix the Record Attack Background Jumping

See merge request STJr/SRB2!2129
2023-09-05 17:24:22 +00:00
sphere
e012a721e8 Merge branch 'instantretry' into 'next'
Add toggle for instant retry in Record Attack

See merge request STJr/SRB2!2120
2023-09-05 17:24:03 +00:00
sphere
b7b1e0b1e5 Add toggle for instant retry in Record Attack 2023-09-05 17:24:03 +00:00
sphere
758c5a893b Merge branch 'katsy-next-patch-00801' into 'next'
Make renderhitbox a netvar to prevent clientside wallhacking

See merge request STJr/SRB2!2133
2023-09-05 17:23:35 +00:00
katsy
969e21017d Make renderhitbox a netvar to prevent clientside wallhacking 2023-09-05 17:23:34 +00:00