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
Lactozilla
d0b420c760
Prevent a memory leak
2024-06-03 13:30:01 -03:00
Lactozilla
16560653a0
Merge branch 'next' into texture-index-255-is-transparent
2024-06-03 13:23:09 -03: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
b89aaf709e
Generate the TF_CHROMAKEYED texture in hw_cache.c
2024-06-03 00:14:33 -03:00
Lactozilla
cb09b90556
Add missing comments
2024-06-02 21:45:36 -03:00
Lactozilla
bd641c3857
Fix #1263
2024-06-02 21:40:14 -03:00
Lactozilla
dd5f030b16
Use palette index 255 for transparency
2024-06-02 20:45:00 -03: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
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
Lactozilla
0aca694f1e
Merge branch 'ignore-flats-when-loading-patches' into 'next'
...
Ignore flats when loading patches
See merge request STJr/SRB2!2457
2024-06-02 19:45:40 +00:00
pastel
c0c1b8de90
don't adjust texture coords of nonexistant gpatch
2024-06-01 14:40:44 -05:00
pastel
e2e879a704
handle file loading correctly
2024-05-31 21:10:25 -05:00
pastel
dd1ac23bdb
Update skin cvar from character select and compare against cvar when warping to map without character select
2024-05-31 15:52:24 -05:00
SSNTails
b453e6732d
pastel's ideas #2
2024-05-29 21:43:09 -04:00
SSNTails
bd8684e3e0
pastel's ideas
2024-05-29 21:42:05 -04:00
SSNTails
53c6e65fd2
Merge branch 'issue1062' of https://git.do.srb2.org/SSNTails/SRB2 into issue1062
2024-05-29 21:18:42 -04:00
SSNTails
19736fa55e
possibly more valid...?
2024-05-29 21:18:36 -04:00
SSNTails
5fe927038c
Merge branch SRB2:next into issue1062
2024-05-29 21:42:28 +00:00
SSNTails
a2bba687ba
Don't break automatic mode.
2024-05-29 17:19:49 -04:00
pastel
712414817b
also fix ticcmd intro crash
2024-05-28 13:51:29 -05:00
pastel
db40279fdb
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into nostickztarget
2024-05-28 13:31:42 -05:00
Zwip-Zwap Zapony
b1f15a35ba
Use a three-option menu instead of a yes/no prompt
2024-05-28 14:25:30 +02:00
Zwip-Zwap Zapony
c53da609b1
Shield button prompt for old configs
2024-05-28 14:17:57 +02:00
LJ Sonic
1ba9ecf027
Add missing newline in console warning
2024-05-26 17:51:48 +02:00
LJ Sonic
3b14531dc2
Fix spriteinfo indexing
2024-05-26 17:51:20 +02:00
Hanicef
19500742d2
Avoid updating IPv4 MS entry if it failed to register
2024-05-26 13:00:16 +02:00
kaldrum1
b7fdcdf2b2
fix spr2defaults pretty sure
2024-05-25 20:49:29 -07:00
kaldrum1
92fc592966
fix spr2defaults probably
2024-05-25 20:08:43 -07:00
Hanicef
72f2942929
Fix players not rendering on team scoreboards
2024-05-25 18:04:49 +02:00
Lactozilla
341139ea73
Scale the vertical offsets
2024-05-22 23:37:31 -03:00
Lactozilla
6e4eb6292f
Merge branch 'next' into fix-1248
2024-05-22 23:16:49 -03:00
sphere
a75fbd229e
Merge branch 'fix-ctrl+backspace-in-console' into 'next'
...
Fix Ctrl+Backspace in the console causing a crash
See merge request STJr/SRB2!2437
2024-05-22 11:25:07 +00:00
sphere
593ffd2435
Merge branch 'fix-linedef-type-466' into 'next'
...
Fix Linedef type 466
Closes #1246
See merge request STJr/SRB2!2453
2024-05-22 11:21:42 +00:00
sphere
d6df06949d
Merge branch 'fix-1222' into 'next'
...
Fix #1222
Closes #1222
See merge request STJr/SRB2!2448
2024-05-22 11:20:06 +00:00
sphere
a5e89ea032
Merge branch 'flats-as-texpatch-overlap' into 'next'
...
Fix composite "flats as patch" name overlap crash
See merge request STJr/SRB2!2450
2024-05-22 11:16:07 +00:00
sphere
418671863c
Merge branch 'fix-us-intl-console-key' into 'next'
...
Fix keyboard input when certain keys overlap with dead keys
Closes #1174
See merge request STJr/SRB2!2443
2024-05-22 11:14:57 +00:00
Lactozilla
36395bfaac
Copy the flags of the reference slope
2024-05-20 20:25:42 -03:00
Lactozilla
3fb5907eff
Add slope data to lines
2024-05-20 20:10:49 -03:00
Lactozilla
3d4c9eedf8
Revert "Improve slope physics on solid middle textures"
...
This reverts commit e67e225ff2
2024-05-20 20:10:34 -03:00
Lactozilla
6bf58ce870
Revert "Add comments"
...
This reverts commit 3a09c475c7
2024-05-20 20:10:25 -03:00
Refrag
68264e7288
Fix buffer overflow when setting a NETVAR string CVar
...
There was a possible buffer overflow if you tried setting a console var
that had the CV_NETVAR and that was of the string type.
The overflow would happen if you were trying to set the console variable
while in a multiplayer / netgame state.
This commit just increases the size of buf to account for everything
that needs to be written to it.
2024-05-20 10:55:10 +02:00
Lactozilla
0186e5bce5
Fix a mistake
2024-05-20 02:54:45 -03:00
Lactozilla
4502e67f0f
Ignore flats when loading patches
2024-05-20 02:48:38 -03:00
MIDIMan
a19f843a3e
Implement Lactozilla's suggestions and add 3D model support
2024-05-19 22:21:09 -04:00
Lactozilla
3a09c475c7
Add comments
2024-05-19 22:53:00 -03:00
MIDIMan
7c937a5dc0
Merge branch SRB2:next into mobj-alpha
2024-05-20 01:26:33 +00:00
Lactozilla
e67e225ff2
Improve slope physics on solid middle textures
2024-05-19 20:40:40 -03:00
Lactozilla
3a62ebbe3e
Set correct slope for solid midtextures
2024-05-19 18:56:14 -03:00
Lactozilla
464072d7af
Fix Linedef type 466
2024-05-19 16:24:03 -03:00
Lactozilla
27e1ee710c
Fix #1248
2024-05-19 15:28:55 -03:00
Sally Coolatta
619cf708a1
Fix composite "flats as patch" name overlap crash
2024-05-19 03:57:07 -04:00
Refrag
ccadfd8157
Fix mouse buttons not working in menus with alwaysgrabmouse on
...
This commit fixes #1257 by reintroducing something left out in commit
9f116c7c9e#879 ).
2024-05-19 09:08:00 +02:00
Lactozilla
d90c2ac4b4
Fix #1222
2024-05-19 01:43:02 -03:00
Lactozilla
b3418cd685
Fix #523
2024-05-19 01:29:54 -03:00
Lactozilla
c2b57e2654
Merge branch 'fffffop2' into 'next'
...
Fix backwards compat for SPR2 Super (resolves #1225 )
Closes #1225
See merge request STJr/SRB2!2410
2024-05-14 02:07:11 +00:00
katsy
509df21f25
Fix backwards compat for SPR2 Super ( resolves #1225 )
2024-05-14 02:07:11 +00:00
Hanicef
c2e58b59a9
Fix other builds
2024-05-12 19:54:14 +02:00
Hanicef
911a351eb4
Fix keyboard input when certain keys overlap with dead keys
2024-05-12 19:44:37 +02:00
Vlad Doc
f291c8466c
Merge branch SRB2:next into linux-customshader-compilation-fix
2024-05-09 16:35:45 +00:00
Hanicef
15bf00e5ba
Fix buffer overflow when invoking MusicChange hook
2024-05-08 19:56:03 +02:00
Hanicef
df856aa823
Do not access memory on misaligned addresses
2024-05-07 18:10:31 +02:00
Zwip-Zwap Zapony
5db15ae943
Fix Ctrl+Backspace in the console causing a crash
...
Also fix Ctrl+C / Ctrl+X emptying the clipboard without a text selection
2024-05-05 17:03:42 +02:00
Lactozilla
da3355a153
Fix #1247
2024-05-04 03:39:41 -03:00
