Commit graph

11962 commits

Author SHA1 Message Date
James R
cab089c5b1 Merge branch 'gl-colormap-update' into 'next'
Fix animated skincolors in OpenGL (resolves #187, #247, #301, #370)

Closes #187, #247, #301, and #370

See merge request STJr/SRB2!1301
2020-12-15 20:50:45 -05:00
James R
14c6d93c0c Merge branch 'team-elementalfire' into 'next'
Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312
2020-12-15 20:47:45 -05:00
James R
804e049579 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
73a7365798 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
503364f5f8 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
d999e436f1 GETFLAG 2020-12-14 20:23:24 -05:00
Zippy_Zolton
07034cf441 fixes spaces 2020-12-14 16:14:20 -06:00
Zippy_Zolton
9b8bacd088 Redone colormaps by SonicX8000 2020-12-14 12:52:24 -06:00
Jaime Ita Passos
3b36005ceb Replace the first entry in the taglist, instead of adding into it 2020-12-14 14:13:24 -03:00
James R
d0f3a6d737 Better check for tag list userdata 2020-12-14 08:08:01 -08:00
James R
00dff6d283 Push "valid" only once 2020-12-14 05:53:57 -08:00
katsy
f09198788d Merge remote-tracking branch 'stjr/next' into dusty 2020-12-14 05:39:35 -06:00
katsy
721170f5a0 lol 2020-12-14 05:32:51 -06:00
katsy
4521827e2c you too 2020-12-14 04:06:28 -05:00
katsy
200e444016 go away whitespace 2020-12-14 04:05:14 -05:00
katsy
2bebaf12d0 add checks for new flag, make emergency jump call shieldspecial 2020-12-14 04:03:14 -05:00
katsy
dfbb1825f4 ditto 2020-12-14 04:02:17 -05:00
katsy
0ce9d9127a add SF_NOSHIELDABILITY 2020-12-14 04:01:50 -05:00
katsy
2b23468359 remove amy 2020-12-14 02:36:00 -05:00
Zippy_Zolton
c247b94be7 Merge branch 'next' of https://github.com/STJr/SRB2 into text-color 2020-12-14 00:16:38 -06:00
Jaime Ita Passos
6160a2d0fe Fix a misuse of levelflat_t.picture in OpenGL (Kitchen Sink SRB2 port) 2020-12-14 02:07:12 -03:00
Jaime Ita Passos
ca78fc69ca Restore the viewpoint's angle in R_DrawPlanes instead 2020-12-14 01:14:55 -03:00
Jaime Ita Passos
7e0a1709de Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats 2020-12-14 00:53:42 -03:00
James R
760e083c30 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
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
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
katsy
2971156ba7 Update info.c 2020-12-11 23:39:42 -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
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