Commit graph

14182 commits

Author SHA1 Message Date
Hanicef
10365e943a Use DEFAULTDIR instead of hardcoding .srb2 2024-03-20 20:44:17 +01:00
LJ Sonic
c3a8f452e2 Fix equation slopes breaking with slopes farther than 32k FU away from the map center 2024-03-20 20:30:06 +01:00
Hanicef
8794e411bd Don't traverse the entire HOME directory to find wads 2024-03-20 19:23:13 +01:00
LJ Sonic
49fa45039e Fix error report when some frames are missing 2024-03-20 18:06:19 +01:00
Logan Aerl Arias
da1d2919c6 Merge branch SRB2:next into improve-backtrace 2024-03-18 00:40:02 +00:00
LJ Sonic
0e57d70b95 Automatically mirror long sprites for missing rotations 2024-03-17 00:41:38 +01:00
LJ Sonic
f6cb5d563c Only log sprite and frame additions when at least one was added 2024-03-17 00:40:29 +01:00
LJ Sonic
0f6f6afb44 Fix sprite and frame addition logging 2024-03-17 00:28:25 +01:00
LJ Sonic
761a972927 Fix R_AddSingleSpriteDef for short sprite names 2024-03-17 00:27:19 +01:00
LJ Sonic
4ebda932bb Cleanup 2024-03-16 19:36:18 +01:00
LJ Sonic
7371566592 Fix error message for too long sprite names 2024-03-16 19:35:56 +01:00
LJ Sonic
dc3436df78 Fix compiler warnings 2024-03-16 18:54:10 +01:00
LJ Sonic
9b6c642345 Fix infinite loop 2024-03-16 18:13:43 +01:00
LJ Sonic
a0c253f81e Fix invalid syntax 2024-03-16 17:49:34 +01:00
LJ Sonic
de8a4bb3e1 Fix compiler warnings 2024-03-16 17:21:35 +01:00
LJ Sonic
a6b71826f9 Use R_GetSpriteNumByName everywhere 2024-03-16 17:00:59 +01:00
LJ Sonic
45d54c38f7 Use bitarray_t for used_spr 2024-03-16 16:26:33 +01:00
LJ Sonic
b3844a9ca5 Cleanup initfreeslots() 2024-03-16 16:14:52 +01:00
SSNTails
8e43f0a46e Merge branch SRB2:next into issue1133 2024-03-16 14:38:00 +00:00
SSNTails
b4ad054422 Zwip Zwap Zapony's suggestions 2024-03-16 10:28:49 -04:00
LJ Sonic
178d29cf0c Allow up to 256 frames per sprite 2024-03-16 00:51:23 +01:00
SSNTails
2181dadb4c Checking MFE_VERTICALFLIP matching is actually redundant.. 2024-03-15 16:39:37 -04:00
Hanicef
01b017019b Fix spectator list not compensating for non-green resolutions 2024-03-15 21:35:28 +01:00
LJ Sonic
99a9e5fcc9 Add support for LongSprites/ folder 2024-03-15 21:22:12 +01:00
LJ Sonic
42c610af9c Fix GetFramesAndRotationsFromShortLumpName 2024-03-15 21:02:41 +01:00
LJ Sonic
33f176fd5b Refactor R_AddSingleSpriteDef 2024-03-15 20:15:38 +01:00
LJ Sonic
837c3a7be3 Refactor R_AddSingleSpriteDef 2024-03-15 20:06:21 +01:00
SSNTails
a58d9036bc Restore MF2_OBJECTFLIP/MFE_VERTICALFLIP on rollout rock disconnect 2024-03-15 14:28:44 -04:00
LJ Sonic
1c415749f7 Refactor R_AddSpriteDefs 2024-03-15 15:45:35 +01:00
LJ Sonic
092ac6643e Allow sprite names with up to 64 characters 2024-03-14 20:32:10 +01:00
LJ Sonic
8073b8b3f0 Fix rare Lua bug when updating a SPR_ constant 2024-03-14 20:20:12 +01:00
LJ Sonic
9ca5ce01f1 No longer store wadnum in sprnames 2024-03-14 13:56:47 +01:00
Lactozilla
e44c751187 Fix #1215 2024-03-14 04:13:09 -03:00
Lactozilla
7469a6271b Fix #1219 2024-03-14 00:59:49 -03:00
BarrelsOFun
cfc23648f5 Transform FlingRing instead of spawning new Ring 2024-03-13 19:58:24 -07:00
SSNTails
34cf7c1a01 I don't think flipping the flag here is even needed... 2024-03-13 18:08:07 -04:00
sphere
4018a7fa0f Merge branch 'udmf-nophysicsequation' into 'next'
Add sector flags to disable equation slope physics

See merge request STJr/SRB2!2028
2024-03-13 17:38:45 +00:00
sphere
70626a683f Add sector flags to disable equation slope physics 2024-03-13 17:38:45 +00:00
spherallic
0f9ed1b822 Write colormap alpha to textmap in old range, for now 2024-03-13 14:57:37 +01:00
sphere
dedd80a0f0 Merge branch 'issue1195' into 'next'
Issue #1195 - Standing at a corner under steam, but far away enough to not be...

See merge request STJr/SRB2!2318
2024-03-13 13:49:49 +00:00
sphere
b750876f7e Merge branch 'issue1150d' into 'next'
Fix Issue #1150 plus some small refactoring

See merge request STJr/SRB2!2357
2024-03-13 13:32:11 +00:00
sphere
1b060d2b34 Merge branch 'fruits-clipper' into 'next'
NiGHTS text improvements

Closes #1121

See merge request STJr/SRB2!2165
2024-03-13 13:03:33 +00:00
sphere
a3165cbbee Merge branch 'maretimers' into 'next'
Allow per-mare time limits in NiGHTS

