stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-28 07:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity
14536 commits 173 branches 41 tags 186 MiB
Commit graph

12874 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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