lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,930 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

11930 Commits

Author SHA1 Message Date
James R 35244fa736 Clang: fix -Wimplicit-const-int-float-conversion 
Some of these integers exceed the precision of float. In
that case the number is rounded. The rounding shouldn't
matter too much anyway, so just shut the compiler up.
 2021-05-08 16:49:23 -07:00
James R 210c9419e4 Ignore -Wtrigraphs 2021-05-08 16:49:18 -07:00
lachablock 8b021ec16b but if you close your eyes EH OH, EH OH 2021-05-07 12:38:24 +10:00
Tatsuru 8b9b25829a Merge branch '229-prep' into 'next' 
2.2.9 prep

See merge request STJr/SRB2!1499
 2021-05-06 21:42:53 -04:00
Tatsuru 3159d5a6e4 2.2.9 prep 2021-05-06 21:58:21 -03:00
sphere 6053740ef7 Merge branch 'light-userdata-is-wrong' into 'next' 
Stop using metatables with light userdata

See merge request STJr/SRB2!1495
 2021-05-06 12:14:36 -04:00
sphere 413c8563c9 Merge branch 'things-to-tide-you-over' into 'next' 
Update URL on the addon screen

See merge request STJr/SRB2!1489
 2021-05-06 08:18:12 -04:00
James R c8a4a7a0b1 Merge branch 'musicchange-hook-fix' into 'next' 
Fix MusicChange hook not returning some values correctly

See merge request STJr/SRB2!1496
 2021-05-05 20:02:15 -04:00
Steel Titanium 80fe39bbd1 Fix MusicChange hook not returning some values correctly 2021-05-03 01:40:02 -04:00
James R aee963f4e9 Replace LUA_PushLightUserdata with LUA_PushUserdata 
See 7df6a309 and 83a87042. I didn't realize that light
userdata's metatable is shared--like numbers or strings.
So it cannot be paired with a metatable.

I also made a few minor tweaks to Lua cvars, other than
accounting for the double pointer in the userdata.
 2021-05-02 21:59:23 -07:00
James R ed5a7f51e8 Revert "Merge branch 'lightmemedata' into 'next'" 
This reverts commit d4c08a8410, reversing
changes made to e100f21dda.
 2021-05-02 21:32:07 -07:00
Tatsuru aac3ca320b Update LOCATIONSTRING2 as well 2021-05-01 10:24:28 -03:00
LJ Sonic f97dc1093a Merge branch 'kitchensync' into 'next' 
Attempt to resolve teleportation resync issue

See merge request STJr/SRB2!1490
 2021-04-30 20:39:11 -04:00
katsy 815db01438 adjust cooldown to 5 seconds (bandage fix for 2.2.9) 2021-04-30 20:30:35 -04:00
katsy 858cb98e57 attempt to resolve teleportation resync issue 2021-04-30 17:26:09 -05:00
Tatsuru ea7b332525 Visit srb2.org/addons to get & make addons! 2021-04-30 15:49:09 -03:00
LJ Sonic 1355a82aa5 Merge branch 'final-hours' into 'next' 
Last-minute fixes

See merge request STJr/SRB2!1483
 2021-04-26 18:33:42 -04:00
LJ Sonic 3491112818 Update copyright date 2021-04-27 00:33:24 +02:00
LJ Sonic 0d4d3a5207 Revert "Lua: ensure order of MIN, MAX possible values" 
This reverts commit c51c478740.
 2021-04-26 21:11:24 +02:00