See merge request STJr/SRB2!2137
2024-03-13 13:03:29 +00:00
sphere
fcd4c8334c Merge branch 'playersetup-and-continue-lua' into 'next'
Add "continue" and "playersetup" Lua HUD hooks & draw followitems in the Player Setup menu

See merge request STJr/SRB2!2227
2024-03-13 11:11:36 +00:00
spherallic
8dce0e1a3f Prevent white flash upon starting the game (in Software) 2024-03-12 17:29:08 +01:00
spherallic
373e23dd90 Merge branch 'next' into quick-intro 2024-03-12 17:19:36 +01:00
MIDIMan
8fb5f88f89 Merge branch SRB2:next into mobj-alpha 2024-03-11 00:03:44 +00:00
MIDIMan
22d7f392d0 Move some stuff around in P_DoBoss5Death 2024-03-10 19:34:21 -04:00
MIDIMan
f354c0b2ea Fix Fang's death sequence 2024-03-10 10:44:08 -04:00
sphere
df18cc0960 Merge branch 'font_drawer' into 'next'
Refactor string drawing functions

See merge request STJr/SRB2!1726
2024-03-10 12:48:59 +00:00
Hanicef
7d3c0ca301 Fix finished players getting kicked for idling 2024-03-09 23:57:11 +01:00
Hanicef
7e3f6a2803 Add variable to move idle players to spectators 2024-03-09 23:54:52 +01:00
spherallic
31e58f1156 Rewrite aligned string drawing, using a modified version of strtok 2024-03-09 18:08:02 +01:00
spherallic
444cfc180f Use alignment enum for drawing aligned font strings 2024-03-08 00:39:53 +01:00
spherallic
02f31a4922 Add character width to font definitions
Used for V_MONOSPACE and V_OLDSPACING instead of spacewidth*2
2024-03-07 21:36:59 +01:00
sphere
33a1776f97 Merge branch 'issue1211' into 'next'
Fixes Issue #1211 - cut the amplitude on OpenGL water wave effect

See merge request STJr/SRB2!2381
2024-03-07 12:50:14 +00:00
sphere
6adfe7a829 Merge branch 'forceshieldhp' into 'next'
Show extra Force Shield hits using text instead of stacking more icons

See merge request STJr/SRB2!2378
2024-03-07 12:22:35 +00:00
sphere
4faa429f43 Merge branch 'issue1040' into 'next'
Fixes Issue #1040

See merge request STJr/SRB2!2377
2024-03-07 12:09:12 +00:00
sphere
3c0761f8fe Merge branch 'fix-players-idle-kick-cutscene' into 'next'
Fix players getting kicked by auto-kick during cutscenes

See merge request STJr/SRB2!2384
2024-03-07 12:08:13 +00:00
sphere
ee96ed12a4 Merge branch 'more-sprite2' into 'next'
Add 'sprite2' field to states

See merge request STJr/SRB2!2211
2024-03-07 12:06:48 +00:00
MIDIMan
29378e7f94 Merge branch SRB2:next into mobj-alpha 2024-03-06 02:26:50 +00:00
Hanicef
51e912e87b Fix segfault when passing NULL as player 2024-03-05 18:29:07 +01:00
Hanicef
b3aa23bc21 Remove unused variable 2024-03-05 18:23:23 +01:00
Hanicef
259997d121 Remove varargs from P_SpawnMobjFromMobj 2024-03-05 18:23:22 +01:00
Hanicef
02811b72f6 Fix segfault when trying to spawn an MT_PLAYER from Lua 2024-03-05 18:22:27 +01:00
Logan Aerl Arias
d2a068d158 Merge branch SRB2:next into issue1040 2024-03-04 17:21:35 +00:00
Logan Aerl Arias
084f7bc4f7 Merge branch SRB2:next into playersetup-and-continue-lua 2024-03-04 17:21:26 +00:00
spherallic
fdb23298f6 fix spacing that gitlab freaked out over 2024-03-04 15:25:25 +01:00
sphere
261e2d4347 bruh
# Conflicts:
#   src/doomstat.h
2024-03-04 14:23:45 +00:00
spherallic
6768bc7178 Merge branch 'next' into maretimers 2024-03-04 15:17:04 +01:00
sphere
cf7adfc8ac Merge branch 'fix-missing-hud-entry' into 'next'
Fix missing HUD item for Lua

See merge request STJr/SRB2!2383
2024-03-04 13:49:28 +00:00
Logan Aerl Arias
8cb18088b5 Merge branch SRB2:next into issue1150d 2024-03-04 13:35:11 +00:00
Logan Aerl Arias
33940e46bf Merge branch 'remove-opengl-chromakey' into 'next'
Make the display of palette index 255 consistent between renderers

Closes #405

See merge request STJr/SRB2!2351
2024-03-04 13:31:23 +00:00
Logan Aerl Arias
f4b862068c Merge branch 'texture-scaling-fixes' into 'next'
Fix various issues related to texture scaling

See merge request STJr/SRB2!2329
2024-03-04 13:30:11 +00:00
Logan Aerl Arias
4aee720bce Merge branch 'issue1188' into 'next'
Fix #1188

Closes #1188

See merge request STJr/SRB2!2354
2024-03-03 23:55:18 +00:00
Logan Aerl Arias
add091bac4 Merge branch 'substitute-null-with-ray' into 'next'
Substitute MT_NULL with MT_RAY in Lua

See merge request STJr/SRB2!2302
2024-03-03 23:39:49 +00:00
Logan Aerl Arias
bcc0eb39ea Merge branch 'remove-NOPNG' into 'next'
if PNG graphics support is removed, it is not netplay compatible

See merge request STJr/SRB2!2260
2024-03-03 23:37:53 +00:00
Logan Aerl Arias
89620dbd9e Merge branch 'shield-button-touchups' into 'next'
Shield Button Touchups

See merge request STJr/SRB2!2257
2024-03-03 23:37:05 +00:00
Logan Aerl Arias
55a7afde52 Merge branch 'instant-setscale' into 'next'
Add and use an "instant" parameter for P_SetScale

