Commit graph

13563 commits

Author SHA1 Message Date
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
Gustaf Alhäll
576262f6c5
Fix inaccuracies in FPS counter 2023-07-11 16:37:45 +02:00
AJ Martinez
2ebd3fcca4 Buffer ticcmds when receiving two on same tic 2023-07-10 15:40:20 -07:00
katsy
fa02931f97 actually, make all player stats precise 2023-07-08 16:14:37 -05:00
katsy
8cc0feb21d fix reading and writing of shieldscale and camerascale to record attack demos 2023-07-08 15:17:53 -05:00
Gustaf Alhäll
281e6012f3
Fix segfault when exiting game with automap open 2023-07-08 14:02:32 +02:00
Lactozilla
0aa763df85 Do music fade callback on main thread 2023-07-08 00:53:28 -03:00
Tatsuru
3ff9e908fe Signal handler minor refactor 2023-07-07 18:13:44 -03:00
Gustaf Alhäll
ecf0c4b45a
Fix segfault when calling P_RemoveMobj from MobjCollide hook 2023-07-07 21:35:41 +02:00
Ace Lite
372bb8b8fc [UDMF] Updated line sloping warning message 2023-07-06 19:27:32 +00:00
Ace Lite
2240742720 Merge branch SRB2:next into lua-texture-offsets-expose 2023-07-06 18:35:00 +00:00
Gustaf Alhäll
8d8257b4a6
Handle missing frames for sprite gracefully 2023-07-06 19:12:29 +02:00
spherallic
49528c1558 Remove generalized FOF type (linedef action 260) 2023-07-06 18:11:52 +02:00
spherallic
a4bcf4e2ce Do not consider 0 a valid executor tag for bosses 2023-07-06 18:06:23 +02:00
spherallic
8f75141c07 Give drop shadows to weapon rings & panels 2023-07-06 12:38:02 +02:00
MIDIMan
4342dacbdf Fix A_FishJump for custom objects in binary maps 2023-07-05 14:25:10 -04:00
sphere
d7a84b967c Merge branch 'strongpower' into 'next'
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately

