Commit graph

13688 commits

Author SHA1 Message Date
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
sdasdas
d73ed99703 check for hud_nightsrecords in old special stages 2023-10-31 22:06:22 +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
SteelT
0c2665f3d7 Merge branch SRB2:next into rendercvars 2023-10-31 02:23:09 +00: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
a79c80af6c Merge branch 'master' into rendercvars 2023-10-28 23:06:06 -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
Alam Ed Arias
19a1e4f67d Merge branch 'master' into ogl-palette-rendering 2023-10-27 14:47:35 -04: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
01025198fc Update r_things.c
We need `texturecolumn` in `R_DrawPrecipitationVisSprite`
2023-10-26 21:22:58 +00: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
4b0792de2b Update st_stuff.c
Correct typos
2023-10-26 13:12:09 +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
28e8ccbed7 Merge branch SRB2:next into nonightsever 2023-10-25 19:51:40 +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
1403f93176 Merge branch 'next' into showinput 2023-10-25 14:24:17 -04: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
1dd9f5e110 Merge branch SRB2:next into fireflower-icon 2023-10-25 18:19:26 +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
2a2fd7566d Merge branch 'next' into improve-download-refuse-message 2023-10-25 14:04:52 -04:00
Alam Ed Arias
59fc021d97 Merge branch 'next' into renderhitbox-nightsitems 2023-10-25 14:03:23 -04:00
Alam Ed Arias
df8956995c Merge branch 'next' into patch-refactor 2023-10-25 14:02:08 -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
bitten2up
06b596ddee Merge branch SRB2:next into slash-n 2023-10-23 18:46:44 +00: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
7798d5964a Merge branch SRB2:next into emblemexitfix 2023-10-23 18:27:34 +00:00
Alam Ed Arias
e7393a152c Merge branch SRB2:next into propercheats 2023-10-23 18:27:13 +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
bitten2up
2de0c6a2ea
forgot to add a comment explaining it 2023-10-08 20:38:56 -05:00
bitten2up
6ff2a2de7e
\n 2023-10-08 20:34:43 -05: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
Hannu Hanhi
8008981647 Add hw_shaders.c to hardware/CMakeLists.txt 2023-10-03 19:35:18 +03: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
Lactozilla
c09305de62 Minor refactoring 2023-09-23 20:43:59 -03:00
Lactozilla
28e6b97299 Fix R_DrawFlippedColumnInCache and R_DrawBlendColumnInCache 2023-09-23 20:30:50 -03:00
Lactozilla
e30523264c Merge remote-tracking branch 'stjr/next' into patch-refactor 2023-09-23 20:28:24 -03:00
Hannu Hanhi
a47e1fb272 Merge tag 'SRB2_release_2.2.13' into ogl-palette-rendering-merge13
SRB2 release v2.2.13
2023-09-23 19:38:27 +03:00
Lactozilla
57465a1a56 Fix minor grammatical mistake 2023-09-22 15:00:07 -03: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
7bcad024f8 Only Award Bonuses / RA Emblems from Physically Beating a Level 2023-09-19 21:48:01 -05:00
SMS Alfredo
7da8e2e776 Make the Cheats Command Reflect UsedCheats 2023-09-19 18:10:51 -05: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
Lactozilla
731113ea0e Improve download refusal messages 2023-09-18 18:45: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
spherallic
a29d1ca219 Make camera noclip during NiGHTS gameplay 2023-09-05 18:03:51 +02:00
spherallic
52d356d09e Don't attract bomb spheres with Nightopian Helper 2023-09-05 14:43:30 +02:00
Lactozilla
57a880a286 Fix a bug 2023-09-03 19:35:58 -03:00
Lactozilla
d777b62e1b Improve checks for papersprites 2023-09-03 18:59:39 -03:00
Eidolon
c35456d5cb Actually fix papersprites near camera crash 2023-09-03 16:33:06 -05:00
Lactozilla
58bd31fdca Make hitboxes count towards the total sprite count
This has the effect of misrepresenting how many sprites are actually visible, but it's more "accurate".
2023-09-03 17:14:48 -03:00
Lactozilla
b8313ceda2 Optimize sprite rendering by ignoring completely occluded sprites 2023-09-03 17:02:35 -03:00
Lactozilla
4847825a59 Also make these two unsigned 2023-09-03 13:30:11 -03:00
Lactozilla
2f25102b79 Make num_posts unsigned
size_t was a bit overkill for that.
2023-09-03 13:27:49 -03:00
Lactozilla
6ccb1f7ca3 Do the same to R_DrawPrecipitationVisSprite 2023-09-03 13:12:40 -03:00
Lactozilla
0c664681cd Mask the sprite patch column in R_DrawVisSprite 2023-09-03 12:57:11 -03:00
Lactozilla
649669c217 Merge remote-tracking branch 'stjr/next' into patch-refactor 2023-09-03 12:41:08 -03:00
Eidolon
d4a2bb5675 Fix sprite scale column iteration crash 2023-09-03 10:08:03 -05:00
Zwip-Zwap Zapony
3faa29ded9 Fix the Record Attack background jumping 2023-09-01 22:36:15 +02:00
Lactozilla
6414e9db79 Fix possible crashes in the Lua API when accessing invalid fields 2023-08-31 15:02:59 -03:00
spherallic
25c220d363 Some credits updates 2023-08-31 16:25:14 +02:00
Gustaf Alhäll
e0ea677ca4
Make chat spam protection more configurable 2023-08-30 19:32:13 +02:00
spherallic
b98bec9a03 Final final 2.2.12 color tweaks (real)
- Tweaked Aether, Midnight and Volcanic
- Credit Chrispy & Saneko for new skincolors
2023-08-30 00:07:49 +02:00
Zwip-Zwap Zapony
2febb6ced9 Don't copy dontdrawforviewmobj to MT_OVERLAYs 2023-08-29 17:12:04 +02:00
Zwip-Zwap Zapony
7a1f952d9e Make a comment clearer 2023-08-29 17:11:52 +02:00
Zwip-Zwap Zapony
91a17fdbdd Use decimal instead of octal vertex IDs 2023-08-25 10:42:25 +02:00
Zwip-Zwap Zapony
f42c2403f9 Interpolate radius/height when scaling mobjs 2023-08-25 10:42:12 +02:00
Lactozilla
5996c8a5ac Fix P_GetMobjByTag so that it iterates through mapthings 2023-08-25 05:02:23 -03:00
Lactozilla
3505c90d5c Clarify comment 2023-08-25 04:28:46 -03:00
Lactozilla
d7bc644dfe Check for cv_skybox.value if in a portal too 2023-08-25 00:57:10 -03:00
Lactozilla
cf1f310363 Add sector portals from visplanes while rendering a portal 2023-08-25 00:47:40 -03:00
Lactozilla
87d40fc3cc Use original portal's origin for the viewpoint displacement 2023-08-25 00:18:20 -03:00
Lactozilla
9335ee3031 Implement "copy portal to line" sector portal type 2023-08-24 17:36:38 -03:00
Lactozilla
ff5d53e54d Serialize sector portals 2023-08-24 16:04:31 -03:00
spherallic
6c416c61b1 Final 2.2.12 skincolor changes:
- Replaced Mercury & Pumpkin with Ocean & Tangerine
- Renamed Crystal to Siberite & Meteorite to Moonstone
- Tiny tweaks to color ordering and NiGHTS link colors
2023-08-24 13:33:38 +02:00
Lactozilla
6303e37fbe Use P_SetTarget here 2023-08-24 01:19:58 -03:00
Lactozilla
563233a55f Add editor definition for linedef type 6 2023-08-24 01:09:46 -03:00
Lactozilla
6d812b4a43 Implement Eternity Engine's plane portal and horizon portal types 2023-08-24 00:51:52 -03:00
Lactozilla
74ea880ca0 Refactor 2023-08-23 17:49:29 -03:00
Lactozilla
50506254e8 Support plane type 3 in the "copy portal" line special
SRB2 doesn't implement sector portals the way ZDoom does, but this ensures plane type 3 acts the same as plane type 2.
2023-08-23 16:31:03 -03:00
Lactozilla
e230d38aad Ensure sector portals are rendered when they would otherwise be missed 2023-08-23 15:46:48 -03:00
Lactozilla
395e9bdd20 Implement sector portal copying 2023-08-23 15:29:16 -03:00
Lactozilla
5b387ec94a Make linedef type 6 closer to ZDoom's Sector_SetPortal 2023-08-23 15:04:50 -03:00
Lactozilla
03daf721ef Allow sector portals to be displayed properly on sky sectors 2023-08-23 13:43:02 -03:00
sphere
56a0546e15 Merge branch 'supernamefix' into 'next'
fix some issues with supername code

