Commit graph

12305 commits

Author SHA1 Message Date
James R
a86a7822d1 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 15:38:46 -08:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
Sally Coolatta
e19196a86e 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
c5474436af 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
e94bccc503 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
9649a9fbae 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
69ea84db80 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
7b6675178e 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
93e4f43e4b Hooklib macros names -> uppercase + documentation 2020-12-12 03:16:30 -08:00
James R
c8cc9c7a6f Remove trailing whitespace 2020-12-12 02:40:46 -08:00
James R
143ec3e40b Merge branch 'master' into next 2020-12-12 02:38:51 -08:00
James R
b31c4db89d Remove trailing whitespace 2020-12-12 02:37:03 -08:00
James R
e55d842d7f Kill SEENAMES 2020-12-12 02:11:23 -08:00
James R
9ddeb5f589 Resolve GameQuit hook conflicts 2020-12-12 02:05:21 -08:00
James R
2778cc3ce9 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 02:02:38 -08:00
katsy
2971156ba7 Update info.c 2020-12-11 23:39:42 -05:00
Steel Titanium
ab156e1709 Remove music slot compatibility 2020-12-11 23:11:15 -05:00
katsy
ddf743d521 make fire spindust dust fullbright 2020-12-11 20:59:14 -05:00
Zippy_Zolton
68de9f4bbe Make Ring Drain sectors play the depletion sound instead of the ring sound 2020-12-11 12:34:30 -06:00
Zippy_Zolton
f2095b57fd Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
katsy
f79ded7c0b scale minimum dashmode thok on actionspd, not normalspeed 2020-12-10 20:52:06 -05:00
Jaime Ita Passos
440f46144a Fix intro crash 2020-12-10 22:01:53 -03:00
Zippy_Zolton
916cacb38f snailer 2020-12-10 19:01:09 -06:00
Jaime Ita Passos
3472b3ece3 Fix ERZ3 mode 2020-12-10 21:55:22 -03:00
Zippy_Zolton
317c107064 Make player->speed use R_PointToDist2 2020-12-10 16:09:43 -06:00
James R
69d98b22ad Credits: add Zolton and Ors to the programming section 2020-12-10 13:40:47 -08:00
James R
29745f80dc 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
e05433f282 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
6d3442a5d7 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
d8bf015467 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
7e8fc66654 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
fc5708b2f2 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
c6dd218e2b 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
8c74dd26a9 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
James R
e46c6e75f3 Merge branch 'metal-sigfpe' into 'next'
Fix a division by zero in BCZ2 Metal Sonic's routine

See merge request STJr/SRB2!1283
2020-12-10 15:35:03 -05:00
James R
413fa89555 Merge branch 'fixargstr' into 'next'
Fixargstr

See merge request STJr/SRB2!1280
2020-12-10 15:31:05 -05:00
James R
0b2e60ba1d Merge branch 'my-junk' into 'next'
Initialize dummy linedef tag lists

See merge request STJr/SRB2!1279
2020-12-10 15:29:10 -05:00
James R
5a0d3981f1 Merge branch 'super-giverings' into 'next'
Make P_DoSuperTransformation (with giverings) only set 50 rings if you have less than 50

See merge request STJr/SRB2!1278
2020-12-10 15:27:01 -05:00
James R
9ea969b62d Merge branch 'gamequit-argument' into 'next'
Send a `quitting` argument to the GameQuit Lua hook.

See merge request STJr/SRB2!1276
2020-12-10 15:25:52 -05:00
James R
f180a1fc3c Merge branch 'holy-zip' into 'next'
Disallow pk3s with extra bytes

See merge request STJr/SRB2!1275
2020-12-10 15:21:20 -05:00
James R
ef6f69ee22 Merge branch 'CR_BRUH' into 'next'
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game

See merge request STJr/SRB2!1274
2020-12-10 15:20:11 -05:00
James R
703631956b Merge branch 'dumb-stuff' into 'next'
Fix TC_DASHMODE not accessible to v.getColormap; add missing skin flags

See merge request STJr/SRB2!1273
2020-12-10 15:17:28 -05:00
James R
ee48fa2de3 Merge branch 'mario1up' into 'next'
Fix normal one-up sound playing in Mario mode

See merge request STJr/SRB2!1272
2020-12-10 15:15:08 -05:00
James R
9a77cf6306 Merge branch 'lastlineshit' into 'next'
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability

See merge request STJr/SRB2!1271
2020-12-10 15:14:16 -05:00
James R
1d31fe3759 Merge branch 'exposed!!!' into 'next'
Expose player.skin and player.availabilities to Lua as Read-only

See merge request STJr/SRB2!1269
2020-12-10 15:09:55 -05:00
James R
77c51c62c2 Merge branch 'expose-selectheading' into 'next'
Expose mapheader_t's selectheading option to Lua

See merge request STJr/SRB2!1268
2020-12-10 15:07:23 -05:00
James R
857113b60e Merge branch 'crunchyroll' into 'next'
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice

See merge request STJr/SRB2!1267
2020-12-10 15:07:01 -05:00
James R
8701caa110 Merge branch 'blua-urite' into 'next'
Fix crash when trying to use bitwise NOT on true/false/nil

See merge request STJr/SRB2!1262
2020-12-10 15:03:39 -05:00
James R
c841750868 Merge branch 'no-spin-jump' into 'next'
Fix a Few Spin Related Bugs (Closes #286 and #360)

Closes #286 and #360

See merge request STJr/SRB2!1256
2020-12-10 15:02:29 -05:00
James R
4275d52267 Merge branch 'marathon-mode-tokens' into 'next'
Fix emeralds,  tokens, etc not resetting when restarting marathon mode in first level

See merge request STJr/SRB2!1252
2020-12-10 14:57:23 -05:00