See merge request STJr/SRB2!1366
2023-07-05 17:05:47 +00:00
katsy
f261b9f0e1 Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately 2023-07-05 17:05:47 +00:00
sphere
94f6fb03ca Merge branch 'cutscene-fix' into 'next'
[SUGOI] Remove "singletics" code in F_WriteText (resolves #1033)

Closes #1033

See merge request STJr/SRB2!2022
2023-07-05 11:41:21 +00:00
spherallic
ff7a24df09 Rename Kiwi skincolor to Pear 2023-07-05 12:10:30 +02:00
sphere
f13fddaf58 Merge branch 'fix-mobjinfo-custom-field' into 'next'
Fix Lua warning when accessing custom field on mobjinfo

Closes #1043

See merge request STJr/SRB2!2034
2023-07-04 21:03:53 +00:00
Gustaf Alhäll
09b9adc806
Fix Lua warning when accessing custom field on mobjinfo 2023-07-04 18:46:49 +02:00
Gustaf Alhäll
beda6109b2
Fix segfault when trying to set a read-only field on player_t 2023-07-03 23:30:49 +02:00
katsy
2c66f2ce27 Fix homing attack and ring attraction math dumbs 2023-07-03 16:27:07 -05:00
sphere
8ce0328423 Merge branch 'colors-ultimate' into 'next'
Colors Ultimate

Closes #745 and #496

See merge request STJr/SRB2!2027
2023-07-03 14:00:10 +00:00
SMS Alfredo
2647b10840 Require valid toucher.player 2023-07-01 22:24:11 -05:00
SMS Alfredo
8afe510034 Merge branch 'next' into expos-special 2023-06-30 16:17:34 -05:00
SMS Alfredo
9cd03c064d Merge branch 'next' into pit-savior 2023-06-30 16:16:24 -05:00
SMS Alfredo
ebdc36f56b Merge branch 'next' into awayview-fix 2023-06-30 16:13:15 -05:00
spherallic
cffce82371 Support FOF texture scaling in OpenGL 2023-06-29 14:19:16 +02:00
spherallic
cc852ef0fe Fix Y scaling on 2-sided midtextures in OpenGL 2023-06-29 11:46:12 +02:00
spherallic
cb30411e49 Fix broken two-sided midtextures in Software 2023-06-29 09:34:00 +02:00
spherallic
4c4584f9d1 Fix Y offsets on scaled textures in OpenGL 2023-06-28 21:04:34 +02:00
spherallic
5bee4e1cd8 Don't scale texture offsets in Software 2023-06-28 18:44:23 +02:00
MascaraSnake
84fe1dfc7d Texture scaling (incomplete) 2023-06-28 15:55:52 +02:00
MascaraSnake
8c31d279cf Implement per-texture offsets in UDMF 2023-06-28 01:07:52 +02:00
Zwip-Zwap Zapony
b405f50caa Fix A_ConnectToGround's handling of scaled mobjs 2023-06-24 19:35:57 +02:00
spherallic
867a5e0d47 Correct misplaced comment on NiGHTS link colors 2023-06-20 21:48:26 +02:00
spherallic
1a956667a7 Small tweak to Bubblegum 2023-06-20 20:06:43 +02:00
spherallic
b97f0a8643 Fix MT_NIGHTSCORE color cycling, using link colors 2023-06-20 20:06:43 +02:00
spherallic
73eb8fc358 A couple more changes:
- Swapped invcolors of new character skincolors
- Renamed Stone to Meteorite & changed text color to gray
- Tweaked some colors' invshades
2023-06-20 20:06:43 +02:00
spherallic
1bd593d173 Use extra colors for very high NiGHTS links, plus:
- Replaced Mindaro with Goldenrod
- Changed Topaz, and fixed inconsistency with its placement
- Small tweaks to Kiwi, Seafoam, Noble and Sangria
- Changed other NiGHTS link colors a little (& removed old iterations)
2023-06-20 20:06:43 +02:00
spherallic
70b69552f9 Add toggle for invcolor background, plus:
- Renamed Amethyst to Crystal
- Moved some of the new colors
- Tweaked a couple of invshades
2023-06-20 20:06:42 +02:00
spherallic
5e6850a7f7 Some more color tweaks:
- Added 6 new colors to match Chaos Emeralds
- Changed Taffy & Sapphire (3rd emerald)
- Renamed old Emerald to Shamrock
2023-06-20 20:06:42 +02:00
spherallic
853c9958d7 Remove unfinished sprite rotation 2023-06-20 20:06:42 +02:00
spherallic
c9b6693c76 Allow pausing & rotation of player sprites in player setup 2023-06-20 20:06:02 +02:00
spherallic
766c346df5 Add grid view for skincolors 2023-06-20 20:03:13 +02:00
spherallic
4cd85b5228 Support PgUp/PgDn for color select, similar to sound test & addons menu 2023-06-20 20:03:13 +02:00
spherallic
458b474645 Even more skincolor changes:
- Changed Bronze
- Added Boulder & Volcanic
- Tweaked Galaxy
2023-06-20 20:03:13 +02:00
Lach
647e6aac12 Simplify the way skincolors' invshades are used 2023-06-20 20:03:13 +02:00
spherallic
edbfb92b11 Correct tabs & spacing 2023-06-20 20:03:13 +02:00
spherallic
222e409cde More skincolor changes:
- Tweaked Bubblegum
- Added 8 new colors by Alice
- Added 22 new colors by sphere
2023-06-20 20:03:13 +02:00
Lach
bbe6c12323 Skincolor changes:
- Tweaked Orange and Cobalt
- Added Pepper, Jade, Headlight, Master, Mauve, and Taffy
- Fixed Mario mode invincibility color cycle
(Opposite color shades are placeholder for now)
2023-06-20 20:03:13 +02:00
sphere
f68006dbd3 Merge branch 'optimize-field-lookup' into 'next'
Optimize field lookups in Lua metatables

See merge request STJr/SRB2!2024
2023-06-19 22:41:36 +00:00
Gustaf Alhäll
17356f93bf
Fix segfault when ghost dies from a death pit 2023-06-19 22:19:39 +02:00
Gustaf Alhäll
2f2de7d3d3
Optimize field lookups in Lua metatables 2023-06-18 18:05:16 +02:00
spherallic
056d3dcf31 Actually clear options field properly 2023-06-14 13:19:47 +02:00
spherallic
90d95d1305 Clean options field of binary-converted things 2023-06-14 13:19:47 +02:00
spherallic
f416c6a98d Add absolute Z flag to MAPTHINGFLAG_LIST 2023-06-14 13:19:47 +02:00
spherallic
bed7e434e7 Add absolute z height flag for mapthings in UDMF 2023-06-14 13:19:47 +02:00
Sally Coolatta
5c3f66dc36 Remove "singletics" code in F_WriteText
This was added in 2.1 for whatever reason. All instances of F_WriteText are already capped to the framerate properly by other means; so this code being present just makes timing differences between different netgame clients / other inaccuracies cause the text speed to slow down more than intended.
2023-06-13 21:26:40 -04:00
Zwip-Zwap Zapony
f921a9987d Interpolate models when scaling mobjs 2023-06-13 19:07:03 +02:00
Zwip-Zwap Zapony
4d4910c918 Use 99999999 instead of 86400, make "MIN" 0
Nines might be more pleasing than an exact number for con_hudtime
It'd be bad to make "MIN" in an old config suddenly start displaying lines for con_hudlines
2023-06-13 14:02:19 +02:00
spherallic
37223f13f1 Remove debug print on generic item circle spawn 2023-06-13 10:38:44 +02:00
sphere
b8a25ae53c Add interpolation to hitbox viewer, tweak hitbox colors 2023-06-13 00:05:58 +00:00
spherallic
d8dd988451 Don't cancel P_LinedefExecute early 2023-06-13 02:01:11 +02:00
spherallic
d9937953ad Fix linedef type 319/320 again 2023-06-13 01:54:49 +02:00
spherallic
99f0933986 Change how SR_MainMenu is initialized. 2023-06-13 01:53:50 +02:00
spherallic
1cc870485d Increase unlockable limits:
- MAXUNLOCKABLES from 32 to 80
- MAXEXTRAEMBLEMS from 16 to 48
- COMPAT_GAMEDATA_ID is used to account for the old values to prevent
losing records.
- Also fixes linedef actions 319/320.
2023-06-13 01:53:50 +02:00
sphere
f1106236ad Merge branch 'sphere-fix' into 'next'
Fix Flung Spheres not using the Blue Sphere collection effect

See merge request STJr/SRB2!1995
2023-06-12 23:46:05 +00:00
sphere
9d0389811b Merge branch 'camrea-fiz' into 'next'
Fix Camera Interpolation Never Being Reset (Resolves #1026 and #976)

Closes #976 and #1026

See merge request STJr/SRB2!2008
2023-06-12 23:44:33 +00:00
sphere
c2c27bf356 Merge branch 'ipv6' into 'next'
Fix IPv6

See merge request STJr/SRB2!1612
2023-06-12 23:43:46 +00:00
sphere
5307c1635d Merge branch 'interpolate-maria' into 'next'
Interpolate Shadows when Scaling Mobjs

See merge request STJr/SRB2!1986
2023-06-12 23:39:23 +00:00
sphere
d5a3f10a4d Merge branch 'checksector-refactor' into 'next'
Refactor P_CheckSector

Closes #870

See merge request STJr/SRB2!1946
2023-06-12 23:36:48 +00:00
sphere
0dea372336 Merge branch 'the_elder_skyscroll' into 'next'
Rewrite F_SkyScroll to fix overflows

Closes #1008

See merge request STJr/SRB2!1985
2023-06-12 23:36:37 +00:00
sphere
62bdb7174b Merge branch 'lua-optimized-constants' into 'next'
Hannu's "LUA_EnumLib optimizations for constant value access" with fixed merge conflict

See merge request STJr/SRB2!2017
2023-06-12 23:03:51 +00:00
sphere
f7af77b932 Merge branch 'netgame-gamedata' into 'next'
[SUGOI] Multiplayer emblems

See merge request STJr/SRB2!1756
2023-06-12 22:48:25 +00:00
katsy
ca11180976 Merge remote-tracking branch 'stjr/next' into lua-optimized-constants 2023-06-11 12:36:08 -05:00
SMS Alfredo
826a70323c LUA_HookFollowMobj instead of LUAh_FollowMobj 2023-06-09 13:04:01 -05:00
sphere
363faed8d7 Merge branch 'sucky-steps' into 'next'
Port increment_move radius clamps from Ring Racers

See merge request STJr/SRB2!2013
2023-06-09 13:07:07 +00:00
sphere
65e1f88c75 Merge branch 'nightspowerhud' into 'next'
Add HUD icons for timed NiGHTS powerups

See merge request STJr/SRB2!1949
2023-06-09 11:34:25 +00:00
sphere
cd1b57a901 Merge branch 'textcolortweaks' into 'next'
Small text colormap tweaks

See merge request STJr/SRB2!1971
2023-06-09 11:33:26 +00:00
Sally Coolatta
7fa7653494 Port increment_move radius clamps from Ring Racers
Fixes inconsistencies with thin players, like with Liftoff Gantry's scale section, and with large characters colliding with steep slopes instead of going up them.
2023-06-05 13:54:09 -04:00
SMS Alfredo
aa43aa7c8c Call P_ResetCamera Upon Switching To/From an Away View Camera 2023-06-03 15:43:58 -05:00
Gustaf Alhäll
7c75f61be7
Fix buffer overflow when displaying a scrolling background 2023-06-03 13:05:33 +02:00
SMS Alfredo
a0c7c08bb7 Expose camera->reset to Lua 2023-06-03 00:40:12 -05:00
SMS Alfredo
610effb8ea Expose P_ResetCamera to Lua 2023-06-02 23:04:18 -05:00
SMS Alfredo
35b676e313 Fix Camera Interpolation Not Being Reset 2023-06-02 19:52:03 -05:00
Gustaf Alhäll
8919b35b93
Fix buffer overflow when linedef type 415 executes 2023-06-02 22:19:30 +02:00
Sally Coolatta
e06956a53b Fix skin-only emblems on emblem radar 2023-06-02 16:06:51 -04:00
Sally Coolatta
cf228757a1 Emblems disappear on collection again, only for SP 2023-06-02 16:06:50 -04:00
Sally Coolatta
645dd7d662 Stop endlessly chasing NIGHTSPULL emblems 2023-06-02 16:06:50 -04:00
Sally Coolatta
c1e641be43 Improve emblem sharing conditions 2023-06-02 16:06:50 -04:00
Sally Coolatta
29f55471dd Fix instances reverted to old unlocked variable 2023-06-02 16:06:50 -04:00
Sally Coolatta
d751ad5cf2 Remove "Multiplayer games can't unlock extras!" 2023-06-02 16:06:49 -04:00
Sally Coolatta
9cce2195d4 Make ShareEmblems more Top Down style 2023-06-02 16:06:49 -04:00
Sally Coolatta
3b15d9b4fe Make the level select behave more identically to G_LoadGame
Noticed some oddities with D_MapChange here with very rarely not changing player position when the map is loaded.
2023-06-02 16:06:49 -04:00
Sally Coolatta
d8f6ad217c Don't give completion emblems when getting a game over in multiplayer (or any other kind of level reset) 2023-06-02 16:06:48 -04:00
Sally Coolatta
897b81b840 Don't load game from pause level select without save slot 2023-06-02 16:06:48 -04:00
Sally Coolatta
9b6a47783d Show the level select option used to start the level in the pause menu.
Previously, level select only appeared in the SP pause menu if you load a complete save file.

Now, entering the game through an Extras menu level select shows that level select. Simply makes it more convenient, as you don't need to exit to the main menu again whenever you want to get to another level from an unlocked level select.

Tested all ways you can start a new map from the menu that I can think of (New Save File, Complete Save File, Mid-game Save File, several different Level Select types, custom Warp, Record Attack, Marathon, Tutorial), and could not smuggle wrong level selects into any.
2023-06-02 16:06:47 -04:00
Sally Coolatta
903a47966d Swap hints & level select on multiplayer pause menu
This makes it consistent with SP's pause menu order. (Although admittedly I prefer how the other order looks.)
2023-06-02 16:06:47 -04:00
Sally Coolatta
bc00b13358 Fix Emblem Radar detecting already collected emblems 2023-06-02 16:06:47 -04:00
Sally Coolatta
cb54b1e5ce Fix check that does LevelEmblems but not CompletionEmblems on startup 2023-06-02 16:06:46 -04:00
Sally Coolatta
87e468f365 Allow emerald hunt radar to function if emblem radar is on but all emblems have been collected. 2023-06-02 16:06:46 -04:00
Sally Coolatta
fb5b8ce1be Show tab emblems in Coop 2023-06-02 16:06:46 -04:00
Sally Coolatta
122ddade61 Draw level stats on pause & emblem hints menus in multiplayer 2023-06-02 16:06:46 -04:00
Sally Coolatta
ffe591afee Tie emblem spawning to Coop gametypes 2023-06-02 16:06:45 -04:00
Sally Coolatta
ffb76334ff Don't check time attack emblems in multiplayer
(Maybe some day...)
2023-06-02 16:06:45 -04:00
Sally Coolatta
30f6ae6e56 Add read access to shareEmblems (as well as a few other MAINCFG variables that weren't) 2023-06-02 16:06:44 -04:00
Sally Coolatta
d7c5e16f6c Play sound globally if emblems are shared 2023-06-02 16:06:44 -04:00
Sally Coolatta
29c61fac88 Allow completion emblems in multiplayer 2023-06-02 16:06:44 -04:00
Sally Coolatta
303d636f8e Individual emblems mode 2023-06-02 16:06:43 -04:00
Sally Coolatta
49fa46d80e Online emblems
Currently, emblems share with everyone. Will add an option to toggle this.
2023-06-02 16:06:43 -04:00
SteelT
1d9bcad797 Merge branch 'next' into ipv6 2023-06-02 14:09:13 -04:00
SMS Alfredo
88a088a561 Remove Redundant Pit Checks 2023-06-01 00:25:14 -05:00
SMS Alfredo
2ce0c248ed Make Dead / NoClipHeight Objects Immune to Death Pits 2023-05-31 23:55:03 -05:00
SMS Alfredo
7a7cee7ca5 Expose P_CheckSkyHit to Lua 2023-05-31 23:03:22 -05:00
SMS Alfredo
34477133cc Expose P_DoSpinDashDust to Lua 2023-05-31 22:49:30 -05:00
SMS Alfredo
e65bdf8d2f Expose P_IsLocalPlayer to Lua 2023-05-31 22:45:00 -05:00
SMS Alfredo
84438ff837 Expose P_GivePlayerSpheres to Lua 2023-05-31 22:39:08 -05:00
SMS Alfredo
58b3b8e075 Fix Flung Spheres not using the Blue Sphere collection effect 2023-05-31 22:33:16 -05:00
SMS Alfredo
16e44e1b6e Expose FollowMobj-related functions 2023-05-31 22:28:53 -05:00
SMS Alfredo
39869b4492 Expose P_TouchSpecialThing 2023-05-31 22:21:31 -05:00
Zwip-Zwap Zapony
05f1a9a2c8 Suppress libdivide warnings in GCC/Clang 2023-05-29 14:38:22 +02:00
Zwip-Zwap Zapony
ba014b84a7 Rewrite M_DrawStaticBox 2023-05-28 22:56:18 +02:00
sphere
d6d424f102 Merge branch 'fix-remove-facetarget-action' into 'next'
Fix segfault when P_RemoveMobj is called within A_FaceTarget action

See merge request STJr/SRB2!1974
2023-05-26 01:15:40 +00:00
spherallic
264ec02223 Merge branch 'next' into bbox 2023-05-26 03:06:30 +02:00
sphere
369d39a859 Merge branch 'stuckonyou' into 'next'
Allow targeting invulnerable bosses & don't break targeting when they take damage

See merge request STJr/SRB2!1917
2023-05-25 23:48:56 +00:00
sphere
38575f52e6 Merge branch 'scoreattacked' into 'next'
Reallow score chains from rolling

See merge request STJr/SRB2!1833
2023-05-25 22:48:31 +00:00
sphere
c37af2bf78 Merge branch 'uncap-console' into 'next'
Interpolate console animation, Make con_height update on the fly

Closes #905

See merge request STJr/SRB2!1878
2023-05-25 22:36:24 +00:00
sphere
796c06e2f7 Merge branch 'issue834' into 'next'
When attaching to a wall to do a climb, the second sidedef wasn't be handled properly.

Closes #834

See merge request STJr/SRB2!1908
2023-05-25 21:11:25 +00:00
sphere
1043a523d8 Merge branch 'fix-crushclaw-armageddon-hit' into 'next'
Fix segfault when Crushstaceans hit a player with Armageddon shield

See merge request STJr/SRB2!1980
2023-05-25 21:10:45 +00:00
sphere
19de187b02 Merge branch 'fix-getfreemem' into 'next'
Fix I_GetFreeMem for 64-bit platforms

See merge request STJr/SRB2!1982
2023-05-25 21:10:02 +00:00
sphere
5fe6138f7f Merge branch 'fix-removed-shield-segfault' into 'next'
Fix segfault when shields are removed after thinking

See merge request STJr/SRB2!1975
2023-05-25 21:06:40 +00:00
sphere
89ce385fb9 Merge branch 'fix-null-standingslope' into 'next'
Fix segfault when going up steep slopes in rare cases

See merge request STJr/SRB2!1978
2023-05-25 21:06:00 +00:00
sphere
cb3acbc701 Merge branch 'fixlightleveldecrease' into 'next'
Fix linedef action 420 being unable to lower light levels properly by default

See merge request STJr/SRB2!1977
2023-05-25 21:03:40 +00:00
sphere
1a0c931053 Merge branch 'nobombsphereattract' into 'next'
Don't attract bomb spheres with Attraction shield

See merge request STJr/SRB2!1953
2023-05-25 21:02:48 +00:00
sphere
cf0c5f9084 Merge branch 'midsave-addons' into 'next'
Allow Cosmetic Add-Ons Mid-Save

Closes #911

See merge request STJr/SRB2!1877
2023-05-25 21:01:30 +00:00
sphere
777a1c6b83 Merge branch 'plane-scroller-tweaks-again' into 'next'
Plane scroller & wind/current/pusher improvements (again)

See merge request STJr/SRB2!1811
2023-05-25 21:00:30 +00:00
sphere
ce504d4e8e Merge branch 'mobj-dispoffset' into 'next'
Turn dispoffset into a mobj field

See merge request STJr/SRB2!1708
2023-05-25 20:59:43 +00:00
Zwip-Zwap Zapony
3f5e7ff0d0 Interpolate shadows when scaling mobjs 2023-05-25 15:09:53 +02:00
Zwip-Zwap Zapony
b2313aa4bd Rewrite F_SkyScroll to fix overflows 2023-05-25 14:55:21 +02:00
MascaraSnake
55d96daa28 Merge branch 'refresh-spr2' into 'next'
[SUGOI] Refresh Sprite2s

See merge request STJr/SRB2!1750
2023-05-24 05:04:31 +00:00
MascaraSnake
e4933b3e94 Merge branch 'allow-modified-saving' into 'next'
[SUGOI] Allow saving in modified games.

See merge request STJr/SRB2!1749
2023-05-24 05:04:26 +00:00
Gustaf Alhäll
afe8432c1e
fixup! fixup! fixup! Implement support for native keyboard layout 2023-05-23 17:41:10 +02:00
Gustaf Alhäll
b8f8cc1451
fixup! fixup! Implement support for native keyboard layout 2023-05-23 17:40:13 +02:00
Gustaf Alhäll
6896080f4f
fixup! Implement support for native keyboard layout 2023-05-23 17:40:13 +02:00
Gustaf Alhäll
95d7a486ee
Implement support for native keyboard layout 2023-05-23 17:40:09 +02:00
Jaime Ita Passos
7dc74fc364 Fix declaration of I_GetFreeMem in src/dummy/i_system.c 2023-05-19 15:12:20 -03:00
Jaime Ita Passos
2f98cd3b97 Fix I_GetFreeMem 2023-05-19 14:26:30 -03:00
Gustaf Alhäll
d4951f7cdd
Fix segfault when Crushstaceans hit a player with Armageddon shield 2023-05-16 22:18:11 +02:00
Gustaf Alhäll
6bb3ee226f
Fix segfault when going up steep slopes in rare cases 2023-05-16 19:34:22 +02:00
spherallic
2c689bae52 2.2.11 2023-05-16 18:20:15 +02:00
spherallic
e086d57421 Merge branch 'next' into public_next 2023-05-16 17:57:11 +02:00
spherallic
b487a71533 Fix light fades being unable to lower light levels 2023-05-14 16:26:34 +02:00
Sara Sparks
37ab3e84fc Increase size of filename buffer 2023-05-08 21:36:38 -04:00
Sara Sparks
aa952051fd Made filesearch aware of symbolic links
(cherry picked from commit cbcbda1586d5a19cf17aabedb49bca3e5328fa4f)
2023-05-07 23:09:32 -04:00
spherallic
b99ecde7b8 Fix [BOT] indicator color not being cleared 2023-05-07 17:42:39 +02:00
spherallic
ed46dd08a6 Prevent tmthing crash with P_SpawnParaloop in Lua 2023-05-07 17:33:12 +02:00
Gustaf Alhäll
03971f58a9
Fix segfault when shields are removed after thinking 2023-05-04 22:42:51 +02:00
spherallic
f1147618d0 Merge branch 'next' into public_next 2023-05-04 15:46:02 +02:00
sphere
62deaaadb4 Merge branch 'issue704' into 'next'
Fixes issue #704 and #618

Closes #618 and #704

See merge request STJr/SRB2!1912
2023-05-01 21:28:37 +00:00
sphere
ae0afe0361 Merge branch 'precutfls' into 'next'
Don't force fromlevelselect to be false after a pre-map cutscene

Closes #1003

See merge request STJr/SRB2!1972
2023-05-01 21:20:24 +00:00
sphere
ccec739860 Merge branch 'pointy-think-crash-fix' into 'next'
A_PointyThink crash fix (patch from #827)

See merge request STJr/SRB2!1970
2023-05-01 21:18:40 +00:00
sphere
eabfadfdf7 Merge branch 'dedicatedemeraldbounce' into 'next'
Skip emerald bounce logic in intermission ticker on dedicated

See merge request STJr/SRB2!1969
2023-05-01 21:17:46 +00:00
sphere
f83f1a1229 Merge branch 'fix-mobj-damage-null-pain-state' into 'next'
Fix segfault when damaging mobj with no painstate

See merge request STJr/SRB2!1968
2023-05-01 21:17:35 +00:00
sphere
5995c100b6 Merge branch 'fix-remove-source-damage' into 'next'
Fix segfault when removing source from ShouldDamage

See merge request STJr/SRB2!1967
2023-05-01 21:17:01 +00:00
sphere
a78922d022 Merge branch 'first-overlay-remove-fix' into 'next'
Fix segfault when first mobj in overlaycap is removed

See merge request STJr/SRB2!1963
2023-05-01 21:16:32 +00:00
Gustaf Alhäll
901c7362ed
Fix segfault when P_RemoveMobj is called within A_FaceTarget action 2023-04-30 14:05:10 +02:00
Gustaf Alhäll
4967c296ab
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook 2023-04-30 12:43:31 +02:00
spherallic
d6cafea571 Don't force FLS to false after a pre-map cutscene 2023-04-28 15:30:02 +02:00
spherallic
98dcf2d228 Tweak yellow/green/blue/red/peridot text colors 2023-04-24 23:23:47 +02:00
SteelT
2d3153079b A_PointyThink crash fix (patch from #827)
Fixes A_PointyThink crashing in certain scenarios
2023-04-22 17:02:06 -04:00
spherallic
c2c430853c If Lua disabled intermission emeralds, skip sounds 2023-04-19 20:17:50 +02:00
spherallic
6ff37b47d9 Skip emerald bounce logic in Y_Ticker on dedicated 2023-04-19 12:13:29 +02:00
spherallic
e5a1fee759 Adjust default look/turn axis for new SDL2 version 2023-04-19 00:21:10 +02:00
Gustaf Alhäll
ad412c9700
Fix segfault when damaging mobj with no painstate 2023-04-18 22:08:26 +02:00
Gustaf Alhäll
072dd2eda7
Fix segfault when removing source from ShouldDamage 2023-04-18 20:46:13 +02:00
spherallic
3135cd37e6 Merge branch 'next' into public_next 2023-04-18 02:05:19 +02:00
spherallic
e4f92cc667 Always important 2023-04-18 02:04:23 +02:00
sphere
57b0dfcfac Merge branch 'nobotcamerareset' into 'next'
Don't call P_ResetCamera when spawning a bot

Closes #971

See merge request STJr/SRB2!1966
2023-04-18 00:01:04 +00:00
spherallic
930b1355ed Don't call P_ResetCamera when spawning a bot 2023-04-14 12:03:21 +02:00
spherallic
c61594931d Fix titlecard hook being inconsistent on map load 2023-04-14 00:28:14 +02:00
Gustaf Alhäll
cfb40d4213
Fix crash in R_PointToDist2 when passing -2147483648 2023-04-13 19:28:54 +02:00
spherallic
488f0fdfab bruh 2023-04-12 20:06:02 +02:00
spherallic
9499cb5409 Merge branch 'next' into public_next 2023-04-12 19:51:17 +02:00
sphere
2df3fb53da Merge branch 'strong-lua-command-restrictions' into 'next'
Fix up Lua command/cvar safety

See merge request STJr/SRB2!1943
2023-04-12 17:50:01 +00:00
MascaraSnake
6258f14bab Merge branch 'setcontrol-buffer-overflow' into 'next'
Fix buffer overflow in setcontrol with 2 arguments

See merge request STJr/SRB2!1954
2023-04-12 09:20:33 +00:00
MascaraSnake
4f8625ef76 Merge branch 'metal-sonic-use-after-free' into 'next'
Fix use-after-free when Metal Sonic charges energy balls

See merge request STJr/SRB2!1956
2023-04-12 09:20:00 +00:00
MascaraSnake
d6375b1e18 Merge branch 'fix-wallspike-segfault' into 'next'
Fix segfault when destroying wall spike while it moves

See merge request STJr/SRB2!1959
2023-04-12 09:19:50 +00:00
MascaraSnake
29582e453d Merge branch 'ptera-escape-bad-state' into 'next'
Fix crash during debug when escaping pterabyte

See merge request STJr/SRB2!1960
2023-04-12 09:19:40 +00:00
MascaraSnake
efee750874 Merge branch 'mapheader-alloc-fix' into 'next'
Fix R_SkinUsable crashes in (some) custom addons

Closes #994

See merge request STJr/SRB2!1962
2023-04-12 08:01:50 +00:00
MascaraSnake
9e8200c1e3 Merge branch 'ambient-sound-fix' into 'next'
Fix custom ambient sound mobjs not working

See merge request STJr/SRB2!1961
2023-04-12 08:01:38 +00:00
spherallic
4b6de096e5 Define cv_addons_folder in dedicated 2023-04-12 00:59:08 +02:00
Gustaf Alhäll
cf67ba1d01
fixup! Fix segfault when killing wall spike while it moves 2023-04-11 22:51:18 +02:00
Gustaf Alhäll
cb849ca4f0
Fix segfault when first mobj in overlaycap is removed 2023-04-11 22:13:29 +02:00
MascaraSnake
8486bd083a R_SkinUsable: Only check header of current map if one exists 2023-04-11 19:13:30 +02:00
MascaraSnake
846cf71e6a F_StartTitleScreen: Make sure the level header for gamemap always exists 2023-04-11 18:48:23 +02:00
MascaraSnake
1cd5e10ab0 Fix custom ambient sound mobjs not working 2023-04-11 16:19:27 +02:00
Gustaf Alhäll
4c02bde4e9
Fix crash during debug when escaping pterabyte 2023-04-10 18:31:12 +02:00
Gustaf Alhäll
8b77af7378
Fix segfault when killing wall spike while it moves 2023-04-10 14:55:19 +02:00
MascaraSnake
16ad23f06d Fix flag mixup in P_GetOldFOFFlags() 2023-04-10 14:08:53 +02:00
Gustaf Alhäll
8218ce0fe2
Fix use-after-free when Metal Sonic charges energy balls 2023-04-07 14:49:31 +02:00
spherallic
c907c20480 Do not apply pmomz when jumping through a platform 2023-04-05 23:59:37 +02:00
Gustaf Alhäll
2e3963fd16
Fix buffer overflow for setcontrol with 2 arguments 2023-04-02 21:58:42 +02:00
spherallic
9d6456c326 Merge branch 'next' into public_next 2023-04-02 19:33:16 +02:00
sphere
3c81938496 Merge branch 'io-limit' into 'next'
Add basic rate limitation for Lua file access

See merge request STJr/SRB2!1947
2023-03-31 16:13:42 +00:00
sphere
3f499178b0 Merge branch 'forceverticalflipflag' into 'next'
Add flag to action 433 to force MFE_VERTICALFLIP

See merge request STJr/SRB2!1948
2023-03-31 16:13:23 +00:00
sphere
e82bb933e7 Merge branch 'botchanges' into 'next'
Bot adjustments

See merge request STJr/SRB2!1951
2023-03-31 16:13:05 +00:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
spherallic
91ef59f76b Fix tiny regression with special stage tally 2023-03-31 13:36:54 +02:00
spherallic
498c9da859 Don't attract bomb spheres with Attraction shield 2023-03-29 16:41:45 +02:00
spherallic
540c5d6cc0 Add flag to action 433 to force MFE_VERTICALFLIP 2023-03-20 15:46:15 +01:00
LJ Sonic
0f9c5582a3 Add basic rate limitation for Lua file access 2023-03-19 14:52:12 +01:00
LJ Sonic
62aef145f5 Fix time functions not starting from zero 2023-03-19 14:44:18 +01:00
MascaraSnake
fff6683173 Clean up PIT_ChangeSector 2023-03-16 20:38:28 +01:00
MascaraSnake
afa1a9ab6a Split P_CheckSector further 2023-03-16 20:03:42 +01:00
MascaraSnake
411b79e456 P_CheckSector: Remove unnecessary static variables 2023-03-16 19:38:30 +01:00
MascaraSnake
0667bf74fe Remove duplicated code in P_CheckSector 2023-03-16 19:30:21 +01:00
MascaraSnake
1304874a8f Remove incorrect early returns in P_CheckSector 2023-03-16 19:17:42 +01:00
spherallic
1a6e48de1e Update mobj floorz/ceilingz after FOF destruction 2023-03-16 12:12:58 +01:00
James R
07e4497320 Add COM_LUA to a bunch of commands
These commands be run from Lua:

- add
- addfile
- addfolder
- archivetest
- ban
- banip
- causecfail
- cecho
- cechoduration
- cechoflags
- changeteam
- changeteam2
- charability
- charspeed
- cheats
- clearbans
- clearscores
- connect
- countmobjs
- csay
- demote
- devmode
- displayplayer
- downloads
- drop
- droprate
- dumplua
- echo
- exitgame
- exitlevel
- gametype
- getallemeralds
- getplayernum
- god
- gravflip
- help
- hurtme
- isgamemodified
- jumptoaxis
- kick
- listwad
- login
- manual
- map
- mapmd5
- masterserver_update
- memdump
- memfree
- mod_details
- motd
- noclip
- nodes
- notarget
- numnodes
- numthinkers
- objectplace
- password
- pause
- ping
- playintro
- promote
- quit
- reloadbans
- resendgamestate
- resetcamera
- resetemeralds
- restartaudio
- retry
- rteleport
- runsoc
- savecheckpoint
- say
- sayteam
- sayto
- scale
- screenshot
- serverchangeteam
- setcontinues
- setlives
- setrings
- showbanlist
- showmap
- showscores
- showtime
- skynum
- startmovie
- stopdemo
- stopmovie
- suicide
- teleport
- toggle
- togglemodified
- toggletwod
- tunes
- version
- vid_info
- vid_modelist
- vid_nummodes
- weather
2023-03-15 17:22:56 -07:00
James R
49f1462f75 Only let Lua run commands registered with COM_LUA 2023-03-15 16:40:21 -07:00
James R
8a6f2e568b Add a flags parameter to COM_AddCommand 2023-03-15 16:40:21 -07:00
James R
0405df1a47 Merge COM_SAFE with other COM flags
Renames COM_SAFE to COM_LUA.
2023-03-15 16:40:21 -07:00
James R
ff0f6e9b74 Add CV_ALLOWLUA to a bunch of cvars
These cvars can be modified by Lua.

- advancemap
- allowexitlevel
- allowjoin
- allowmlook
- allowseenames
- allowteamchange
- autobalance
- basenumlaps
- cam2_adjust
- cam2_centertoggle
- cam2_curdist
- cam2_curheight
- cam2_dist
- cam2_height
- cam2_lockaimassist
- cam2_lockedinput
- cam2_orbit
- cam2_rotate
- cam2_rotspeed
- cam2_shiftfacingchar
- cam2_simpledist
- cam2_simpleheight
- cam2_speed
- cam2_still
- cam2_turnfacingability
- cam2_turnfacingchar
- cam2_turnfacinginput
- cam2_turnfacingspindash
- cam2_turnmultiplier
- cam_adjust
- cam_centertoggle
- cam_curdist
- cam_curheight
- cam_dist
- cam_height
- cam_lockaimassist
- cam_lockedinput
- cam_orbit
- cam_rotate
- cam_rotspeed
- cam_shiftfacingchar
- cam_simpledist
- cam_simpleheight
- cam_speed
- cam_still
- cam_turnfacingability
- cam_turnfacingchar
- cam_turnfacinginput
- cam_turnfacingspindash
- cam_turnmultiplier
- color
- color2
- competitionboxes
- cooplives
- coopstarposts
- countdowntime
- exitmove
- flagtime
- forceskin
- friendlyfire
- gravity
- hidetime
- inttime
- itemfinder
- killingdead
- matchboxes
- maxplayers
- mute
- numlaps
- overtime
- pausepermission
- playersforexit
- pointlimit
- powerstones
- respawndelay
- respawnitem
- respawnitemtime
- restrictskinchange
- ringslinger
- runscripts
- scrambleonchange
- seenames
- servername
- showhud
- showinputjoy
- skin
- skin2
- specialrings
- startinglives
- tailspickup
- teamscramble
- timelimit
- touchtag
- tv_1up
- tv_bombshield
- tv_eggman
- tv_forceshield
- tv_invincibility
- tv_jumpshield
- tv_recycler
- tv_ringshield
- tv_superring
- tv_supersneaker
- tv_teleporter
- tv_watershield
2023-03-15 16:40:21 -07:00
James R
15e3d0e667 Fix toggle command and add command being able to bypass Lua restriction 2023-03-15 16:40:21 -07:00
James R
5d08bfd706 Rename CV_NOLUA to CV_ALLOWLUA, opt IN to Lua mutability 2023-03-15 16:40:21 -07:00
James R
a39f69c9c7 Reset com_flags at end of COM_BufExecute
Fixes com_flags being discarded after the first command in
a chain (semicolon list).
2023-03-15 16:40:21 -07:00
James R
e48786961a exec: pass on com_flags 2023-03-15 16:40:21 -07:00
James R
db4de0f50e sdl/i_video.c: fix compile prior to SDL 2.0.18 2023-03-15 16:39:53 -07:00
Tatsuru
2a50626b00 Initial commit 2023-03-15 17:50:13 -03:00
spherallic
b184067048 Add HUD icons for timed NiGHTS powerups 2023-03-14 14:19:53 +01:00
LJ Sonic
404492cb30 Merge branch 'floorspriteslope-interp-disable' into 'next'
Disable floor splat slope interpolation

See merge request STJr/SRB2!1934
2023-03-13 18:28:31 +00:00
LJ Sonic
ac4d89e4d8 Merge branch 'sw-vsync-fix' into 'next'
Fix software vsync

See merge request STJr/SRB2!1940
2023-03-13 18:28:28 +00:00
spherallic
a95f5ba7ea Merge branch 'next' into public_next 2023-03-13 12:03:24 +01:00
spherallic
57148ef9c2 Fix Explosion Ring explosion interpolation 2023-03-02 18:10:47 +01:00
spherallic
94396a9f9d Merge branch 'next' into fullscreen-toggle 2023-03-02 12:14:42 +01:00
MascaraSnake
b5c3b30f13 Merge branch 'fix-wnon-literal-null-conversion-and-wconstant-conversion' into 'next'
Fix -Wnon-literal-null-conversion and -Wconstant-conversion warnings

See merge request STJr/SRB2!1929
2023-03-02 09:12:24 +00:00
Monster Iestyn
851ca92aaa revert Eidolon's edits for testing the IT/CTF flag sign fixes, they were left in by mistake 2023-02-28 17:51:26 +00:00
Eidolon
a308ad1119 Merge branch 'ctf-interpolation' into 'next'
Fix IT and ctf flag sign interpolation

See merge request STJr/SRB2!1939
2023-02-28 15:43:36 +00:00
sphere
171f5ac21c Merge branch 'ambush-fix' into 'next'
Re-add code that sets MF2_AMBUSH if MTF_AMBUSH is set, but only for binary maps

Closes #958

See merge request STJr/SRB2!1937
2023-02-28 13:59:38 +00:00
sphere
b4e1f2d4ff Merge branch 'udmf-defaults' into 'next'
Linedef type 14 UDMF conversion: Don't fill stringargs[0] if toptexture is empty

Closes #973

See merge request STJr/SRB2!1936
2023-02-28 13:59:35 +00:00
sphere
684566ebc4 Merge branch 'emblem-fix' into 'next'
Move emblem float option to args[1], since args[0] is already occupied for NiGHTS emblems

Closes #963

See merge request STJr/SRB2!1935
2023-02-28 13:59:32 +00:00
sphere
51d32f87ba Merge branch 'deprecation-warnings' into 'next'
Deprecated map effect stuff

Closes #956

See merge request STJr/SRB2!1933
2023-02-28 13:59:30 +00:00
sphere
89e7ef16cc Merge branch 'issue711' into 'next'
Fixes Issue #711

See merge request STJr/SRB2!1907
2023-02-28 13:51:35 +00:00
Eidolon
c42ef9f1be Fix IT and ctf flag sign interpolation 2023-02-27 18:28:34 -06:00
sphere
7eabccbfac Merge branch 'issue568' into 'next'
Fixes issue #568

Closes #568

See merge request STJr/SRB2!1913
2023-02-27 20:37:50 +00:00
sphere
1dfb8ed4c3 Merge branch 'issue912a' into 'next'
Fixes Issue #912

Closes #912

See merge request STJr/SRB2!1909
2023-02-27 20:37:38 +00:00
Eidolon
a32dc3daa0 Fix software vsync
This pre-SDL 2.0.18 hack from the interp branch is no longer needed when
building with a new enough SDL version. This makes vid_wait toggleable
at all times if SDL is at least 2.0.18.
2023-02-26 17:57:44 -06:00
MascaraSnake
bb9e7045c5 Fix wrong flag being checked in P_ProcessTeamBase 2023-02-25 15:43:51 +01:00
MascaraSnake
6e7ff69720 Re-add code that sets MF2_AMBUSH if MTF_AMBUSH is set, but only for binary maps 2023-02-25 15:03:52 +01:00
MascaraSnake
283f7e8919 Linedef type 14 UDMF conversion: Don't fill stringargs[0] if toptexture is empty 2023-02-25 13:24:14 +01:00
MascaraSnake
d58dad7f98 Move emblem float option to args[1], since args[0] is already occupied for NiGHTS emblems 2023-02-25 11:58:12 +01:00
Eidolon
9a9a16183f Disable floor splat slope interpolation
Getting these to interpolate correctly is proving to be an absolute
ordeal and I would rather have them look correct-but-not-interpolated
than completely broken.
2023-02-24 18:49:09 -06:00
MascaraSnake
aba57612d5 -Only print deprecated map effect warnings once on map load
-Add missing unsupported effect warnings to P_WriteTextmap
-Apply spikes MSF_TRIGGERSPECIAL_TOUCH hack in UDMF too
2023-02-19 07:27:16 +01:00
namishere
eaacb64d3f Update PS_UpdateTickStats to correctly update metric history for pre and post thinkframe hooks 2023-02-11 04:19:24 -08:00
namishere
039df0d38b Implement perfstats options for LUAh_PreThinkFrame and LUAh_PostThinkFrame 2023-02-10 21:34:50 -08:00
Eidolon
707860815b Merge GitHub PR #514 into next
fix ARM builds being completely broken

Conditionally adds -mno-ms-bitfields based on architecture, as this is
only relevant on Intel architectures.

https://github.com/STJr/SRB2/pull/514
2023-02-08 21:15:04 -06:00
cobalt2727
4f8d2fcdc8
fix ARM builds being completely broken
If merged, this is the quickest approach to resolve https://github.com/STJr/SRB2/issues/513

...alternatively, we could just remove the option altogether but I don't have the time right now to test whether it's needed or not

To the best of my knowledge, this covers all possible amd64 `CMAKE_SYSTEM_PROCESSOR` values based on what I'm seeing at https://stackoverflow.com/questions/70475665/what-are-the-possible-values-of-cmake-system-processor
2023-02-08 14:46:09 -05:00
Zwip-Zwap Zapony
702b2acfd3 Limit con_hudtime to 24 hours
Also rename cons_msgtimeout to cons_hudtime for consistency
2023-02-04 17:35:44 +01:00
Zwip-Zwap Zapony
cc6eac0886 Fix con_hudlines being off by one 2023-02-04 17:34:43 +01:00
spherallic
4a1e99729b Merge branch 'next' into public_next 2023-01-31 15:47:11 +01:00
sphere
337a94eb99 Merge branch '2211-gamepaddefaults' into 'next'
Change gamepad defaults for 2.2.11

Closes #813

See merge request STJr/SRB2!1928
2023-01-31 14:43:30 +00:00
MascaraSnake
efca1eccca Merge branch 'floormover-tag-fix' into 'next'
EV_DoFloor: Set dummy tag correctly for chained linedef executing

Closes #932

See merge request STJr/SRB2!1898
2023-01-28 06:33:11 +00:00
MascaraSnake
02fa860c46 Merge branch 'thingonspecial3dfloor' into 'next'
Re-add P_ThingOnSpecial3DFloor for Lua backwards compatibility

See merge request STJr/SRB2!1905
2023-01-28 06:32:42 +00:00
MascaraSnake
6055b1490b Merge branch 'udmf-triggerer' into 'next'
UDMF: Use string values for the sector "triggerer" field

See merge request STJr/SRB2!1902
2023-01-28 06:32:29 +00:00
MascaraSnake
c25cb5732d Merge branch 'specialstagepit-fix' into 'next'
Disable exit sectors in non-NiGHTS special stages because they interfere with the pits

Closes #930

See merge request STJr/SRB2!1900
2023-01-28 06:32:16 +00:00
Jaime Ita Passos
b64dac714f Fix -Wnon-literal-null-conversion and -Wconstant-conversion warnings 2023-01-28 00:18:55 -03:00
spherallic
a6599c176d Change gamepad defaults for 2.2.11 2023-01-27 16:49:53 +01:00
Arthur
20724ad70b Also retain PF_CANCARRY 2023-01-27 09:46:02 -05:00
spherallic
3bc519ed65 Merge branch 'next' into bbox 2023-01-27 14:59:39 +01:00
MascaraSnake
f94695390e Merge branch 'revert-gamepads' into 'next'
Revert Gamepads for now

See merge request STJr/SRB2!1926
2023-01-27 13:53:45 +00:00
MascaraSnake
c84a71dcf5 Merge branch 'splitscreen-hooks' into 'next'
Handle splitscreen lua hud lists separately

Closes #935

See merge request STJr/SRB2!1925
2023-01-27 13:53:23 +00:00
MascaraSnake
5c91d78fcb Merge branch 'rollangle-parity' into 'next'
Invert OpenGL rollangle for papersprites to match software renderer behaviour

Closes #849

See merge request STJr/SRB2!1924
2023-01-27 13:52:00 +00:00
Eidolon
e5dea805fa Revert "Merge branch 'gamepad-refactor' into next"
This reverts commit 696e2ab909, reversing
changes made to d98d59494f.
2023-01-26 19:26:28 -06:00
Eidolon
366ee4ad92 Revert "Merge branch 'gamepad-refactor-lua-features' into 'next'"
This reverts commit 7f1cafcd3d, reversing
changes made to 696e2ab909.
2023-01-26 19:26:24 -06:00
Eidolon
6cc48a6e89 Revert "Merge branch 'gamepad-refactor-lua-rumble' into 'next'"
This reverts commit 7d8e8e20b7, reversing
changes made to 7f1cafcd3d.
2023-01-26 19:26:21 -06:00
Eidolon
7ad54af89f Revert "Fix axis inversion and camera look inversion"
This reverts commit 6428d6fc61.
2023-01-26 19:26:17 -06:00
Eidolon
bbf6e8ccce Revert "sdl: SDL version-guard controller type and hidapi"
This reverts commit ec58b1504d.
2023-01-26 19:26:02 -06:00
Eidolon
2810a46095 Revert "sdl: Version-guard rumble and extended buttons"
This reverts commit f5f224136b.
2023-01-26 19:25:59 -06:00
Eidolon
40a5580e65 Revert "sdl: Yet more SDL rumble version-guards"
This reverts commit df28ffd72e.
2023-01-26 19:25:56 -06:00
Eidolon
f9c9e0829a Revert "sdl: I can't believe it's more version-guards"
This reverts commit fdb6f2aff9.
2023-01-26 19:25:53 -06:00
Eidolon
5827a19b89 Revert "Merge branch 'controller-fixes' into 'next'"
This reverts commit 71736f358f, reversing
changes made to 4e3f78784a.
2023-01-26 19:24:52 -06:00
Eidolon
bbd4cff75c Revert "Merge branch 'gamepadtweaks' into 'next'"
This reverts commit 96bfd8cea7, reversing
changes made to 24f9ec4ec4.
2023-01-26 19:24:21 -06:00
Eidolon
f1a7494a31 Handle splitscreen lua hud lists separately
Fixes STJr/SRB2#935 by ensuring each drawlist is drawn separately while
stplyr is set correctly.
2023-01-26 08:59:51 -06:00
Lach
42fa7f4723 Invert OpenGL rollangle for papersprites to match software renderer behaviour 2023-01-26 15:29:35 +11:00
Eidolon
b02707a4ee Adjust caption pop-in by tics instead of frames
Fixes STJr/SRB2#900 pop-in animation being affected by framerate
2023-01-25 21:09:50 -06:00
Eidolon
add018cb83 Interpolate minecart marks
Fixes STJr/SRB2#906

Uses the old displacement of the minecart to position the mark relative
to its destination. It's not completely correct, but it works.
2023-01-25 21:09:50 -06:00
Eidolon
6c54af3774 Fix precip interpolation
Fixes STJr/SRB2#916
2023-01-25 21:09:50 -06:00
Alam Ed Arias
43eb7526c0 Update http-mserv.c 2023-01-20 19:00:50 +00:00
LJ Sonic
379cc4207a Revert "Merge branch 'netcode-refactor' into merging"
This reverts merge request !1920
2023-01-15 17:57:23 +00:00
LJ Sonic
41fb0c8943 Merge branch 'netcode-refactor' into merging 2023-01-15 17:45:06 +01:00
LJ Sonic
fe304ae2db Cleanup comments 2023-01-15 13:10:23 +01:00
LJ Sonic
d1ba9e0afd Cleanup 2023-01-15 13:08:31 +01:00
LJ Sonic
425fce69c9 Add missing include directive 2023-01-14 20:02:20 +01:00