Commit graph

11860 commits

Author SHA1 Message Date
James R
4ffe8f429d Merge branch 'intermission-double-free-fix' into 'next'
Fix double free occuring when unloading the intermission patches

See merge request STJr/SRB2!1304
2020-12-15 20:44:57 -05:00
James R
b98d27a1ba Merge branch 'circuit-finallap' into 'next'
Final lap text for circuit

See merge request STJr/SRB2!1303
2020-12-15 20:42:59 -05:00
James R
57155643b1 Merge branch 'gme-spc-fix' into 'next'
Fix SPC looping on libgme versions >= 0.6.3

See merge request STJr/SRB2!1302
2020-12-15 20:40:10 -05:00
katsy
284e32074d GETFLAG 2020-12-14 20:23:24 -05:00
Zippy_Zolton
d90d18f33c fixes spaces 2020-12-14 16:14:20 -06:00
Zippy_Zolton
a5d7823f5e Redone colormaps by SonicX8000 2020-12-14 12:52:24 -06:00
Jaime Ita Passos
7367316c06 Replace the first entry in the taglist, instead of adding into it 2020-12-14 14:13:24 -03:00
James R
8b0d2bb158 Better check for tag list userdata 2020-12-14 08:08:01 -08:00
James R
20c6259821 Push "valid" only once 2020-12-14 05:53:57 -08:00
katsy
a39949077b Merge remote-tracking branch 'stjr/next' into dusty 2020-12-14 05:39:35 -06:00
katsy
ead6180ef5 lol 2020-12-14 05:32:51 -06:00
katsy
03c9543db9 you too 2020-12-14 04:06:28 -05:00
katsy
f76803d8c0 go away whitespace 2020-12-14 04:05:14 -05:00
katsy
3e73577b8e add checks for new flag, make emergency jump call shieldspecial 2020-12-14 04:03:14 -05:00
katsy
e6aff20076 ditto 2020-12-14 04:02:17 -05:00
katsy
708fc52543 add SF_NOSHIELDABILITY 2020-12-14 04:01:50 -05:00
katsy
d37fd1aa23 remove amy 2020-12-14 02:36:00 -05:00
Zippy_Zolton
f30ab44564 Merge branch 'next' of https://github.com/STJr/SRB2 into text-color 2020-12-14 00:16:38 -06:00
Jaime Ita Passos
5b56c49e1f Fix a misuse of levelflat_t.picture in OpenGL (Kitchen Sink SRB2 port) 2020-12-14 02:07:12 -03:00
Jaime Ita Passos
1d8fb0fc50 Restore the viewpoint's angle in R_DrawPlanes instead 2020-12-14 01:14:55 -03:00
Jaime Ita Passos
940f134717 Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats 2020-12-14 00:53:42 -03:00
James R
375c83d492 Merge branch 'fix-playintro-crash' into 'next'
Fix intro crash

See merge request STJr/SRB2!1310
2020-12-13 22:17:25 -05:00
James R
498ff708bb Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
Sally Coolatta
2b7e465ed6 Use R_PointToDist2 instead
Apparently overflows less often

Actually, lets just fix FixedHypot instead.

Now FixedHypot uses the code from R_PointToDist2, and R_PointToDist2 just calls FixedHypot.

Ultimately, this branch was intended to get rid of a redundant way to retrieve distance and replace it with the one that was actually good at its job. So consolidating FixedHypot and R_PointToDist2 together is just an extension of that.
2020-12-12 14:49:26 -08:00
Sally Coolatta
77f83de100 Use FixedHypot over P_AproxDistance
Not convinced that the small speed benefit from P_AproxDistance is worth the "aproximate"[sic] results it gives. Let's instead try a define to replace it with FixedHypot. In Lua, the function gives a deprecated warning.

Inspired by the hyperwall fix for vanilla, except for everything. From little testing, actively improves waypoint checks, bumping, speed checks, wall collisions, Jawz targetting, Lightning Shield attacks, so on.

