Lactozilla
e1b188caf3
Fix a crash
2024-06-18 23:51:02 -03:00
spherallic
2ae5c6d9fc
Fix build warnings
2024-06-06 00:34:45 +02:00
sphere
419cfe8007
Merge branch 'next' into 'extra-textures'
...
# Conflicts:
# src/p_maputl.c
# src/r_segs.c
2024-06-05 21:50:23 +00:00
sphere
44c4d4dabd
Merge branch 'raise-textmap-parser-limits' into 'next'
...
Raise TEXTMAP parser limits
See merge request STJr/SRB2!2473
2024-06-05 21:34:49 +00:00
sphere
7cff7f7746
Merge branch 'avoid-traversing-home' into 'next'
...
Don't traverse the entire HOME directory to find wads
See merge request STJr/SRB2!2396
2024-06-05 21:33:18 +00:00
sphere
bcd55f778d
Merge branch 'fix-buffer-overflow-symlinks' into 'next'
...
Fix buffer overflow when loading addons through symlinks
See merge request STJr/SRB2!2402
2024-06-05 21:32:57 +00:00
sphere
d2cde25177
Merge branch 'next' into 'next'
...
Fix buffer overflow when setting NETVAR string console variable and ensure servername is within MAXSERVERNAME
See merge request STJr/SRB2!2445
2024-06-05 12:23:25 +00:00
Refrag
b16c4df31c
Ensure the servername fits into MAXSERVERNAME before setting it
...
This commit adds a verification before setting the servername console
variable. We now check that it fits within the MAXSERVERNAME length and
we cancel setting it if it doesn't.
Letting the servername be more than MAXSERVERNAME could lead to crashes
when trying to edit the server name from the menu so, we now avoid
those.
2024-06-04 21:35:53 +02:00
sphere
5de350e028
Merge branch 'fix-segfault-player-spawnmobj' into 'next'
...
Fix segfault when trying to spawn an MT_PLAYER from Lua
See merge request STJr/SRB2!2276
2024-06-04 10:41:00 +00:00
Lactozilla
37270c871e
Raise TEXTMAP parser limits
2024-06-04 02:08:25 -03:00
sphere
b4b72730db
Merge branch 'shieldscalefix' into 'next'
...
Fix shieldscale 0 bugs
See merge request STJr/SRB2!2425
2024-06-03 23:25:02 +00:00
SMS Alfredo
f19ec6f676
Fix shieldscale 0 bugs
2024-06-03 23:25:02 +00:00
sphere
525edab73c
Merge branch 'avoid-update-failed-ms' into 'next'
...
Avoid updating IPv4 MS entry if it failed to register
See merge request STJr/SRB2!2462
2024-06-03 22:41:55 +00:00
sphere
0f479f602e
Merge branch 'fix-523' into 'next'
...
Fix object collision with solid noskew midtextures (resolves #523 )
Closes #523
See merge request STJr/SRB2!2447
2024-06-03 22:38:53 +00:00
Lactozilla
04bc7e1e29
Merge branch 'next' into fix-523
2024-06-03 13:19:27 -03:00
sphere
dbe3c0c76d
Merge branch 'flingring_perfectbonus' into 'next'
...
Transform FlingRing when attracted instead of spawning new Ring
Closes #1218
See merge request STJr/SRB2!2390
2024-06-03 14:52:20 +00:00
sphere
02ee3382da
Merge branch 'demolition' into 'next'
...
Fix exitgame-ing a demo crashing the game (resolves #1237 )
Closes #1237
See merge request STJr/SRB2!2419
2024-06-03 14:47:28 +00:00
pastel
4840310f1a
Fix exitgame-ing a demo crashing the game ( resolves #1237 )
2024-06-03 14:47:27 +00:00
sphere
432c0eaf2f
Merge branch 'add-tofixed-lua' into 'next'
...
Add tofixed lua function
See merge request STJr/SRB2!2430
2024-06-03 14:43:27 +00:00
sphere
998f7de6ba
Merge branch 'fix-crash-2pai-bot' into 'next'
...
Fix crash when spawning a BOT_2PAI on a dedicated server
See merge request STJr/SRB2!2409
2024-06-03 14:38:45 +00:00
sphere
bba2eed0aa
Merge branch 'ulse' into 'next'
...
Fix tiny spindash math moment
See merge request STJr/SRB2!2421
2024-06-03 14:36:20 +00:00
pastel
b0d5828e79
Fix tiny spindash math moment
2024-06-03 14:36:20 +00:00
sphere
f67d349b35
Merge branch 'fix-buffer-overflow-hud-string' into 'next'
...
Fix segfault when passing a long string to v.drawString
See merge request STJr/SRB2!2403
2024-06-03 14:25:41 +00:00
sphere
4a599cb8da
Merge branch 'nostickztarget' into 'next'
...
Fix automatic mode z-target bugs and crashes (resolves #751 , #758 , #1264 )
Closes #1264 , #758 , and #751
See merge request STJr/SRB2!2422
2024-06-03 14:24:06 +00:00
sphere
6d68091f3f
Merge branch 'skinvarstuff' into 'next'
...
Update skin cvar from character select and compare against cvar when warping without a loaded file (resolves #1267 , #1117 , #1114 , #1112 )
Closes #1112 , #1114 , #1117 , and #1267
See merge request STJr/SRB2!2467
2024-06-03 14:19:44 +00:00
sphere
6b8f4ab398
Merge branch 'allowdesync' into 'next'
...
Add a console variable that will allow individual demos to desync....
See merge request STJr/SRB2!2361
2024-06-03 13:45:37 +00:00
sphere
6b160747d8
Merge branch 'alwaysgrabmouse-fix' into 'next'
...
Fix mouse buttons not working in menus with alwaysgrabmouse on
Closes #1257
See merge request STJr/SRB2!2449
2024-06-03 13:41:54 +00:00
sphere
d3686b3255
Merge branch 'improve-backtrace' into 'next'
...
Clean up the backtrace code and make it use write() more safely.
See merge request STJr/SRB2!1897
2024-06-03 13:37:48 +00:00
sphere
8ffce81fc3
Merge branch 'whirlybirdridesagain' into 'next'
...
Removed thokked when hitting springs (resolves #1245 )
Closes #1245
See merge request STJr/SRB2!2429
2024-06-03 13:30:16 +00:00
sphere
57e17184d1
Merge branch 'lessthan3emeraldshards' into 'next'
...
Allow less than 3 emerald shards instead of crashing
See merge request STJr/SRB2!2433
2024-06-03 13:24:58 +00:00
sphere
f54c34e2ee
Merge branch 'fix-shearing-vertical-aim' into 'next'
...
Fix vertical aim being off when using lack of perspective
See merge request STJr/SRB2!2408
2024-06-03 13:17:37 +00:00
sphere
3ef5d14e3a
Merge branch 'issue1062' into 'next'
...
Don't change drawangle while riding on a fan
Closes #1062
See merge request STJr/SRB2!2371
2024-06-03 13:12:38 +00:00
sphere
30f1ac31e4
Merge branch 'issue1133' into 'next'
...
Rollout rock handling with gravity boots
See merge request STJr/SRB2!2343
2024-06-03 13:10:06 +00:00
sphere
7e3a06cbe8
Merge branch 'gexunleashed' into 'next'
...
Fix forcecharacter regressions & crash (resolves #1262 )
Closes #1262
See merge request STJr/SRB2!2464
2024-06-03 12:59:52 +00:00
pastel
1f71ecdc80
Fix forcecharacter regressions & crash ( resolves #1262 )
2024-06-03 12:59:52 +00:00
sphere
cc29f8a42d
Merge branch 'fix-equation-slopes-near-edges' into 'next'
...
Fix equation slopes breaking with slopes farther than 32k FU away from the map center
See merge request STJr/SRB2!2397
2024-06-03 12:59:13 +00:00
sphere
af8337cd61
Merge branch 'expose-maxvid-const' into 'next'
...
Expose BASEVIDWIDTH and BASEVIDHEIGHT to Lua and SOC
See merge request STJr/SRB2!2468
2024-06-03 12:56:44 +00:00
Hanicef
1a02c7fd73
Expose BASEVIDWIDTH and BASEVIDHEIGHT to Lua and SOC
2024-06-03 12:56:44 +00:00
sphere
c8bffdea66
Merge branch 'improve-slope-physics-on-solid-middle-textures' into 'next'
...
Improve slope physics on solid middle textures
See merge request STJr/SRB2!2455
2024-06-03 12:55:41 +00:00
sphere
5d72b4383d
Merge branch 'fix-1093' into 'next'
...
Use correct slope for solid middle textures
Closes #1093
See merge request STJr/SRB2!2454
2024-06-03 12:55:35 +00:00
Lactozilla
c65acbcca8
Merge branch '712-trying-to-load-a-folder-as-an-addon-causes-a-bad-cycle-error-everytime' into 'next'
...
Resolve "[2.2.10 prerelease] Trying to load a folder as an addon causes a "bad cycle" error every time"
Closes #712
See merge request STJr/SRB2!2412
2024-06-03 03:38:06 +00:00
Lactozilla
aa3455dc0f
Merge branch 'spr2defaults-fix' into 'next'
...
SPR2defaults fix
See merge request STJr/SRB2!2461
2024-06-03 03:20:52 +00:00
Lactozilla
8b1ddcbd57
Merge branch 'fix-spriteinfo-indexing' into 'next'
...
Fix spriteinfo indexing
Closes #1255
See merge request STJr/SRB2!2463
2024-06-03 03:19:14 +00:00
Lactozilla
7cc0dd1eff
Merge branch 'fix-1248' into 'next'
...
Fix #1248
Closes #1248
See merge request STJr/SRB2!2452
2024-06-02 21:08:38 +00:00
Lactozilla
726345013c
Merge branch 'fix-1247' into 'next'
...
Fix 3D floor side texture scaling (resolves #1247 )
Closes #1247
See merge request STJr/SRB2!2435
2024-06-02 21:07:17 +00:00
Lactozilla
02d18ff44d
Merge branch 'fixfoftferline' into 'next'
...
Fix FOFs with transferline flag and many linedefs randomly crashing
See merge request STJr/SRB2!2285
2024-06-02 21:04:48 +00:00
Lactozilla
021e461813
Merge branch 'repeatmasked-overflow-fix' into 'next'
...
Prevent infinite loop in R_RenderThickSideRange
See merge request STJr/SRB2!2470
2024-06-02 20:21:16 +00:00
Lactozilla
a1f22a3c47
Merge branch 'next' into SRB2-fixfoftferline
2024-06-02 17:19:38 -03:00
Lactozilla
f8a7ba4a75
Prevent infinite loop in R_RenderThickSideRange
2024-06-02 16:54:11 -03:00
Lactozilla
21dd828bfa
Merge branch 'fix-1215' into 'next'
...
Fix 3D floor side texture scrolling (resolves #1215 )
Closes #1215
See merge request STJr/SRB2!2392
2024-06-02 19:47:59 +00:00
