stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 05:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
15854 commits 173 branches 41 tags 182 MiB
Commit graph

14051 commits

Author SHA1 Message Date
Lactozilla
27e1ee710c Fix #1248 2024-05-19 15:28:55 -03:00
Sally Coolatta
619cf708a1 Fix composite "flats as patch" name overlap crash 2024-05-19 03:57:07 -04:00
Refrag
ccadfd8157
Fix mouse buttons not working in menus with alwaysgrabmouse on 
This commit fixes #1257 by reintroducing something left out in commit
9f116c7c9e. From my testing, it looks
look the behavior is the exact same regarding the lua hook script that
the original commit was fixing (#879).
 2024-05-19 09:08:00 +02:00
Lactozilla
d90c2ac4b4 Fix #1222 2024-05-19 01:43:02 -03:00
Lactozilla
b3418cd685 Fix #523 2024-05-19 01:29:54 -03:00
Lactozilla
c2b57e2654 Merge branch 'fffffop2' into 'next' 
Fix backwards compat for SPR2 Super (resolves #1225)

Closes #1225

See merge request STJr/SRB2!2410
 2024-05-14 02:07:11 +00:00
katsy
509df21f25 Fix backwards compat for SPR2 Super (resolves #1225) 2024-05-14 02:07:11 +00:00
Hanicef
c2e58b59a9 Fix other builds 2024-05-12 19:54:14 +02:00
Hanicef
911a351eb4 Fix keyboard input when certain keys overlap with dead keys 2024-05-12 19:44:37 +02:00
Hanicef
15bf00e5ba Fix buffer overflow when invoking MusicChange hook 2024-05-08 19:56:03 +02:00
Hanicef
df856aa823 Do not access memory on misaligned addresses 2024-05-07 18:10:31 +02:00
Zwip-Zwap Zapony
5db15ae943 Fix Ctrl+Backspace in the console causing a crash 
Also fix Ctrl+C / Ctrl+X emptying the clipboard without a text selection
 2024-05-05 17:03:42 +02:00
Lactozilla
da3355a153 Fix #1247 2024-05-04 03:39:41 -03:00
spherallic
efced4e763 Allow less than 3 emerald shards instead of crashing 2024-05-03 15:54:36 +02:00
Hanicef
c208921c4a Add tofixed lua function 2024-05-01 17:26:02 +02:00
katsy
b0f5255a0d Removed thokked when hitting springs 2024-04-28 17:10:34 -05:00
Hanicef
f8650a17a0 Fix aim in splitscreen 2024-04-28 16:21:48 +02:00
katsy
92cccd682c Fix automatic mode z-target bugs and crashes 2024-04-17 18:00:30 -05:00
LJ Sonic
b6544efceb Merge branch 'long-sprite-names' into 'next' 
Fix SOC freeslotting including trailing spaces in constant names

See merge request STJr/SRB2!2415
 2024-04-07 16:41:34 +00:00
LJ Sonic
829a12e7ac Fix SOC freeslotting including trailing spaces in constant names 2024-04-07 18:35:58 +02:00
Logan Aerl Arias
ef0fc97bc6 Merge branch SRB2:next into improve-backtrace 2024-04-06 17:59:52 +00:00
LJ Sonic
32a8652c35 Merge branch 'long-sprite-names' into 'next' 
Sprite names up to 64 character long and 256 frames per sprite

See merge request STJr/SRB2!2394
 2024-04-05 17:21:42 +00:00
LJ Sonic
4a9462761a Fix early free 2024-04-05 19:10:15 +02:00
LJ Sonic
a1649186ce Fix some error messages 2024-04-05 17:31:42 +02:00
Logan Aerl Arias
aab11cd873 reformat the compare func used in qsort 2024-04-03 18:42:36 -04:00
LJ Sonic
8a6b5d7c0f Support setting two frames per lump for long sprites 2024-04-04 00:06:33 +02:00
LJ Sonic
22106ef8b1 Fix short sprite names triggering an error 2024-04-03 23:24:54 +02:00
LJ Sonic
245a82112f Make rotation optional for long sprites 2024-04-03 22:39:58 +02:00
LJ Sonic
eaf0ba6658 Error out when a sprite definition contains a subfolder 2024-04-03 22:07:59 +02:00
LJ Sonic
32a3683e07 Fix error message when a patch is missing 2024-04-03 22:06:03 +02:00
LJ Sonic
f406e9bbb5 Throw a Lua error when R_Frame2Char is called with a frame number without character representation 2024-04-03 20:39:53 +02:00
Logan Aerl Arias
6c628db56a 1st try around sorting the lumps by name 2024-04-03 00:54:35 -04:00
Hanicef
2b9cfa8262 Fix crash when spawning a BOT_2PAI on a dedicated server 2024-03-31 18:27:57 +02:00
Hanicef
de74137cae Use float for calculating aspect ratio 2024-03-30 21:10:09 +01:00
Hanicef
755adb0c46 Fix vertical aim being off when using lack of perspective 2024-03-30 17:58:27 +01:00
Hanicef
fece34cef6 Fix segfault when passing a long string to v.drawString 2024-03-23 13:06:18 +01:00
Hanicef
d0dd329a82 Fix buffer overflow when loading addons through symlinks 2024-03-23 13:01:21 +01:00
Logan Aerl Arias
6b4dac7478 replace CPM with vcpkg 2024-03-23 04:50:19 +00:00
spherallic
dfecbe87b8 Fix FreeBSD build error 2024-03-21 19:30:45 +01:00
sphere
620f1e55aa Merge branch 'mpss-extratime' into 'next' 
Make Extra Time powerup work in old-style special stages

See merge request STJr/SRB2!2292
 2024-03-21 15:49:12 +00:00
sphere
31367e3e07 Merge branch 'mpss-mixnightscountdown' into 'next' 
Support LF_MIXNIGHTSCOUNTDOWN for old-style special stages

See merge request STJr/SRB2!2291
 2024-03-21 15:49:10 +00:00
sphere
7aa8477443 Merge branch 'fix-time-old-special-softlock' into 'next' 
Fix softlock on old special stages when running out of time due to being hit

See merge request STJr/SRB2!2398
 2024-03-21 15:46:26 +00:00
Alam Ed Arias
95457b8fe0 Fix stringop-truncation warnings for Debian Bookworm builds 2024-03-21 11:03:05 -04:00
Hanicef
d00c6a8ab9 Fix softlock on old special stages when running out of time due to being hit 2024-03-20 22:49:12 +01:00
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
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
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
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
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
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