The only way I see this as a potential downgrade is A_Look (and related functions) getting slower, which are barely used in Kart.
2020-12-12 14:49:25 -08:00
James R
55bc602dbd Merge branch 'apng-downscale' into 'next'
Add aPNG downscaling

See merge request STJr/SRB2!1197
2020-12-12 17:39:56 -05:00
James R
e305de037c Merge branch 'player-speed' into 'next'
Make player->speed and other things use R_PointToDist2

See merge request STJr/SRB2!1309
2020-12-12 17:38:02 -05:00
James R
394b9a752c Merge branch 'credits-229' into 'next'
Add Zolton and Ors to the credits

See merge request STJr/SRB2!1308
2020-12-12 17:35:29 -05:00
James R
956fd338f0 Merge branch 'oldguards' into 'next'
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
20e0d99ea0 Remove trailing whitespace 2020-12-12 02:40:46 -08:00
James R
887f4a0919 Merge branch 'master' into next 2020-12-12 02:38:51 -08:00
James R
19af2b9afe Remove trailing whitespace 2020-12-12 02:37:03 -08:00
James R
41f1b3b97c Kill SEENAMES 2020-12-12 02:11:23 -08:00
katsy
cedbb8c0de Update info.c 2020-12-11 23:39:42 -05:00
katsy
d488ff64e0 make fire spindust dust fullbright 2020-12-11 20:59:14 -05:00
Zippy_Zolton
7c1063ed86 Make Ring Drain sectors play the depletion sound instead of the ring sound 2020-12-11 12:34:30 -06:00
Zippy_Zolton
b153276057 Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
Jaime Ita Passos
d69430dd04 Fix intro crash 2020-12-10 22:01:53 -03:00
Zippy_Zolton
3c041d7304 snailer 2020-12-10 19:01:09 -06:00
Jaime Ita Passos
0d81a70397 Fix ERZ3 mode 2020-12-10 21:55:22 -03:00
Zippy_Zolton
59f7b40497 Make player->speed use R_PointToDist2 2020-12-10 16:09:43 -06:00
James R
15d4732015 Credits: add Zolton and Ors to the programming section 2020-12-10 13:40:47 -08:00
James R
b899610f0f Merge branch 'lua-skinsprites' into 'next'
Lua: Allow access to skin.sprites[]

See merge request STJr/SRB2!1238
2020-12-10 15:49:48 -05:00
James R
60ce05de38 Merge branch 'fix-gl-draw-cropped' into 'next'
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.

See merge request STJr/SRB2!1297
2020-12-10 15:44:51 -05:00
James R
8cc312a16d Merge branch 'saloondoor-revengeance' into 'next'
Saloon door fixes (closes #394)

Closes #394

See merge request STJr/SRB2!1296
2020-12-10 15:43:31 -05:00
James R
073c011589 Merge branch 'caret-color-letter' into 'next'
Make caret coloring support letters.

See merge request STJr/SRB2!1295
2020-12-10 15:41:02 -05:00
James R
a83a78ac88 Merge branch 'brak' into 'next'
Fix brak barrier size (Closes #139)

Closes #139

See merge request STJr/SRB2!1294
2020-12-10 15:39:42 -05:00
James R
10fd3606ce Merge branch 'firemelt' into 'next'
Fix objects with MF_FIRE disappearing in lava (Closes #366)

Closes #366

See merge request STJr/SRB2!1287
2020-12-10 15:37:57 -05:00
James R
ff9c21c80b Merge branch 'dehacked-hell-bruh' into 'next'
Fix some stuff I missed when rebasing `spritestuff2` to `dehacked-hell`... oops

See merge request STJr/SRB2!1286
2020-12-10 15:36:01 -05:00
James R
c7907f9b15 Merge branch 'ffloorclip-fixes' into 'next'
ffloorclip fixes (resolves #385 and #391)

Closes #385 and #391

See merge request STJr/SRB2!1284
2020-12-10 15:35:39 -05:00