LJ Sonic cd4cfba500 Delete faulty return 2021-04-26 21:10:32 +02:00
LJ Sonic 664f5fe5b1 Merge branch 'erz3-tol' into 'next' 
Give TOL_ERZ3 an appropriate identifier (closes #516)

Closes #516

See merge request STJr/SRB2!1471
 2021-04-26 06:08:31 -04:00
LJ Sonic 7d167f531b Merge branch 'lua-minmax-plus' into 'next' 
Let Lua cvars use preset values in addition to MIN and MAX

See merge request STJr/SRB2!1480
 2021-04-26 06:06:58 -04:00
LJ Sonic 83a80106b1 Merge branch 'cvar-zstring-fix' into 'next' 
Unset zstring if a preset value is used

Closes #487

See merge request STJr/SRB2!1479
 2021-04-26 05:55:14 -04:00
James R 92aeadc36b It is impossible for a string to be allocated in this case 2021-04-25 22:01:40 -07:00
James R 85914cc7cd Free zstring when switching to preset value 
This is only applicable for bounded cvars (MIN, MAX),
since otherwise there's no way to allocate a zstring.
 2021-04-25 21:55:04 -07:00
James R c51c478740 Lua: ensure order of MIN, MAX possible values 
Cvars could now have a range (MIN, MAX) plus some preset
values, but Lua could not take advantage of this due to
table order not being guaranteed.
 2021-04-25 21:51:24 -07:00
LJ Sonic d18fc8882f Merge branch 'dont-load-dont-unload' into 'next' 
Fix a dedicated crash in Special Stage intermissions (2.2.9 RC1)

See merge request STJr/SRB2!1475
 2021-04-25 16:35:46 -04:00
LJ Sonic 1d07fc2de3 Merge branch 'spritedef-add-hotfix' into 'next' 
Spritedef add hotfix

See merge request STJr/SRB2!1476
 2021-04-25 16:34:39 -04:00
LJ Sonic 1e394a80bf Merge branch 'possible-netgame-quit-crash-hotfix' into 'next' 
Possible netgame quit crash hotfix

Closes #487

See merge request STJr/SRB2!1477
 2021-04-25 16:33:49 -04:00
Monster Iestyn 70939a7a3d Set "allocated" flag to off if setting a string from PossibleValue afterwards, or if not setting a new value at all. 2021-04-25 21:08:12 +01:00
LJ Sonic 02ee480abe Merge branch 'gl-colormapped-epolyflag' into 'next' 
Fix uninitialized reads in PreparePolygon

See merge request STJr/SRB2!1392
 2021-04-25 14:19:24 -04:00
sphere a90642bfa9 Merge branch 'ogl-midtexture-zfighting-fix' into 'next' 
Render midtextures on two-sided lines with a z-buffer offset

See merge request STJr/SRB2!1376
 2021-04-25 14:02:02 -04:00
Monster Iestyn 65624bf6c0 Change numadded counter to UINT16 instead of UINT8, to allow for more sprites properly 2021-04-25 19:01:51 +01:00
Tatsuru 376d6cd6a2 Don't try to free patches in dedicated 2021-04-25 14:26:43 -03:00
Tatsuru 4f2f94d02d Compatibility with the current identifier 2021-04-21 22:22:37 -03:00
Tatsuru da56e84d2c Change TOL_ERZ3 identifier 2021-04-21 22:17:16 -03:00
sphere d71b99a56b Merge branch 'comparepolygons-fix' into 'next' 
Remove bad pointer arithmetic in polygon comparators (fixes #295)

Closes #295

See merge request STJr/SRB2!1462
 2021-04-19 14:33:41 -04:00
sphere 164fbeff91 Merge branch 'fix-perfstats-3' into 'next' 
Fix incorrect values caused by outdated use of timing functions in perfstats 3

See merge request STJr/SRB2!1460
 2021-04-19 14:33:31 -04:00
sphere 194d0b8201 Merge branch 'interfission' into 'next' 
Cache teamflags/icons before drawing if they don't exist yet (closes #511)

Closes #511

See merge request STJr/SRB2!1459
 2021-04-19 14:33:23 -04:00
sphere 315582bd6c Merge branch 'fix-blendtables' into 'next' 
Fix blend tables generation

See merge request STJr/SRB2!1458
 2021-04-19 14:33:12 -04:00
sphere d871612a72 Merge branch 'openglol' into 'next' 
Fix HWR_DrawSprite sigsegv

See merge request STJr/SRB2!1454
 2021-04-19 14:33:03 -04:00
Hannu Hanhi ee578b68f4 Remove bad pointer arithmetic in polygon comparators, that was causing glitches 2021-04-17 03:11:29 +03:00
Hannu Hanhi 3670af5a31 Fix incorrect values caused by outdated use of timing functions in perfstats 3 2021-04-16 00:38:34 +03:00
katsy 7b83345c75 need to create the patches here if they don't already exist 2021-04-14 19:29:53 -05:00
Jaime Ita Passos 0d4d2ed6d8 Fix blend tables generation 2021-04-13 12:11:31 -03:00
katsy 23759c67aa move HWR_GetMappedPatch earlier 2021-04-12 21:26:29 -05:00
sphere bcd3245b76 Merge branch 'blendmode-revision' into 'next' 
Blending changes

See merge request STJr/SRB2!1446
 2021-04-11 08:18:12 -04:00
sphere 0d628c351a Update Zone Builder configuration. 2021-04-10 17:44:42 +02:00
sphere 00e81cac8e Merge branch 'badflags' into 'next' 
Fix CTF flag patch garbage (resolves #506)

Closes #506

See merge request STJr/SRB2!1453
 2021-04-10 11:34:07 -04:00
sphere 1d863408c7 Merge branch 'dedicated-scoretally-crash-fix' into 'next' 
Fix dedicated server crashing when exiting special stage (Fixes #453)

Closes #453

See merge request STJr/SRB2!1451
 2021-04-10 11:34:00 -04:00