Closes #1120

See merge request STJr/SRB2!2167
2024-03-03 23:04:55 +00:00
Logan Aerl Arias
48ead1ae81 Merge branch 'fix-it-cv-string-console-block' into 'next'
Fix console not being blocked by IT_CV_STRING

See merge request STJr/SRB2!2304
2024-03-03 22:46:54 +00:00
Logan Aerl Arias
3b205e10b1 Merge branch SRB2:next into issue1150d 2024-03-03 17:23:16 +00:00
Logan Aerl Arias
e147ca30b9 Merge branch SRB2:next into issue1188 2024-03-03 17:22:51 +00:00
Logan Aerl Arias
2fe684351e Merge branch 'next' into remove-opengl-chromakey 2024-03-03 12:22:08 -05:00
Logan Aerl Arias
7fbdd02087 Merge branch 'next' into texture-scaling-fixes 2024-03-03 12:21:20 -05:00
Logan Aerl Arias
e5cb182662 Merge branch SRB2:next into fix-it-cv-string-console-block 2024-03-03 17:20:04 +00:00
Logan Aerl Arias
7f68a72755 Merge branch SRB2:next into substitute-null-with-ray 2024-03-03 17:19:37 +00:00
Logan Aerl Arias
f372f07bf4 libpng for everyone
zlib and libpng are now always needed
2024-03-03 12:15:12 -05:00
Logan Aerl Arias
1905116d18 Merge branch SRB2:next into shield-gamepad-defaults 2024-03-03 16:17:44 +00:00
Logan Aerl Arias
ba35849b5a Merge branch SRB2:next into shield-button-touchups 2024-03-03 16:17:08 +00:00
Logan Aerl Arias
5dd82cb7db Merge branch 'next' into more-sprite2 2024-03-03 11:16:35 -05:00
Logan Aerl Arias
93a191efa9 Merge branch SRB2:next into instant-setscale 2024-03-03 16:15:59 +00:00
Logan Aerl Arias
68599b7bfb Merge branch 'next' into fruits-clipper 2024-03-03 11:14:30 -05:00
Hanicef
8ea215bf2f Fix compiler error in clang 2024-03-03 11:36:29 +01:00
Hanicef
2804f29053 Fix players getting kicked by auto-kick during cutscenes 2024-03-02 18:57:09 +01:00
Hanicef
853afa30df Fix missing HUD item for Lua 2024-03-02 18:51:56 +01:00
MIDIMan
509adc3454 Change all remaining instances (hopefully) of UINT32 to fixed_t for alpha 2024-03-02 09:51:28 -05:00
MIDIMan
5668e02857 Merge branch SRB2:next into mobj-alpha 2024-03-01 21:34:40 +00:00
MIDIMan
a76544a376 Make alpha use fixed_t and add alpha field to precipmobj_t 2024-03-01 16:29:39 -05:00
Alam Ed Arias
1e61ab3472 Merge branch 'next' into stringop 2024-03-01 15:50:57 -05:00
Alam Ed Arias
e0819b5a25 Add printf formating 2024-03-01 20:49:59 +00:00
Alam Ed Arias
a9ef21aa50 Clang: clean up conditional-uninitialized warnings 2024-03-01 19:35:04 +00:00
MIDIMan
d18a4cca1e Clean up comments 2024-03-01 13:09:25 -05:00
MIDIMan
17e7aea311 Fix clang build error (hopefully) 2024-02-28 14:41:17 -05:00
MIDIMan
543004b5b6 Merge branch SRB2:next into mobj-alpha 2024-02-28 19:00:35 +00:00
Alam Ed Arias
a0c27b22c3 Merge branch 'next' into stringop 2024-02-28 13:14:11 -05:00
SSNTails
3db69342d9 Merge branch SRB2:next into issue1211 2024-02-28 02:36:38 +00:00
Arthur
45a8770deb Cut the amplitude on the underwater wave in GL 2024-02-27 21:35:51 -05:00
Logan Aerl Arias
7d26b173e5 Merge branch SRB2:next into fix-mixerx-1144 2024-02-27 18:13:52 +00:00
spherallic
7f51bb3001 Fix build errors & fix F_DrawContinueCharacter somehow becoming unused 2024-02-27 14:22:57 +01:00
Arthur
2da539ed9f Merge branch 'issue1195' of https://git.do.srb2.org/SSNTails/SRB2 into issue1195 2024-02-27 07:12:26 -05:00
Arthur
e19b9e7d24 A little bit of semantic cleanup 2024-02-27 07:12:22 -05:00
sphere
9b809fec6b Merge branch 'disable-powerup-hud' into 'next'
Make powerups HUD toggleable via Lua (again)

See merge request STJr/SRB2!2234
2024-02-27 12:05:36 +00:00
spherallic
9fb4b4cfbb Merge branch 'next' into playersetup-and-continue-lua 2024-02-27 12:31:12 +01:00
spherallic
dbc1fe8c0e Merge branch 'next' into more-sprite2 2024-02-27 12:23:14 +01:00
sphere
72a6ad80ba Merge branch 'add-per-player-mute' into 'next'
Add per-player mute

See merge request STJr/SRB2!2259
2024-02-27 10:58:59 +00:00
Hanicef
bfd6dbefe6 Add per-player mute 2024-02-27 10:58:59 +00:00
Hanicef
74673b8e1b Fix banlist being cleared if server fails to start 2024-02-26 22:11:52 +01:00
sphere
908f096200 Merge branch 'fix_VSreleaseproj' into 'next'
Fix VS release project settings