See merge request STJr/SRB2!2123
2023-08-23 09:32:41 +00:00
Lactozilla
2b64698c4e Use different default viewpoint heights so that ceiling portals make more sense 2023-08-23 04:34:35 -03:00
Lactozilla
1506909a1f Reimplement sector portals 2023-08-23 04:24:06 -03:00
sphere
13ac83a208 Floor portal test, ported
Co-authored-by: Lactozilla <jp6781615@gmail.com>
2023-08-23 02:58:38 -03:00
Sal
3943a48a06 Merge branch 'fix-masked-seg-crash' into 'next'
Fix a possible crash in R_RenderMaskedSegRange

See merge request STJr/SRB2!2121
2023-08-23 04:31:23 +00:00
katsy
d8d352a11a fix some issues with supername code 2023-08-22 15:11:47 -05:00
Lactozilla
55b4458001 Fix a possible crash in R_RenderMaskedSegRange
R_AllocTextureColumnTables wasn't checking if the tables were never allocated, making the renderer later attempt to render midtextures for drawsegs that don't contain actual midtextures.
2023-08-22 13:37:42 -03:00
spherallic
5548b67462 Set spritexscale/spriteyscale in objectplace 2023-08-22 16:32:21 +02:00
sphere
ac3e9fc999 Merge branch 'binary-thing-options' into 'next'
Clear thing flags for NiGHTS bumpers/hoops again

Closes #1097

See merge request STJr/SRB2!2118
2023-08-21 08:24:51 +00:00
sphere
4bd296f98f Merge branch 'issue933' into 'next'
Fix for issue #933 - special stage tokens should divert player until after the...

See merge request STJr/SRB2!1910
2023-08-21 08:20:43 +00:00
spherallic
40d9614c32 Clear thing flags for NiGHTS bumpers/hoops again 2023-08-21 00:43:01 +02:00
spherallic
ce721f9f78 Allow input during title animation after 1st play 2023-08-20 23:40:13 +02:00
sphere
32a40e3dbe Merge branch 'alphabetsoup' into 'next'
Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen

See merge request STJr/SRB2!1642
2023-08-20 17:29:03 +00:00
katsy
1a0d9eab79 Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen 2023-08-20 17:29:03 +00:00
sphere
d4aac9a857 Merge branch 'fix-freebsd-build' into 'next'
Fix FreeBSD build errors

