stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
15811 commits 174 branches 41 tags 300 MiB
Commit graph

14010 commits

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