See merge request STJr/SRB2!2340
2024-02-26 16:29:58 +00:00
spherallic
e03b4c3e7e Cleanup as per ZZZ's suggestion 2024-02-26 17:15:52 +01:00
spherallic
a8a8103ab2 Show extra Force Shield hits using text instead of stacking more icons 2024-02-26 14:43:16 +01:00
SSNTails
15eaa3e8da Merge branch SRB2:next into issue1040 2024-02-26 04:12:26 +00:00
Arthur
9ef194fed4 min/max for cam_dist and cam_height 2024-02-25 23:08:18 -05:00
sphere
8ccc4d60ab Merge branch 'fix-1207' into 'next'
Fix 3D floor sides not rendering properly if a light list was involved

Closes #1207 and #1204

See merge request STJr/SRB2!2373
2024-02-25 23:41:29 +00:00
sphere
6d02f1823e Merge branch 'issue1199' into 'next'
Bring back WRITETHINGS, with custom filename and UDMF support!

See merge request STJr/SRB2!2339
2024-02-25 23:36:20 +00:00
sphere
553240f7c2 Merge branch 'showinput' into 'next'
Allow input view outside of record attack

See merge request STJr/SRB2!2020
2024-02-25 14:16:44 +00:00
sphere
1cc9e17efa Merge branch 'nonightsever' into 'next'
Make NiGHTS super consistent with regular super (Closes #520 for real this time)

Closes #520

See merge request STJr/SRB2!1666
2024-02-25 13:55:44 +00:00
sphere
50bdc5f1a5 Merge branch 'whirlybird' into 'next'
Use PF_NOJUMPDAMAGE for whirlwind jump instead of removing jump flags (resolves #771)

Closes #771

See merge request STJr/SRB2!1740
2024-02-25 13:39:17 +00:00
katsy
6604f47931 Use PF_NOJUMPDAMAGE for whirlwind jump instead of removing jump flags (resolves #771) 2024-02-25 13:39:17 +00:00
Logan Aerl Arias
f07a7618eb Merge branch SRB2:next into fix-mixerx-1144 2024-02-25 05:23:59 +00:00
Logan Aerl Arias
7d66f5cdfc Merge branch SRB2:next into instant-setscale 2024-02-25 05:13:45 +00:00
Logan Aerl Arias
a73f9476f3 fixed call to P_SetScale() within A_MinusDigging() that I missed 2024-02-24 23:57:09 -05:00
Logan Aerl Arias
2ca791a2ad disable libgme by default 2024-02-24 20:13:13 -05:00
MIDIMan
de8464cd2f Add alpha support for mobjs 2024-02-24 20:13:13 -05:00
spherallic
94db9ddf12 Make chat word wrapping consistent with how it was before 2024-02-25 01:48:42 +01:00
Logan Aerl Arias
235afdff72 disable libgme by default 2024-02-24 19:37:38 -05:00
spherallic
73b90d13eb Merge branch 'next' into font_drawer 2024-02-25 00:58:04 +01:00
Eidolon
2c0622cd4d Include poll.h on UNIXCOMMON in dedicated 2024-02-24 13:23:27 -06:00
Eidolon
5008d866b9 Include poll.h on UNIXCOMMON
Apple was not including poll.h despite needing it.
2024-02-24 13:21:55 -06:00
Eidolon
4c7b2f16e7 Move MIN_SLEEP_DURATION_MS macros for Apple
These were not defined for macOS despite being necessary.
2024-02-24 13:19:22 -06:00
Lactozilla
04ac253acf Merge branch 'next' into remove-opengl-chromakey 2024-02-24 14:45:22 -03:00
Lactozilla
f16836bd81 Changes:
- Renamed renderwalls, renderfloors and renderthings
- Removed CV_NOTINNET|CV_CHEAT from renderwalls, renderfloors and renderthings
- Moved some cvars to proper places
2024-02-24 14:43:21 -03:00
Lactozilla
2d3dd624f5 Merge branch 'next' into texture-scaling-fixes 2024-02-24 14:22:41 -03:00
Lactozilla
4c9f4e966c Delete pic_mode_t 2024-02-24 14:03:11 -03:00
Lactozilla
0664671c57 Merge branch 'next' into delete-unused-render-code 2024-02-24 14:02:33 -03:00
Lactozilla
a2355fc01e Always use R_DrawRepeatMaskedColumn and R_DrawRepeatFlippedMaskedColumn 2024-02-24 13:56:47 -03:00
Logan Aerl Arias
52f53f03b7 Merge branch 'next' into instant-setscale 2024-02-24 11:42:27 -05:00
Logan Aerl Arias
9014e911d3 Merge branch SRB2:next into improve-backtrace 2024-02-24 16:20:26 +00:00
Logan Aerl Arias
d7086168b8 Merge branch 'next' into fruits-clipper 2024-02-24 11:18:12 -05:00
Zwip-Zwap Zapony
34afebfc06 Revert P_SuperReady to a boolean transform type 2024-02-24 15:41:51 +01:00
Zwip-Zwap Zapony
90958614f3 Shield button touchups 2024-02-24 15:41:36 +01:00
Lactozilla
66234d093c Fix a regression where 3D floor sides could not render properly
Normally, when rendering a 'masked column', the variables sprtopscreen (and sometimes sprbotscreen) are used to define the screen space bounds of the column. R_DrawMaskedColumn and R_DrawFlippedMaskedColumn use these variables to determine where to start rendering the column's posts.
Rendering a 3D floor side when a light list is involved requires cutting it vertically. Part of this process involves setting windowtop and windowbottom, which are what R_DrawMaskedColumn and R_DrawFlippedMaskedColumn use instead to define the bounds in screen space of the column. To draw the columns between the 3D floor's vertical boundaries, the functions R_DrawRepeatMaskedColumn or R_DrawRepeatFlippedMaskedColumn are used to repeatedly call R_DrawMaskedColumn or R_DrawFlippedMaskedColumn respectively.
The problem is that R_DrawRepeatMaskedColumn and R_DrawRepeatFlippedMaskedColumn assume that sprtopscreen and sprbotscreen are what define the vertical positions of the column, and the consequence is, after the first time R_DrawRepeatMaskedColumn or R_DrawRepeatFlippedMaskedColumn are called for a column, no more columns are rendered, since sprtopscreen is not reset.
This issue was fixed by making R_RenderThickSideRange use R_DrawMaskedColumn and R_DrawFlippedMaskedColumn if there is a lightlist, or R_DrawRepeatMaskedColumn and R_DrawRepeatFlippedMaskedColumn if there is no lightlist.
2024-02-24 00:43:46 -03:00
Logan Aerl Arias
4d5ed85784 Merge branch 'fix-missing-mobjwasremoved-checks' into 'next'
Fix various segfaults caused by missing P_MobjWasRemoved checks

See merge request STJr/SRB2!2052
2024-02-24 03:37:57 +00:00
Logan Aerl Arias
5be61987ca Merge branch 'rendercvars' into 'next'
Rendering cvars that control rendering walls, floors, and things.

See merge request STJr/SRB2!1526
2024-02-24 03:02:48 +00:00
Logan Aerl Arias
6337a7611c Merge branch 'load-trnslate-in-folders' into 'next'
Load TRNSLATE files from folders

Closes #1206

See merge request STJr/SRB2!2370
2024-02-24 01:11:06 +00:00
sphere
f804ae42c1 Merge branch 'fix-credit-text-disappear' into 'next'
Fix credit sequence not compensating for non-green resolutions

Closes #1184

See merge request STJr/SRB2!2320
2024-02-24 00:28:28 +00:00
sphere
aa5383e7e0 Merge branch 'fix-insane-tty-latency' into 'next'
Fix insane TTY input latency

See merge request STJr/SRB2!2360
2024-02-24 00:27:38 +00:00
sphere
29580282b0 Merge branch 'maxskins-255' into 'next'
Change MAXSKINS from 256 to 255

See merge request STJr/SRB2!2365
2024-02-24 00:27:14 +00:00
SSNTails
d43d5fb9e1 Don't change drawangle while riding on a fan 2024-02-23 15:23:39 -05:00
Lactozilla
37ce5b669b Load TRNSLATE files from folders 2024-02-23 15:52:18 -03:00
Zwip-Zwap Zapony
56c61a80ff Change MAXSKINS from 256 to 255
A value of -1 is sometimes reserved for "no skin", leaving 255 other values for skin numbers
2024-02-22 12:34:51 +01:00
Alam Ed Arias
b8023aeef9 Tokenizer: pad with 2 NULL bytes 2024-02-21 22:32:32 -05:00
Alam Ed Arias
da1b579cee Tokenizer_Open: pad the string with an NULL byte 2024-02-21 21:53:12 -05:00
Alam Ed Arias
8c7fe2ae95 Make tokenizer keep a copy of string in normal memory 2024-02-21 21:41:16 -05:00
SSNTails
ea218c2e68 Can't have a radius of 0 here! 2024-02-21 19:25:57 -05:00
Arthur
a407ff8899 Zwip Zwap Zapony's suggestion to use a consvar 2024-02-21 16:22:00 -05:00
Arthur
716b9527bf Add a -allowdesync parameter that will allow individual demos to desync. Warning is still shown, but player position will not be modified. 2024-02-21 14:38:11 -05:00
Hanicef
0d598150b3 Fix insane TTY input latency 2024-02-21 20:22:23 +01:00
bitten2up
db95f940b4 That should fix the warnings 2024-02-21 16:14:35 +00:00
Arthur
de13b600bf R_IsPointInSector is fine, it was the clang issue screwing up 2024-02-20 21:42:23 -05:00
Lactozilla
978a6b2717 Fix typos in R_RenderPortalHorizonLine 2024-02-20 23:22:43 -03:00
Arthur
9296d6b496 This should do it. 2024-02-20 19:20:09 -05:00
Arthur
9e50f08fc3 So far so good... 2024-02-20 19:14:11 -05:00
Arthur
d166a1509d Starting over, beginning with cleaning up floorz/ceilingz functions 2024-02-20 18:57:37 -05:00
Alam Ed Arias
703ee972e6 Clean up stringop-truncation warnings 2024-02-20 16:30:15 -05:00
Alam Ed Arias
53d74e7f89 Clean up stringop-overflow=4 warnings 2024-02-20 13:17:50 -05:00
bitten2up
f61497eaa6
fix crash 2024-02-20 10:45:04 -06:00
256nil
18e7f0ee2d Fix #1188 2024-02-20 18:12:51 +02:00
spherallic
3165f8b792 Merge branch 'next' into quick-intro 2024-02-20 14:12:19 +01:00
Lactozilla
0292e0e1f6 Fix build error 2024-02-19 23:02:49 -03:00
Lactozilla
467cc59c64 Only I_Error in HWR_GetTexture with PARANOIA 2024-02-19 22:55:45 -03:00
Lactozilla
6cdaf24a27 Delete the last remnants of Doom Legacy's pic_t format 2024-02-19 21:57:10 -03:00
Lactozilla
fe2daf907b Make the display of palette index 255 consistent between renderers 2024-02-19 21:49:22 -03:00
Logan Aerl Arias
a8a92a57a7 Merge branch '1200-next-cannot-load-game-when-using-srb2-launcher' into 'next'
Do not alllow error codepaths of UPnP to leave the mutex locked

Closes #1200

See merge request STJr/SRB2!2349
2024-02-20 00:36:39 +00:00
Arthur
cf0834d917 Fix it the right way! 2024-02-19 19:16:38 -05:00
sphere
fed08744ba Revert "Merge branch 'issue1150' into 'next'"
This reverts merge request !2334
2024-02-19 23:50:56 +00:00
Alam Ed Arias
15b1842a6d Merge remote-tracking branch 'origin/1200-next-cannot-load-game-when-using-srb2-launcher' into 1200-next-cannot-load-game-when-using-srb2-launcher 2024-02-19 18:19:58 -05:00
Alam Ed Arias
11edc020ce i_tcp.c: do not alllow error codepaths of UPnP to leave the mutex locked 2024-02-19 18:19:28 -05:00
sphere
69757fb956 Merge branch 'fix-gl-shaders-colormap' into 'next'
Fix tint equation shader

See merge request STJr/SRB2!2348
2024-02-19 23:14:03 +00:00
sphere
00d057c1c2 Merge branch 'upnp-status-log-only' into 'next'
Print UPnP status to log file/external console only

See merge request STJr/SRB2!2347
2024-02-19 23:13:58 +00:00
sphere
2065cc1191 Merge branch 'issue1034' into 'next'
Cutscene timing fixed

See merge request STJr/SRB2!2344
2024-02-19 23:13:35 +00:00
Alam Ed Arias
9c5d470bef Merge branch 'master' into next 2024-02-19 18:07:54 -05:00
Lactozilla
7433137e98 Fix tint equation shader 2024-02-19 19:23:40 -03:00
Lactozilla
5a46f12c62 Merge branch 'next' into delete-unused-render-code 2024-02-19 19:20:48 -03:00
SteelT
802a1de11b Print UPnP status to log file/external console only
I don't think It's not really important enough that it's worth always notifying the user about it.
2024-02-19 17:11:05 -05:00
SSNTails
d4074e5d4e Merge branch SRB2:next into issue1034 2024-02-19 21:59:46 +00:00
Arthur
a9b003d35c If somebody's gonna watch the intro 50+ times, it's gonna be me. :) 2024-02-19 16:59:20 -05:00
SteelT
91980907b9 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into ogl-palette-rendering 2024-02-19 16:04:47 -05:00
sphere
7a3d88fcc6 Merge branch 'fix-translucent-pixels-on-transparent-pixels' into 'next'
Fix translucent pixels being visible on empty pixels

See merge request STJr/SRB2!2335
2024-02-19 13:35:13 +00:00
sphere
af08930232 Merge branch 'issue1150' into 'next'
Issue1150

See merge request STJr/SRB2!2334
2024-02-19 13:32:44 +00:00
SSNTails
372cbbc544 missing 'break' 2024-02-19 08:08:12 -05:00
SSNTails
34817d9776 Rollout rock handling with gravity boots 2024-02-18 22:38:34 -05:00
Lactozilla
07656de1d2 Delete old and unused rendering-related code
- Deleted view border code
- Deleted highcolor code
- Deleted pre-NEWCLIP code
- Deleted ylookup and columnofs
- Deleted the last remnants of con_clipviewtop and dc_hires
2024-02-18 22:11:22 -03:00
Logan Aerl Arias
9cf6432be2 Update p_map.c 2024-02-18 23:16:24 +00:00
Logan Aerl Arias
b3c3a45a6c Merge branch SRB2:next into fix-missing-mobjwasremoved-checks 2024-02-18 22:56:44 +00:00
Logan Aerl Arias
ae88c01f6e Merge branch SRB2:next into nonightsever 2024-02-18 19:58:36 +00:00
Arthur
8a823de013 Missed a few project settings previously for visual studio release mode. 2024-02-18 11:54:20 -05:00
spherallic
03c138b782 Merge branch 'next' into font_drawer 2024-02-18 17:43:39 +01:00
Arthur
73d354b956 Bring back WRITETHINGS, with custom filename and UDMF support! 2024-02-18 11:29:00 -05:00
sphere
6d645acbc8 Merge branch 'fix-1193' into 'next'
Fix #1193

Closes #1193

See merge request STJr/SRB2!2330
2024-02-18 14:42:42 +00:00
sphere
ada6c43c52 Merge branch 'issue1181' into 'next'
This was nothing more crazy than a buffer wraparound.

See merge request STJr/SRB2!2327
2024-02-18 14:40:25 +00:00
Zwip-Zwap Zapony
beb4bceff9 Even if they may not be used to "wallhack" per se, I agree that it'd be best to not allow them online. 2024-02-18 04:32:52 +00:00
Logan Aerl Arias
08f1349985 Merge branch 'next' into rendercvars 2024-02-17 23:21:23 -05:00
Arthur
f51f9f63f0 Update objectplace to ignore float argument and handle ZABSOLUTE 2024-02-17 22:48:31 -05:00
Logan Aerl Arias
a7d1d53778 Merge branch 'next' into playersetup-and-continue-lua 2024-02-17 22:17:50 -05:00
Logan Aerl Arias
e44d85a536 Merge branch SRB2:next into shield-gamepad-defaults 2024-02-18 02:43:46 +00:00
Logan Aerl Arias
ea4ad871b6 Merge branch 'fix-upnp-add' into 'next'
Fix UPnP port mapping not working

See merge request STJr/SRB2!2333
2024-02-18 01:22:25 +00:00
Logan Aerl Arias
cd04c90a8a Merge branch 'fix_softlock' into 'next'
dc_texheight must be (INT64) to prevent overflow and rendering softlock

See merge request STJr/SRB2!2323
2024-02-18 01:21:04 +00:00
Logan Aerl Arias
9fb7b9026e Merge branch 'rename-gr_allowclientshaders' into 'next'
Rename gr_allowclientshaders to gr_allowcustomshaders

See merge request STJr/SRB2!2319
2024-02-18 01:19:35 +00:00
Logan Aerl Arias
4109f7168b Merge branch 'fix-motd-not-being-sent' into 'next'
Fix MOTD not being sent to players on first join

Closes #1194

See merge request STJr/SRB2!2317
2024-02-18 01:14:13 +00:00
Logan Aerl Arias
585ec0752e Merge branch 'propercheats' into 'next'
Make the Cheats Command Reflect UsedCheats

See merge request STJr/SRB2!2160
2024-02-18 01:09:42 +00:00
Logan Aerl Arias
8bffe3e3a7 Merge branch 'fix-mobj-thinker-reference-corruption' into 'next'
Fix faulty references when spawning mobjs

See merge request STJr/SRB2!2126
2024-02-18 01:02:42 +00:00
Logan Aerl Arias
d895ff88f9 Update hw_batching.c
HWR_ProcessPolygon()'s shader parameter was renamed to shader_target
2024-02-17 19:53:25 -05:00
Logan Aerl Arias
9c85ccc820 Update hw_main.c
cv_fovchange was moved from hw_main.c to r_main.c
cv_glallowshaders was moved from hw_main.c to d_netcmd.c
2024-02-17 19:52:22 -05:00
Logan Aerl Arias
2d17c75165 Update r_defs.h
add back pic_t
2024-02-17 19:50:52 -05:00
Logan Aerl Arias
6763aaefff Merge branch 'next' into ogl-palette-rendering 2024-02-17 19:06:18 -05:00
Lactozilla
719169a625 R_GenerateTexture: Fix translucent pixels being visible on empty pixels 2024-02-17 16:51:16 -03:00
Arthur
d3d210b3ca Merge branch 'issue1150' of https://git.do.srb2.org/SSNTails/SRB2 into issue1150 2024-02-17 14:12:54 -05:00
Arthur
94c1ab7de2 Use floorz/ceilingz 2024-02-17 14:12:39 -05:00
SteelT
8962355d6c Fix UPnP port mapping not working
Despite UPNP_AddPortMapping returning sucess status, no port mapping would actually be added at all. And that's due to a memset call in the middle of the function.
Wiping the IGDdatas struct, moving the memset to the start of the function fixes it and a port mapping is actually created/removed when a server is started/stopped.
2024-02-17 13:04:29 -05:00
sphere
a5bf4a5b8f Merge branch 'fix-user-agent-string' into 'next'
Fix version text in UA string

See merge request STJr/SRB2!2324
2024-02-17 16:30:21 +00:00
Arthur
9a75ef18c3 Sometimes simple is better..? 2024-02-17 10:04:34 -05:00
Hanicef
487f4ef49f Fix addon loading issues with symlinks on Linux/*BSD 2024-02-17 11:07:38 +01:00
Lactozilla
6e109be076 Fix #1193 2024-02-17 04:00:27 -03:00
Logan Aerl Arias
cf5520b275 Merge branch SRB2:next into instant-setscale 2024-02-17 03:25:41 +00:00
Arthur
7c257dc765 This was nothing more crazy than a buffer wraparound. 2024-02-16 19:47:15 -05:00
SSNTails
a94a0b9a47 Don't forget to check for dead dontdrawforviewmobjs!! 2024-02-16 16:24:39 -05:00
Lactozilla
98ba396dbc Fix issues related to texture scaling 2024-02-16 17:28:55 -03:00
Lactozilla
3bcd19476c Fix version text in UA string 2024-02-16 16:46:42 -03:00
Arthur
532abf9279 dc_texheight must be (INT64) to prevent overflow and rendering softlock 2024-02-16 12:48:28 -05:00
Arthur
dc625496d8 re-introduce the thing == tmthing->target check, so it applies to non-players 2024-02-16 12:27:25 -05:00
Arthur
5e29cd84a2 Stash changes 2024-02-16 11:46:37 -05:00
Arthur
398b5a1840 P_PlayerCanHurtPlayer() 2024-02-15 23:00:35 -05:00
Hanicef
e74a819b68 Fix overshoot on credit text rendering 2024-02-15 23:05:03 +01:00
Hanicef
71ce173a0d Fix credit sequence not compensating for non-green resolutions 2024-02-15 22:03:28 +01:00
SteelT
8f9b57df0a Rename gr_allowclientshaders to gr_allowcustomshaders 2024-02-15 15:53:42 -05:00
SSNTails
7e880d7698 A little more elegance. 2024-02-15 15:22:33 -05:00
SSNTails
d8723c4b7f Don't forget about pushables! 2024-02-15 15:18:26 -05:00
SSNTails
f5829451a3 saving for later 2024-02-15 13:27:54 -05:00
Hanicef
de66e055a7 Fix keyboard input via console 2024-02-15 18:56:25 +01:00
Hanicef
6218f85658 Add I_GetSysName to dedicated build 2024-02-15 18:54:24 +01:00
Hanicef
27cf39dd54 Prevent recursion into quit functions 2024-02-15 18:54:24 +01:00
Alam Ed Arias
00d1cbfd2a Revert "Update dedicated.mk "
This reverts commit a5ef42476fa8b9d96509739be9b16528fce038f5.

Also, undo the DOS EOL
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
a44cb494a7 Update dedicated.mk
remove the need for libPNG in dedicated server build
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
ea66bffc6b made "Alpine 3 GCC Dedicated" build 2024-02-15 18:54:24 +01:00
Logan Aerl Arias
e5637e2946 change name of binary in dedicated server build to lsrb2d 2024-02-15 18:54:24 +01:00
Hanicef
c4b076ea1b Fix compiler warning on Windows 2024-02-15 18:54:24 +01:00
Hanicef
97abc19182 Pass -mconsole on MinGW build 2024-02-15 18:54:24 +01:00
Hanicef
41975f4f40 Force NOGME=1 on dedicated build 2024-02-15 18:54:24 +01:00
Hanicef
3ca9ce2842 Avoid needing SDL=0 when building dedicated 2024-02-15 18:54:24 +01:00
Hanicef
f2a9a81786 Fix Windows build 2024-02-15 18:54:24 +01:00
Gustaf Alhäll
28f196ad3e Fix potential deadlock when using cond 2024-02-15 18:54:24 +01:00
Gustaf Alhäll
77e83ddebb Add dedicated server build 2024-02-15 18:54:24 +01:00
SSNTails
fdb94b15ea Issue #1195 - Standing at a corner under steam, but far away enough to not be impacted by it, causes the player animation to reset for a tic 2024-02-15 12:42:31 -05:00
Hanicef
88bdc3e433 Fix MOTD not being sent to players on first join 2024-02-15 18:36:28 +01:00
spherallic
8bbdf1037f Merge branch 'next' into fruits-clipper 2024-02-15 16:36:35 +01:00
spherallic
b312377800 Clean up overzealous time check 2024-02-15 16:36:05 +01:00
Arthur
2db0dc3ad9 Zwip-Zwap's suggestion of checking for coop and types of bots 2024-02-15 10:32:21 -05:00
SSNTails
07678311d1 Missiles fired by player will not hit bots 2024-02-15 08:39:23 -05:00
Logan Aerl Arias
5a16fd138f fix path to x64 curl in VS project file
(edited by hand via WebIDE)
2024-02-14 23:53:13 +00:00
Arthur
0cb4a1397d Remove absolute paths 2024-02-14 18:04:58 -05:00
Arthur
99c91d4bb3 Visual Studio compiles again 2024-02-14 16:36:36 -05:00
Hanicef
493a7db1ee Fix thinker being added twice to mobj 2024-02-14 21:54:28 +01:00
Gustaf Alhäll
b808fde260 Fix broken titlescreen for MT_ALTVIEWMAN mobjs 2024-02-14 21:45:53 +01:00
Gustaf Alhäll
5c2821fb10 Fix faulty references when spawning mobjs 2024-02-14 21:45:52 +01:00
Alam Ed Arias
3a5c5410bf Merge branch SRB2:next into fix-command-line-input 2024-02-14 17:12:05 +00:00
SteelT
a9a1a4bf65 Fix FreeBSD memory reporting if built with cmake 2024-02-14 02:59:26 -05:00
SteelT
97afd18e96 Fix G_SaveGameData crash if quit early
Fixes a crash that can occur if data struct is passed to G_SaveGameData before it is allocated.
2024-02-14 02:27:58 -05:00
spherallic
f4588d50b0 Merge branch 'next' into fruits-clipper 2024-02-13 19:14:26 +01:00
sphere
ff851dcb44 Merge branch 'get-sys-name' into 'next'
Add common I_GetSysName function

See merge request STJr/SRB2!2308
2024-02-13 15:42:30 +00:00
sphere
2675441f74 Merge branch 'freeslot-double' into 'next'
Match mobj freeslot count with SRB2Kart

See merge request STJr/SRB2!2298
2024-02-13 15:34:44 +00:00
sphere
245a53b423 Merge branch 'fix-1190' into 'next'
Fix #1190

Closes #1190

See merge request STJr/SRB2!2310
2024-02-13 15:33:59 +00:00
sphere
eaab39bbaf Merge branch 'fix-searchblockmap' into 'next'
Fix Lua 'searchBlockmap' (resolves #1191)

Closes #1191

See merge request STJr/SRB2!2309
2024-02-13 15:32:41 +00:00
Logan Aerl Arias
ae8bfbe763 Merge branch '1168-accessing-an-invalid-variable-in-ticcmd_t-crashes-the-game' into 'next'
check if LUA field exists before accessing it

Closes #1168

See merge request STJr/SRB2!2261
2024-02-12 19:58:56 +00:00
Lactozilla
356e455335 Fix #1190 2024-02-12 16:58:00 -03:00
Lactozilla
a709ff9ecd Fix Lua 'searchBlockmap' 2024-02-12 16:28:32 -03:00
Logan Aerl Arias
3087107175 Merge branch 'shieldrespawn' into 'next'
Respawn Certain Monitors in Co-op

See merge request STJr/SRB2!2152
2024-02-12 05:46:25 +00:00
SMS Alfredo
2e7fa1990a Respawn Certain Monitors in Co-op 2024-02-12 05:46:25 +00:00
Logan Aerl Arias
2df90ec96b Merge branch SRB2:next into emblemexitfix 2024-02-12 05:09:04 +00:00
Logan Aerl Arias
bf9904cfc2 Merge branch 'fireflower-icon' into 'next'
Display power-up icon for Fire Flower

See merge request STJr/SRB2!2097
2024-02-12 05:04:57 +00:00
Logan Aerl Arias
6d0fef8726 Merge branch SRB2:next into nonightsever 2024-02-12 04:53:51 +00:00
Logan Aerl Arias
bf4efe968f Merge branch 'patch-refactor' into 'next'
Patch and texture refactor

See merge request STJr/SRB2!2104
2024-02-12 04:48:36 +00:00
SteelT
ddfb59d185 Add common I_GetSysName function
Replaces the OS defines in Command_Version_f() with a common function to fetch the system name the game is currently running on.
2024-02-11 23:31:34 -05:00
Zwip-Zwap Zapony
bdeec56270 Substitute MT_NULL with MT_RAY in Lua 2024-02-11 13:30:15 +01:00
Hanicef
634c972f6c Fix console not being blocked by IT_CV_STRING 2024-02-11 12:08:42 +01:00
Alam Ed Arias
ae25209cd1 r_draw.c: fix compiling with clang 2024-02-10 19:25:27 -05:00
sphere
58cf8293e3 Merge branch 'fix-nil-mo-spawnmobj-hook' into 'next'
Fix segfault when trying to access mo->player->mo from SpawnMobj hook

Closes #1189

See merge request STJr/SRB2!2300
2024-02-10 23:39:37 +00:00
Logan Aerl Arias
5e175a3438 add Visual Studio 2022 support (via CMAKE) 2024-02-10 14:34:03 -05:00
Logan Aerl Arias
da394a87dd add Visual Studio 2022 support (via CMAKE) 2024-02-10 19:29:48 +00:00
Hanicef
d0277b1799 fixup! Fix segfault when trying to access mo->player->mo from SpawnMobj hook 2024-02-10 20:19:45 +01:00
Hanicef
fe75a21bef Fix segfault when trying to access mo->player->mo from SpawnMobj hook 2024-02-10 19:40:27 +01:00