See merge request STJr/SRB2!2071
2023-08-20 17:19:39 +00:00
sphere
3d0457d58b Merge branch 'preserve-texture-col-frac' into 'next'
Use separate table for maskedtexturecol (resolves #635)

Closes #635

See merge request STJr/SRB2!2073
2023-08-20 17:19:18 +00:00
sphere
8b7978ec35 Merge branch 'color-tweaks' into 'next'
Small color tweaks

See merge request STJr/SRB2!2116
2023-08-20 17:18:58 +00:00
sphere
4a89fc77c1 Merge branch 'fof-rendering-mishaps' into 'next'
Fix a couple of FOF rendering issues

See merge request STJr/SRB2!2115
2023-08-20 17:17:41 +00:00
sphere
5069e77d20 Merge branch 'fix-misplaced-color' into 'next'
Resolve #1086

Closes #1086

See merge request STJr/SRB2!2114
2023-08-20 17:17:34 +00:00
sphere
5dba53009e Merge branch 'recap-flip-spin' into 'next'
Fix interpolation when curling up or scaling while flipped

Closes #983

See merge request STJr/SRB2!1979
2023-08-20 17:16:53 +00:00
sphere
b533594a33 Merge branch 'udmf-absolutez' into 'next'
Add absolute Z height flag for mapthings in UDMF

See merge request STJr/SRB2!2015
2023-08-20 17:16:02 +00:00
sphere
9d6578d42f Merge branch 'weaponshadow' into 'next'
Correct emerald & weapon ring/panel hitboxes, give drop shadows to weapon rings & panels

See merge request STJr/SRB2!2036
2023-08-20 17:15:44 +00:00
spherallic
b52a36f04c Small tweaks to Foundation and Midnight 2023-08-20 18:38:14 +02:00
spherallic
50fc1abf9a Revert invcolor tweaks for Red/Rosy/Lavender 2023-08-20 18:30:30 +02:00
Sally Coolatta
40c37ce4c2 Revert left/right movement 2023-08-20 12:05:58 -04:00
Sally Coolatta
9c8dd54751 Fix color grid not extending to the very bottom 2023-08-20 11:56:55 -04:00
spherallic
f62c2f4c75 Fix arg # typos for "visible from inside" checks 2023-08-20 17:55:06 +02:00
spherallic
259732cccb Make FOF fades use 0-255 alpha, not 1-256 2023-08-20 17:42:27 +02:00
Sally Coolatta
4d1e6df2d7 Fix color grid input bugs
There's still some slight awkwardness trying to wrap downwards into uneven row grids, but this is significantly better and this already took up way more time than I wanted it to.
2023-08-20 11:28:39 -04:00
Sally Coolatta
2f1db66e78 Fix drawing of final color 2023-08-20 07:37:10 -04:00
Sally Coolatta
91fc3302cd Merge branch 'master' into next 2023-08-20 07:32:09 -04:00
James R
909e07be65 Rename HAVE_STRLCPY to SRB2_HAVE_STRLCPY, fix non-glibc compile
- Fix compile with msvcrt
- Fix compile with SDL 2.28.2
2023-08-20 07:31:10 -04:00
Sally Coolatta
b5b7b7c1e3 Merge remote-tracking branch 'upstream/master' into next 2023-08-20 00:23:26 -04:00
Sal
ec559612b9 Merge branch 'nights-pull-emblem-fix' into 'next'
Don't NiGHTS pull emblems you can't collect

See merge request STJr/SRB2!2113
2023-08-20 04:03:07 +00:00
Sally Coolatta
9d9b6d83c2 Don't NiGHTS pull emblems you can't collect 2023-08-19 23:58:43 -04:00
Sally Coolatta
d589953fc4 Fix P_WriteSkincolor 2023-08-19 23:39:54 -04:00
Sal
7ef7de1bc5 Level select cheat fixes 2023-08-20 03:16:14 +00:00
bitten2up
93f11508fc
remove stray else 2023-08-19 19:52:10 -05:00
spherallic
623fa126ad Fix backside ceiling vertex slopes 2023-08-18 15:08:12 +02:00
spherallic
07ef7c4639 Prevent FOF alpha from wrapping around in OpenGL 2023-08-17 20:15:03 +02:00
spherallic
66cc6a5f44 Correct flags for partially intangible FOFs 2023-08-17 19:31:55 +02:00
spherallic
9b296a1547 Disable Makefile deprecation warning for now 2023-08-17 19:27:33 +02:00
Zwip-Zwap Zapony
db59ec5998 Fix interpolation when curling up while flipped
Also fix scaling interpolation while flipped, and fix the NiGHTS Drone flip interpolation on its first tic
2023-08-17 17:39:24 +02:00
Lactozilla
30cc998e4f Use cached patch even if it hasn't been loaded 2023-08-16 14:29:41 -03:00
Lactozilla
9c758e68e8 Merge remote-tracking branch 'stjr/next' into patch-refactor 2023-08-16 14:22:52 -03:00
Lactozilla
393e5f7d8d Do fixes and optimizations 2023-08-16 14:22:19 -03:00
sphere
207aba0a52 Merge branch 'fix-segfault-emerald-hunt-spec' into 'next'
Fix segfault when spectating on an Emerald Hunt map

See merge request STJr/SRB2!2105
2023-08-16 11:12:40 +00:00
Lactozilla
976b9b862d Restore player skins if forced skin restrictions are lifted 2023-08-15 13:51:12 -03:00
Lactozilla
dd4deaa5e9 Reduce code duplication 2023-08-15 12:43:31 -03:00
Lactozilla
8d56a4d32e Move splitscreen code path out of SetSkinLocal and into SendNameAndColor 2023-08-15 12:37:18 -03:00
Lactozilla
a745997243 Better handling of cv_skin/cv_playercolor in singleplayer 2023-08-15 12:27:38 -03:00
Lactozilla
e106b56b53 Only set the picked character once 2023-08-15 04:45:50 -03:00
Lactozilla
062af20628 Don't change cv_skin or cv_playercolor if there is no need to 2023-08-15 04:29:50 -03:00
Lactozilla
0bb65166c9 Always allow changing color in multiplayer player setup menu 2023-08-15 03:49:31 -03:00
Lactozilla
9dc2447559 Ensure the correct color is set for the player object in splitscreen 2023-08-15 03:46:55 -03:00
Zwip-Zwap Zapony
8077a1db8f Always allow con_hudlines when using devmode 2023-08-14 19:55:47 +02:00
Zwip-Zwap Zapony
5830ff500f Fix mobj flag fumblings 2023-08-14 19:05:48 +02:00
Gustaf Alhäll
3d14d155e0
Fix segfault when spectating on an Emerald Hunt map 2023-08-12 12:31:59 +02:00
SteelT
3fbdaa61b7 Merge branch 'cherry-pick-86367e4e' into 'next'
Add gametype parameter to G_SetCustomExitVars and G_ExitLevel

See merge request STJr/SRB2!2101
2023-08-10 00:01:24 +00:00
Sal
f96ebbb2f5 Merge branch 'warp-is-cheat' into 'next'
Warp cheat adjustments

See merge request STJr/SRB2!2098
2023-08-07 18:35:20 +00:00
Sal
492fe94597 Warp cheat adjustments 2023-08-07 18:35:20 +00:00
SteelT
20e4e8a5c4 Fix crash handler showing garbage string for signal title
This fixes the signal title being shown as something like "Process killed by signal: Process killed by signal: ó>"

Did some minor cleaning while I'm also here
2023-08-07 14:06:24 -04:00
Lactozilla
f17493f379 Use -1 as the default, not 0 2023-08-07 14:30:39 -03:00
Lactozilla
b92dc42848 Add gametype parameter to G_SetCustomExitVars and G_ExitLevel
(cherry picked from commit 86367e4ec1)
2023-08-07 13:23:57 -04:00
Lactozilla
3377fa986a Remember the player's color after a team gametype 2023-08-07 13:37:07 -03:00
MIDIMan
d06098c0aa Changed P_ConvertBinaryLinedefTypes to use args[1] instead of args[3] for linedef type 442 2023-08-05 20:22:11 -04:00
Mari0shi
84f7b0cf1d Display HUD Icon for Fire Flower 2023-08-05 09:07:25 -04:00
Sal
9e72b78a24 Merge branch 'scale-mishap' into 'next'
Make UDMF scale compatible with ZDoom's spec

See merge request STJr/SRB2!2086
2023-08-04 20:05:35 +00:00
Sal
f11538c478 Make UDMF scale compatible with ZDoom's spec 2023-08-04 20:05:35 +00:00
Sal
be056af77e Merge branch 'total-starts-at-record-score' into 'next'
Total score starts at record score

See merge request STJr/SRB2!2091
2023-08-04 20:05:17 +00:00
SteelT
6780f89574 Add missing param to G_CheckDemoExtraFiles in G_CheckDemoForError 2023-08-04 15:59:47 -04:00
Sally Coolatta
39175c6c70 Improved version checks for demo file lists
No longer relies on the demoversion global variable (which was incorrect for a couple instances, like ghosts), now we pass the version to the file list functions. Also don't set any demo global variables when checking a demo for valid files before playback. Also also, exit said file check function asap if its a title demo instead of doing it after we've already opened the file.
2023-08-04 14:36:56 -04:00
Lactozilla
0c3aab9ac3 Remove table argument support from color.hslToRgb 2023-08-04 15:27:05 -03:00
Lactozilla
2e820ca83d Rename color.unpackRgba to color.unpackRgb 2023-08-04 15:26:12 -03:00
Lactozilla
126fba4ddb Lua colorlib: color library 2023-08-04 15:10:25 -03:00
Lactozilla
a54d3a274a Remove assignment by table 2023-08-04 14:29:26 -03:00
Lactozilla
0e2b6a9423 Rename fields 2023-08-04 05:13:56 -03:00
Lactozilla
a48030d02d Support number as accepted value for "rgba" or "fade_rgba" fields 2023-08-04 05:08:22 -03:00
Lactozilla
ec8757d716 Extend extracolormap alpha range 2023-08-04 05:00:46 -03:00
Lactozilla
b670f97ed1 Add lighttable_t support 2023-08-04 00:36:11 -03:00
Lactozilla
4ea2887d7f Lua colorlib: extracolormap support 2023-08-04 00:31:51 -03:00
James R
b120d00c9f Fix glibc 2.38 compile
glibc 2.38 added strlcpy and strlcat.
2023-08-03 16:46:47 -07:00
Sally Coolatta
33c7a930a7 Total score starts at record score
Means there's actually feedback for how much score you got in the current level.
2023-08-02 11:31:05 -04:00
Sal
0ce41f3e1d Merge branch 'itallreturnstonothing' into 'next'
Handle empty music lump name on music change

See merge request STJr/SRB2!2090
2023-08-02 15:24:42 +00:00
spherallic
8990b83071 Handle empty/"-" music lump name on music change 2023-08-02 17:05:38 +02:00
Sal
b7443cfa05 Merge branch 'lawofattraction' into 'next'
Fix ring attraction and homing attack math errors (resolves #1045, #1001)

Closes #1001 and #1045

See merge request STJr/SRB2!2033
2023-08-02 14:54:33 +00:00
Sal
cdf5890c5d Merge branch 'mi-lua-fixes' into 'next'
Lua fixes

See merge request STJr/SRB2!2085
2023-08-02 00:20:32 +00:00
Sal
1f799257a1 Merge branch 'extras-levelselect-fix' into 'next'
Extras level select fix

See merge request STJr/SRB2!2084
2023-08-02 00:20:21 +00:00
SMS Alfredo
24cad83287 Make both sign state and sprite2 disable models 2023-08-01 17:43:39 -05:00
Lactozilla
9d7a734acc Don't generate textures in R_GetColumn 2023-08-01 19:04:47 -03:00
Lactozilla
689fa265dd Remove flats 2023-08-01 17:19:58 -03:00
SteelT
fd4c50589d Don't set recordscore to 0 in G_PlayerFinishLevel
Fixes the recordscore being reset on intermission start
2023-08-01 15:23:14 -04:00
LJ Sonic
df0c8e0557 Merge remote-tracking branch 'origin/next' into netcode-rerefactor 2023-08-01 19:00:52 +02:00
Monster Iestyn
c9efaf3a1a fix warping from SP pause level select breaking if game was started with no save slot (such as from extras menu) 2023-08-01 17:52:06 +01:00
LJ Sonic
b2441114e8 Reapply recent netcode changes 2023-08-01 18:24:07 +02:00
Lactozilla
0088326ff0 Refactor Picture_PatchConvert, so that it no longer makes Doom patches 2023-08-01 12:58:01 -03:00
Monster Iestyn
e8256e2b43 allow archiving/unarchiving of skin_t userdata in netgames 2023-08-01 13:17:52 +01:00
Monster Iestyn
d91d9bf7fc add redflag, blueflag, rflagpoint and bflagpoint to Lua 2023-08-01 12:57:03 +01:00
Monster Iestyn
70928120c2 allow use of P_IsFlagAtBase in HUD code, since it doesn't actually modify anything 2023-08-01 12:45:58 +01:00
Sal
1ddc04abc6 Merge branch 'cmake-rr-ports' into 'next'
Ring Racers CMake + Debug build improvements

See merge request STJr/SRB2!2075
2023-08-01 02:29:45 +00:00
Sal
26583a9845 Ring Racers CMake + Debug build improvements 2023-08-01 02:29:45 +00:00
Sal
8630dd1644 Merge branch 'faketic-fix' into 'next'
Fix minor off-by-one error in faketic calculation

See merge request STJr/SRB2!2077
2023-08-01 02:29:05 +00:00
Sal
ca042db371 Merge branch 'fix-missing-ssf-entries' into 'next'
Fix wrong SSF_* values in Lua due to missing entries

See merge request STJr/SRB2!2080
2023-08-01 02:28:26 +00:00
Sal
e442dc262e Merge branch 'resetplayer-rodeo' into 'next'
Fix #1064

Closes #1064

See merge request STJr/SRB2!2081
2023-08-01 02:25:43 +00:00
Monster Iestyn
fb00b65f41 ...you know what, just call G_LoadGame for SP_PauseLevelSelectDef in M_LevelSelectWarp too 2023-07-31 23:36:07 +01:00
Gustaf Alhäll
ddc5cc6e48
Fix wrong SSF_* values in Lua due to missing entries 2023-07-31 22:51:50 +02:00
Monster Iestyn
77d70aaa1b relocate savedata code from P_LoadLevel to G_InitNew as well
(this doesn't fix !1064 yet, this just makes the code a bit tidier)
2023-07-31 20:06:28 +01:00
Monster Iestyn
d20ca3d919 reset emeralds and luabanks in G_InitNew, not Got_Mapcmd 2023-07-31 19:44:50 +01:00
spherallic
28ef38faad Reallocate wadfiles when adding folders 2023-07-31 15:32:22 +02:00
Lactozilla
821460d208 Patch refactor 2023-07-30 20:56:28 -03:00
LJ Sonic
70ec89682e Fix minor off-by-one error in faketic calculation 2023-07-30 14:26:17 +02:00
MIDIMan
f4d944e49a Make HWR_AllowModel check for SPR2_SIGN instead of S_PLAY_SIGN 2023-07-29 20:45:10 -04:00
katsy
7634a96031 delete ASM code, remove NASM 2023-07-27 23:58:53 -05:00
katsy
5068e0fe5d Merge remote-tracking branch 'stjr/next' into kill-asm 2023-07-27 23:17:06 -05:00
Lactozilla
97311dc5b0 Use separate table for maskedtexturecol 2023-07-27 19:15:35 -03:00
LJ Sonic
7f4e82e7d9 Cleanup comments 2023-07-27 15:38:53 +02:00
LJ Sonic
6f53683519 Cleanup 2023-07-27 15:38:53 +02:00
LJ Sonic
69af7e1ea4 Add missing include directive 2023-07-27 15:38:52 +02:00
LJ Sonic
a54155e2cc Cleanup 2023-07-27 15:38:52 +02:00
LJ Sonic
8df0debd54 Split SV_SendTics into functions 2023-07-27 15:38:52 +02:00
LJ Sonic
a69204b609 Fix function name 2023-07-27 15:38:52 +02:00
LJ Sonic
e4c403408b Move net command sending to a new function 2023-07-27 15:38:52 +02:00
LJ Sonic
2639dc176d Move net command copying to a new function 2023-07-27 15:38:51 +02:00
LJ Sonic
715893ad25 Split PT_ClientCmd into functions 2023-07-27 15:38:51 +02:00
LJ Sonic
684382fc5e Add missing include directive 2023-07-27 15:38:51 +02:00
LJ Sonic
2c6bb71726 Reorder functions in d_clisrv.c 2023-07-27 15:38:50 +02:00
LJ Sonic
79356fe628 Move netgame commands to a new file 2023-07-27 15:38:50 +02:00
LJ Sonic
456c6b1a00 Remove reboundstore timeout hack 2023-07-27 15:38:50 +02:00
LJ Sonic
35dac244ef Fix clients not being able to join servers 2023-07-27 15:38:49 +02:00
LJ Sonic
2f9a2ebc86 Move comment to an appropriate place 2023-07-27 15:38:49 +02:00
LJ Sonic
b42336c232 Simplify convoluted code 2023-07-27 15:38:49 +02:00
LJ Sonic
2bd2b728bf Remove useless variable 2023-07-27 15:38:48 +02:00
LJ Sonic
5d5e2c78e4 Call all packet handlers from the same place 2023-07-27 15:38:48 +02:00
LJ Sonic
cb634402a8 Rename packet handlers to match their associated PT_ constants 2023-07-27 15:38:47 +02:00
LJ Sonic
94761d3a55 Remove outdated or misleading comments 2023-07-27 15:38:47 +02:00
LJ Sonic
39556e8af7 Add missing _pak suffix to a few packet structures 2023-07-27 15:38:47 +02:00
LJ Sonic
332a0f6b93 Add missing PT_ prefix to a few packet handlers 2023-07-27 15:38:47 +02:00
LJ Sonic
d841bfb236 Move netcode console variables to appropriate files 2023-07-27 15:38:46 +02:00
LJ Sonic
91f9f53cfc Remove unused stuff 2023-07-27 15:38:46 +02:00
LJ Sonic
de46eef068 Move gamestate handling to a new file 2023-07-27 15:38:45 +02:00
LJ Sonic
1a7f42d172 Declare data exchanged through the network to a new file 2023-07-27 15:38:45 +02:00
LJ Sonic
0ade3ae0bc Move tic and net command handling to new files 2023-07-27 15:38:45 +02:00
LJ Sonic
fc41dd78f4 Move server-side connection handling to a new file 2023-07-27 15:38:44 +02:00
LJ Sonic
e090f0e400 Move client connection handling to a new file 2023-07-27 15:38:43 +02:00
LJ Sonic
0b17e3c418 Move netcode files to a new folder 2023-07-27 15:38:42 +02:00
LJ Sonic
07bc922273 Delete netcode
Just kidding, I just deleted NONET
2023-07-27 15:34:05 +02:00
LJ Sonic
1f4c71739a Ignore duplicate PT_CLIENTJOIN packets 2023-07-27 14:45:00 +02:00
LJ Sonic
7b96efc179 Rename ConnectionRefused to be more descriptive 2023-07-27 14:45:00 +02:00
LJ Sonic
d816e4d111 Cleanup HandleConnect 2023-07-27 14:45:00 +02:00
LJ Sonic
b66353932d Remove broken joinnextround console variable 2023-07-27 14:44:59 +02:00
LJ Sonic
f501c4b250 Remove unneeded numplayerswaiting field 2023-07-27 14:44:59 +02:00
LJ Sonic
6ab9b9ae8a Remove useless condition 2023-07-27 14:44:59 +02:00
LJ Sonic
160db6383c Remove useless return value for SV_AddWaitingPlayers 2023-07-27 14:44:58 +02:00
LJ Sonic
394e925c16 Cleanup sphere redistribution 2023-07-27 14:44:58 +02:00
LJ Sonic
0053eaac00 Fix sphere redistribution 2023-07-27 14:44:58 +02:00
LJ Sonic
2de6b623c0 Move sphere redistribution to its own function 2023-07-27 14:44:58 +02:00
LJ Sonic
ecacb14fc1 Move player-node unlinking to a function 2023-07-27 14:44:57 +02:00
LJ Sonic
f1117095b7 Cleanup ResetNode 2023-07-27 14:44:57 +02:00
LJ Sonic
4c0705008e Merge node arrays into a structure 2023-07-27 14:44:57 +02:00
LJ Sonic
27b500ce9a Split packet handling switch into functions 2023-07-27 14:44:57 +02:00
LJ Sonic
60f150a826 Remove snake_ prefix 2023-07-27 14:44:57 +02:00
LJ Sonic
7725315789 Move snake minigame to its own files 2023-07-27 14:44:56 +02:00
LJ Sonic
606797a5a4 Temporarily revert recent netcode changes 2023-07-27 14:41:02 +02:00
Gustaf Alhäll
d01f25d91d
Fix FreeBSD build errors 2023-07-26 23:18:07 +02:00
James R
7261db1eee cmake: fix -DSRB2_CONFIG_ENABLE_TESTS=OFF build 2023-07-26 14:16:15 -04:00
James R
dc103330ac Rename strcasestr to nongnu_strcasestr, macro strcasestr ifndef _GNU_SOURCE
Fix for GCC C++ compiler, which always defines _GNU_SOURCE.
2023-07-26 14:03:55 -04:00
Sally Coolatta
91e915b963 Fix recordscore not including intermission bonuses 2023-07-26 13:44:43 -04:00
Sally Coolatta
42bf107b71 #define BOOL boolean -> #define boolean BOOL 2023-07-26 13:23:48 -04:00
Sal
a7964ffc69 Merge branch 'm-random-take2' into 'next'
New M_Random implementation

See merge request STJr/SRB2!1780
2023-07-26 14:53:01 +00:00
tertu marybig
9e5a828508 New M_Random implementation 2023-07-26 14:53:01 +00:00
Sal
a956aadb15 Merge branch 'forwardmove-rng-what-da-hell' into 'next'
Remove P_RandomFixed call when players are moving

See merge request STJr/SRB2!2057
2023-07-26 14:08:08 +00:00
Sal
03ae681714 Merge branch 'a_scaletoground' into 'next'
Fix A_ConnectToGround's Handling of Scaled Mobjs

Closes #1038

See merge request STJr/SRB2!2029
2023-07-26 12:17:14 +00:00
Sal
31e28bc5a1 Merge branch 'laffytaffy' into 'next'
Warn in console instead of hard erroring when attempting to modify a vanilla skincolor (resolves #1046)

Closes #1046

See merge request STJr/SRB2!2058
2023-07-26 12:14:21 +00:00
katsy
4bbf4c21c2 Warn in console instead of hard erroring when attempting to modify a vanilla skincolor (resolves #1046) 2023-07-26 12:14:21 +00:00
Gustaf Alhäll
9253a8cc54 Fix use-after-free when calling v.drawString in Lua 2023-07-26 08:12:58 -04:00
Sal
f67aea7fc2 Merge branch 'fix-softlock-empty-name' into 'next'
Fix softlocking as Sonic & Tails when Player 2 has no name

See merge request STJr/SRB2!2056
2023-07-26 12:10:24 +00:00
Sal
e96a1630b5 Merge branch 'fix-zmovement-remove-crash' into 'next'
Fix crash when P_ZMovement calls from Lua removes the object

See merge request STJr/SRB2!2054
2023-07-26 12:09:05 +00:00
Sal
99c95e2d7a Merge branch 'fix-mobjcollide-removemobj-segfault' into 'next'
Fix segfault when calling P_RemoveMobj from MobjCollide hook

See merge request STJr/SRB2!2041
2023-07-26 12:03:09 +00:00
Sal
020a7b878e Merge branch 'fix-memory-bloat' into 'next'
Clean up and simplify zone memory allocation

See merge request STJr/SRB2!2059
2023-07-26 12:01:52 +00:00
Sal
a8aee74829 Merge branch 'drawseg-clipping-optimized' into 'next'
Drawseg clipping optimized, from prboom-plus

See merge request STJr/SRB2!2067
2023-07-26 12:00:58 +00:00
Sal
8ed51989e1 Merge branch 'renderhitbox-fix' into 'next'
Small renderhitbox fix

See merge request STJr/SRB2!2068
2023-07-26 12:00:22 +00:00
Sal
7eff445d1f Merge branch 'cmake-clang-tidy' into 'next'
cmake: Add optional clang-tidy integration

See merge request STJr/SRB2!1849
2023-07-26 11:59:02 +00:00
Eidolon
101cdea022 cmake: Add optional clang-tidy integration
clang-tidy performs static analysis over the compilation unit,
producing more comprehensive compile warnings than are normally
generated by the compiler. For example, it will trace branches in a
function to find the exact conditions in which a null dereference
can occur.

Note that this produces an absurd amount of warnings for our existing
C code, and significantly slows compile times. It is pretty effective
at its job though. I think it would be good to turn on by default for
upcoming C++ code.
2023-07-26 07:58:31 -04:00
Eidolon
12b6a7cabf Don't preproc. define inline in C++ 2023-07-26 07:56:22 -04:00
Eidolon
2a8dbed336 Redefine boolean for C++ compatibility 2023-07-26 07:56:22 -04:00
Eidolon
0abe556197 cmake: Enable C++ 17 and C11 2023-07-26 07:55:26 -04:00
Sally Coolatta
dc9346a45d Add forwardmove rng backwards compat with demos 2023-07-26 07:50:47 -04:00
Sally Coolatta
29f7ecd460 Remove P_RandomFixed call when players are moving
"Add some extra randomization" is not how RNG works
2023-07-26 07:46:51 -04:00
Sal
6a0be65315 Merge branch 'brokenrecord' into 'next'
Make reading and writing of all player stats to record attack demos precise (resolves #1048)

Closes #1048

See merge request STJr/SRB2!2045
2023-07-26 11:43:32 +00:00
Sal
5eae98c829 Merge branch 'ra-file-list' into 'next'
Allow Record Attack in modified games

See merge request STJr/SRB2!2064
2023-07-26 11:35:31 +00:00
Lactozilla
e12288be3f Move these two lines after calculating the slopes 2023-07-26 00:19:55 -03:00
Lactozilla
c6c3cc3209 Drawseg clipping optimized, from prboom-plus
Co-authored-by: Sally Coolatta <tehrealsalt@gmail.com>
2023-07-26 00:06:52 -03:00
SMS Alfredo
285f7acbed Enable Pandora and Level Select with Devmode / Always allow Level Select if unlocked 2023-07-25 14:18:36 -05:00
Sally Coolatta
10a8f2d05e Fix some minor warnings
- Fix `lib_getSkinSprite` overshadowing `sprites` global
- Rename terrible result_e `ok` so it stops overshadowing crap
- Remove inlining from w_wad.c since it reached the inline limit (remember kids, your compiler knows better than you these days whenever or not to inline something)
- Remove unused variable in G_PlayerReborn
2023-07-25 11:32:26 -04:00
Zwip-Zwap Zapony
0e2682d590 Add "drawonlyforplayer" and "dontdrawforviewmobj" 2023-07-25 11:05:29 -04:00
Gustaf Alhäll
aaced79b41
Fix segfaults on some systems due to polyvertex being NULL 2023-07-25 16:37:20 +02:00
Sally Coolatta
dded352293 Harsher replay menu
Don't allow loading demos with invalid file lists at all. If you insist on doing this, it has to be done from the command line now.
2023-07-25 09:43:10 -04:00
Sally Coolatta
f99cf91d3d Promote file count to UINT16 2023-07-25 09:29:09 -04:00
Sally Coolatta
77576c3c5d Allow Record Attack in modified games
Replays now store & validate the add-on list before loading them. Custom characters can now be allowed in Record Attack.
2023-07-25 08:45:42 -04:00
Sal
1a209146d6 Merge branch 'spemblems' into 'next'
Allow obtaining ring, time & grade emblems in regular gameplay

See merge request STJr/SRB2!1752
2023-07-25 09:45:12 +00:00
Sal
ee67070547 Merge branch 'fix-no-sdl-build' into 'next'
Fix build errors when building without SDL

See merge request STJr/SRB2!2062
2023-07-25 09:44:33 +00:00
GoldenTails
4212035729 Fix errors due to declaring variables in switch bodies 2023-07-24 21:44:53 -05:00
Sal
3a52e6deb2 Merge branch 'waiting-players-intermission' into 'next'
SRB2Kart netcode ports

See merge request STJr/SRB2!2019
2023-07-24 18:03:45 +00:00
Sal
2e37995e89 Merge branch 'ping_lua' into 'next'
Port player.ping from SRB2Kart

See merge request STJr/SRB2!2025
2023-07-24 18:00:31 +00:00
Jisk
b36ca89e16 Port player.ping from SRB2Kart 2023-07-24 18:00:31 +00:00
Gustaf Alhäll
8bddf0f097
fixup! fixup! fixup! Fix build errors when building without SDL 2023-07-24 17:12:24 +02:00
Nev3r
4f97b7730b Merge branch '622-teamlives-hud' into 'next'
Resolve "Display lives in the lower left if GTR_TEAMS|GTR_LIVES is set"

Closes #622

See merge request STJr/SRB2!1579
2023-07-24 13:04:21 +00:00
Nev3r
3338d7ca74 Merge branch 'conversion-context-drift' into 'next'
UDMF context drift fixes

See merge request STJr/SRB2!2061
2023-07-24 12:49:14 +00:00
Nev3r
022ddcf363 Merge branch 'models-plus-final' into 'next'
3D models support for spritexoffset, spriteyoffset, spritexscale, spriteyscale, parity with sprite rollangle

See merge request STJr/SRB2!1840
2023-07-24 12:46:10 +00:00
spherallic
86b4f93610 Allow obtaining ring, time & grade emblems in regular SP gameplay. 2023-07-24 08:34:10 -04:00
Sal
b238a6db50 Merge branch 'shockwave-action' into 'next'
Add a standalone action for shockwaves

See merge request STJr/SRB2!1777
2023-07-24 11:01:41 +00:00
Sal
4ccba2a9d9 Merge branch 'fix-inaccurate-fps-counter' into 'next'
Fix inaccuracies in FPS counter

Closes #1047

See merge request STJr/SRB2!2047
2023-07-24 10:57:27 +00:00
Sal
08c6e76d1c Merge branch 'texnamefornum' into 'next'
Add R_TextureNameForNum and R_CheckTextureNameForNum

See merge request STJr/SRB2!1880
2023-07-24 10:43:52 +00:00
Sal
13c30ace2e Merge branch 'lua-texture-offsets-expose' into 'next'
Exposed floor/ceiling offsets and light reference to Lua.

See merge request STJr/SRB2!1884
2023-07-24 10:42:07 +00:00
Sal
25ef05230e Merge branch 'alias-improvements' into 'next'
Alias improvements

See merge request STJr/SRB2!2055
2023-07-24 10:36:21 +00:00
Sal
34f3b9c06a Merge branch 'os-lib' into 'next'
Paired down OS Lua library

See merge request STJr/SRB2!2060
2023-07-24 10:36:03 +00:00
Sally Coolatta
84e448eb63 Improve handling of team lives labels
The lives counter check is now always run, and team name is displayed in its place when its false.
2023-07-24 06:09:50 -04:00
Shane Ellis
a9d0630b15 Add lives check to Team name HUD 2023-07-24 05:18:55 -04:00
Sal
50d8becf55 Merge branch 'thespikesagaepisode3' into 'next'
Exclude non-solid objects from spike eject (resolves #706)

Closes #706

See merge request STJr/SRB2!1674
2023-07-24 09:17:07 +00:00
Sal
31d26c6f55 Merge branch 'awayview-fix' into 'next'
Call P_ResetCamera Upon Switching To/From an Away View Camera

See merge request STJr/SRB2!2011
2023-07-24 09:15:56 +00:00
Sal
f46e6883ca Merge branch 'fullscreen-toggle' into 'next'
Add fullscreen (and renderer) toggle & make windowed mode use a separate resolution

See merge request STJr/SRB2!1734
2023-07-24 09:14:21 +00:00
Sal
dd0ea188dd Merge branch 'bak2bak' into 'next'
Autobackup old gamedatas (resolves #1031)

Closes #1031

See merge request STJr/SRB2!2030
2023-07-24 09:12:05 +00:00
katsy
516e06bcba Autobackup old gamedatas (resolves #1031) 2023-07-24 09:12:05 +00:00
James R
bc9e7c1461 Disable sprite/model rotation on slopes for now 2023-07-24 05:02:31 -04:00
James R
a71a7f2710 Support spritexoffset/spriteyoffset for 3D models 2023-07-24 05:01:28 -04:00
James R
6d9512d290 Do not factor roll and pitch into model rollangle
Those transformations are applied separately so the model
tilts in 3d space.
2023-07-24 04:57:39 -04:00
James R
c065029b01 Model stretching 2023-07-24 04:53:30 -04:00
James R
7db09b657b Tilt models 2023-07-24 04:48:17 -04:00
Sally Coolatta
b6129a6d42 Add R_SpriteRotationAngle function
Gets the rotation angle for the mobj's sprite. Meant for pitch & roll later, but that part is if'd out currently and just returns mobj->rollangle
2023-07-24 04:47:07 -04:00
Sally Coolatta
7c2a241042 Remove the need for setting rotation axis in spriteinfo for models
Now it just does it like Software
2023-07-24 04:40:15 -04:00
Sally Coolatta
5c23fdda24 Fix incorrect tilts 2023-07-24 04:11:43 -04:00
Sally Coolatta
ae233b000f Remove modeltilt, use roll & pitch instead
Broken currently, about half of the slopes you can go into have the wrong tilt
2023-07-24 04:11:42 -04:00
TehRealSalt
95cbee52c6 Model tilts
- Add modeltilt variable, for more manual control of the model tilting. By default this just copies standingslope, but doesn't get cleared in the air.
- Shadows & trailing bananas now tilt to match the ground they are on.
- Rocket Sneakers & afterimages now tilt to match the player's current orientation.
2023-07-24 04:11:42 -04:00
SMS Alfredo
66f8908b03 Reset Camera only if a new camera is set / Fix Lua jank with setting awayviewmobj or awayviewtics solo 2023-07-22 20:44:22 -05:00
Gustaf Alhäll
4bc7b2da11
fixup! fixup! Fix build errors when building without SDL 2023-07-22 22:59:00 +02:00
Gustaf Alhäll
d42d1e9a45
fixup! Fix build errors when building without SDL 2023-07-22 22:56:17 +02:00
Gustaf Alhäll
69089e0858
Fix build errors when building without SDL 2023-07-22 22:47:52 +02:00
toaster
e914c19e8f P_WriteSfx: Work around the weird case sensitivity in internal instances of get_number by always providing an uppercase prefix on conversion 2023-07-21 14:41:22 +01:00
toaster
66dd952fdd Tidier conversion of string properties on linedefs to UDMF
Previously, many concatenated texture field strings were turned to text, then had that string run through get_number, then had it converted back into a string to become a stringarg.

Now, the concatenated string is copied directly to the relevant stringarg, with no intermediary steps.

This fixes an issue where a map with object or state properties would have "context drift" - breaking when the object or state list changed, due to differently ordered freeslots, or new hardcoded objects.

Affected types:
- doomednum 1110/Action 9 (Custom Mace/Chain)
- doomednum 700 and those immediately following (Ambient Sound)
- Action 4 and 414 (dash pad, play sound effect)
- Action 14 (bustable block parameters)
- Action 434 (Award Power)
- doomednum 757/Action 15 (fan particle generator)
- doomednum 1202 (bumpable hazard rock/apple spawner)
    - This one has undefined behaviour in the binary map format which was not previously forbidden. This undefined behaviour is EXTREMELY vulnerable to context drift, and so it's simply not worth creating a system to write numerical values into object types - we write an explicit name only for the intended range, and otherwise report the threat of context drift when converting.

In addition, to reduce duplicated zone memory, (sidedef_t).text and (linedef_t).text have been removed from all but the Lua API. In Lua, in binary maps, they point to the host line's stringargs - the line's text and a frontside's text will return stringargs[0], while a backside's text will return stringargs[1]. I've done my best to match the previous API as closely possible, to the point of reporting false nils if the line didn't previously have text available.

However, there are four linedef Actions for which the sidedef text will be different between builds containing and not containing this commit - 331, 332, 333 (the Character-specific linedef executors), and 443 (Call Lua Script), and only if the text is long enough to go over two lines. Given that both halves would be incomplete nonsense in this case, I'm willing to wager this minor point of discrepancy is not a breaking issue.
2023-07-20 19:42:21 +01:00
toaster
dee2489620 P_GetNodeType: Do not dereference invalid pointer for **nodedata parameter 2023-07-20 17:54:47 +01:00
Sally Coolatta
36e6a2001a Paired down OS Lua library
Pretty much removed everything except for time operations. File operations steps on the toes of the IO library, and the others were useless or invasive. The only one I wasn't sure about was `os.tmpname()`, but I think that's something that could be implemented for IO library instead if necessary.

The main reason I want this is because os.time provides an OK way to initially seed RNG on game first boot. But it would also be cute to let Lua modders be able to re-implement Christmas mode / day&night cycles themselves :p
2023-07-20 01:43:10 -04:00
Gustaf Alhäll
cee5eb47b5
Clean up and simplify zone memory allocation 2023-07-19 23:17:21 +02:00
sphere
a752e6c8e4 Merge branch 'kredits' into 'next'
Fix inconsistency with title card patch coloring (color the title card patch used in the credits to skin)

See merge request STJr/SRB2!1746
2023-07-19 19:43:15 +00:00
katsy
8cf65e8301 Fix inconsistency with title card patch coloring (color the title card patch used in the credits to skin) 2023-07-19 19:43:15 +00:00
sphere
5c87dd52ec Merge branch 'action-super-fix' into 'next'
Make A_Action super act as expected

Closes #718

See merge request STJr/SRB2!1737
2023-07-19 19:40:42 +00:00
sphere
9ea387acc0 Merge branch 'plinedefexectutefix' into 'next'
Don't cancel P_LinedefExecute early

Closes #988

See merge request STJr/SRB2!1944
2023-07-19 19:40:20 +00:00
sphere
b1e3589210 Merge branch 'hudlines-hudtime-fix' into 'next'
Fix con_hudlines being off by one, Fix con_hudtime overflow

See merge request STJr/SRB2!1931
2023-07-18 19:47:21 +00:00
Gustaf Alhäll
ff56d46827
fixup! Fix softlocking as Sonic & Tails when Player 2 has no name 2023-07-17 16:41:22 +02:00
Sally Coolatta
4a735470b9 Even more SRB2Kart netcode improvement ports
- Prevent connection timeout during the waiting gamestate from the last commit.
- Keep client connections alive during fades / other internal loops.
- More consistently timeout clients when they reach the end of BACKUPTICS.
- Dedicated servers will not run any game logic if no nodes are sending packets to it, to reduce CPU usage when there is no one interacting with your server.
  - Unlike SRB2Kart, the amount of time is configurable with the "dedicatedidletime" console variable. Setting this to 0 will disable this feature.
- CL_SendClientCmd uses exact packet types instead of magic number offsets.
2023-07-17 00:44:34 -04:00
Sally Coolatta
80bf4d6c2d Port SRB2Kart join on intermission fix
All gamestates besides GS_LEVEL are unsupported by the save game functions. This commit forces players joining during these gamestates into GS_WAITINGPLAYERS, which is a basic gamestate that just maintains the connection until we can enter the start of a new one. Also provides an extremely simple drawer for GS_WAITINGPLAYERS so the joining player knows what's going on.
2023-07-16 20:53:28 -04:00
Gustaf Alhäll
1ced8acc6a
Fix softlocking as Sonic & Tails when Player 2 has no name 2023-07-16 23:25:22 +02:00
SteelT
a90151570f Replace the alias if an alias already exists
Reduces wasting memory by having multiple aliases with the same name
2023-07-16 15:44:48 -04:00
SteelT
c55b2f2943 Print list of existing alias commands 2023-07-16 15:34:30 -04:00
Gustaf Alhäll
9a386111e2
Fix crash when P_ZMovement calls from Lua removes the object 2023-07-16 14:19:19 +02:00
SteelT
9a31064c4a Merge branch 'master' into next 2023-07-15 21:04:07 -04:00
katsy
d844c06f9b Fix roll braking assuming player angle is camera angle 2023-07-15 16:24:08 -05:00
sphere
9b16c21517 Merge branch 'net-timing' into 'next'
Prevent dropped ticcmds due to interp timing jutter

See merge request STJr/SRB2!2046
2023-07-15 17:45:00 +00:00
sphere
c29999aea7 Merge branch 'suppress-warnings' into 'master'
Suppress libdivide warnings in GCC/Clang

See merge request STJr/SRB2!1991
2023-07-15 17:38:19 +00:00
sphere
5da5b6dd86 Merge branch 'fix-exotic-prids' into 'master'
Fix PRIdS define for Windows MINGW64

See merge request STJr/SRB2!1367
2023-07-15 17:38:12 +00:00
Gustaf Alhäll
e3824b9f1b
fixup! Fix inaccuracies in FPS counter 2023-07-15 12:51:07 +02:00
sphere
7aac6a01e4 Merge branch 'better-crashes' into 'next'
Better signal handler messages

See merge request STJr/SRB2!2042
2023-07-14 22:48:26 +00:00
sphere
860767aa65 Merge branch 'increasemaxunlockables' into 'next'
Increase maximum unlockables

Closes #770

See merge request STJr/SRB2!1988
2023-07-14 22:47:37 +00:00
sphere
54d5e8154b Merge branch 'cv-truefalse' into 'next'
Add CV_TrueFalse as possible value types for console variables

See merge request STJr/SRB2!2049
2023-07-14 22:47:09 +00:00
sphere
858c9ef0b2 Merge branch 'align-memory-addresses' into 'next'
Make sure all allocations are properly aligned

See merge request STJr/SRB2!2050
2023-07-14 22:46:39 +00:00
spherallic
009e1ef157 Merge branch 'next' into fullscreen-toggle 2023-07-14 15:30:14 +02:00
sphere
bf5c4a1b0d Merge branch 'handle-missing-frame-gracefully' into 'next'
Handle missing frames for sprites gracefully

See merge request STJr/SRB2!2039
2023-07-14 13:24:53 +00:00
sphere
610ddc034c Merge branch 'removetwohundredandsixty' into 'next'
Remove generalized FOF type

Closes #1011

See merge request STJr/SRB2!2038
2023-07-14 13:17:51 +00:00
sphere
47436ee495 Merge branch 'bosszero' into 'next'
Do not consider 0 a valid executor tag for bosses

Closes #1017

See merge request STJr/SRB2!2037
2023-07-14 13:17:48 +00:00
sphere
93fa653f80 Merge branch 'fishjumpbinaryfix' into 'next'
Fix A_FishJump for custom objects in binary maps

Closes #1019

See merge request STJr/SRB2!2035
2023-07-14 13:16:55 +00:00
sphere
59685937da Merge branch 'fix-exit-automap-segfault' into 'next'
Fix segfault when exiting game with automap open

Closes #1049

See merge request STJr/SRB2!2044
2023-07-14 13:15:56 +00:00
sphere
2e2ec145dd Merge branch 'fading-callback-thread-fix' into 'next'
Do music fade callback on main thread (resolves #975)

Closes #975

See merge request STJr/SRB2!2043
2023-07-14 13:15:37 +00:00
sphere
f428759150 Merge branch 'bbox' into 'next'
Hitbox Renderer

See merge request STJr/SRB2!1838
2023-07-14 13:14:56 +00:00
spherallic
34ce172a90 Allow toggling PF_NoDepthTest for OpenGL hitboxes 2023-07-14 15:03:43 +02:00
Zwip-Zwap Zapony
8b931da6f3 Draw hitboxes last in OpenGL 2023-07-14 12:51:16 +00:00
Gustaf Alhäll
bfbbaf9f56
Make sure all allocations are properly aligned 2023-07-14 13:25:09 +02:00
AJ Martinez
8755582901 Don't submit future ticcmds if they could overwrite a needed ticcmd 2023-07-14 02:33:33 -07:00
SteelT
464110ed81 Add CV_TrueFalse as possible value types for console variables
This also adds support for using true/false as value aliases for On/Off, Yes/No or 1/0
2023-07-13 01:02:15 -04:00
spherallic
73ded4787c Fix ammo/panel/emerald hitboxes, add shadows to thrown rings 2023-07-11 19:00:47 +02:00