thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-06 19:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
7164 commits 2 branches 14 tags 206 MiB
Commit graph

580 commits

Author SHA1 Message Date
toaster
4a7ed2d9ec MD2 crash fix. 2019-10-13 11:59:38 +01:00
MascaraSnake
7e27bcb915 Merge branch 'openglskydome2' into 'master' 
OpenGL sky dome

See merge request STJr/SRB2Internal!350
 2019-10-12 11:06:47 -04:00
MascaraSnake
4f7026d169 Merge branch 'OGL_regressions' into 'master' 
Correct minor OGL regressions

See merge request STJr/SRB2Internal!361
 2019-10-12 09:53:20 -04:00
MascaraSnake
ced4a91eba Merge branch 'rvz-hardcode' into 'master' 
RVZ hardcode

Closes #178

See merge request STJr/SRB2Internal!357
 2019-10-12 09:37:23 -04:00
MascaraSnake
acb34f6290 Merge branch 'amycameo' into 'master' 
Amy for Frozen Hillside (full pitch in description)

See merge request STJr/SRB2Internal!356
 2019-10-12 07:16:26 -04:00
MascaraSnake
86a77b4886 Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag 2019-10-11 21:02:11 +02:00
toaster
ed304a5b19 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode 
# Conflicts:
#	src/p_mobj.c
 2019-10-08 19:43:43 +01:00
toaster
7f085863e2 * Add rudimentary support for MF2_LINKDRAW in GL. 
* Allow MF_ENEMY objects to flash, just as they do in Software.
 2019-10-06 16:31:13 +01:00
MascaraSnake
9b795e56c4 Implemented lava splish. Feel free to suggest a different "splish" sound. 2019-10-05 10:00:59 +02:00
toaster
7ade43f685 Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there... 2019-10-01 18:19:37 +01:00
lachwright
949ef287b7 Resolve merge conflicts 2019-09-29 20:29:49 +08:00
lachwright
f67ef441b3 Hardcode pumice ball 
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
 2019-09-29 20:18:40 +08:00
MascaraSnake
c4f1085f02 Hardcoded the Pterabyte (without the grabbing mechanic) 2019-09-29 10:39:09 +02:00
Jaime Passos
fa9cef1cc0 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
toaster
74efc0e1f4 Merge branch 'bossprovements' into 'master' 
ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346
 2019-09-27 08:55:19 -04:00
lachwright
7563e7be6f P_SetTarget fixes, added SPR_SHCK to hw_light.c 2019-09-27 02:13:02 +08:00
toaster
85f50ef54b * Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) 
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
 2019-09-26 17:06:29 +01:00
toaster
de82d338bd Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? 
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.

To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.

Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
 2019-09-25 14:36:20 +01:00
Steel Titanium
8e50a7214c Restore code that somehow got reverted??? 
How did this even happen??
 2019-09-22 20:30:07 -04:00
Alam Arias
296409d93e platersprite_t is not the same as unsigned 2019-09-19 21:42:59 -04:00
Jaime Passos
5e1ebad9d3 sky barreling 2019-09-17 23:38:04 -03:00
Jaime Passos
f5b7c9951f compile fix 2019-09-17 22:29:53 -03:00
Alam Ed Arias
aab58a4613 Revert "Merge branch 'gl_skydome' into 'master'" 
This reverts merge request !326
 2019-09-17 20:20:09 +00:00
Alam Ed Arias
e969ef8930 PNG support: use png_const_bytep, so we do not drop const type 2019-09-17 16:18:54 -04:00
Jaime Passos
1dbbb226a9 Allow PNG graphics to be used as patches 
Also allows them to be used as sprites.
 2019-09-11 16:59:28 -03:00
Steel Titanium
63c99dd28f Merge branch 'gl_skydome' into 'master' 
OpenGL sky dome

See merge request STJr/SRB2Internal!326
 2019-09-11 11:58:05 -04:00
Steel Titanium
2339d60276 Merge branch 'ast_newstyles' into 'master' 
Patch translucency styles

See merge request STJr/SRB2Internal!324
 2019-09-11 11:57:45 -04:00
Jaime Passos
0695b6ecc1 Merge remote-tracking branch 'origin/master' into gl_skydome 2019-09-10 19:20:20 -03:00
Nev3r
8286f55e8e Revert "Merge branch 'flats-png_port' into 'master'" 
This reverts merge request !322
 2019-09-09 18:40:21 +00:00
Jaime Passos
fd39522310 Missing arguments 2019-09-09 15:39:10 -03:00
Jaime Passos
2574914843 Merge remote-tracking branch 'origin/master' into flats-png_port 2019-09-09 14:12:28 -03:00
toaster
ec76002d9f Merge branch 'lightning_polys' into 'master' 
Lightning Polys

See merge request STJr/SRB2Internal!294
 2019-09-08 19:04:56 -04:00
Jaime Passos
87f0013831 Implement all the other alpha blend styles 2019-09-08 13:21:00 -03:00
Jaime Passos
13f181acd0 opengl patch translucency 2019-09-07 22:43:29 -03:00
Jaime Passos
27970e22e1 fix translucency 2019-09-07 16:54:26 -03:00
Jaime Passos
25bb9d1f88 define stuff idk 2019-09-06 19:41:29 -03:00
Jaime Passos
6acdf893e1 test 2019-09-06 19:26:05 -03:00
Jaime Passos
b28af03b1c Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
Jaime Passos
0db1d5d225 2.2 skies aren't flipped 2019-09-05 17:42:36 -03:00
Jaime Passos
16956f1c56 Make sky dome look a bit better 2019-09-04 13:59:09 -03:00
Jaime Passos
557e29b83c Very tiny fix 2019-09-03 23:44:04 -03:00
Jaime Passos
6573e94e3a PRBoom sky dome 2019-09-03 02:12:17 -03:00
toaster
b2d57e6045 Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it. 2019-08-30 19:19:54 +01:00
MascaraSnake
0ed20a2a39 Hardcoded the Pyre Fly 2019-08-30 08:17:25 +02:00
MascaraSnake
b50da9e3e6 Hardcoded the lavafall 2019-08-25 23:05:38 +02:00
MascaraSnake
b78ef0f666 Hardcoded the RVZ scenery 2019-08-25 12:40:32 +02:00
toaster
4c206bbcb7 Make polyobjects agree with sector lighting/colormap like a FOF. 
Caution: has weird retry/reload bug. Ask sphere for sample map/coords.
 2019-08-22 22:30:36 +01:00
Alam Ed Arias
58a074db26 Fix signed vs unsigned comapre 2019-08-07 12:41:22 -04:00
toaster
ec4b68888f Fix inadvertent fallthrough and associated whitespace. 2019-08-04 10:27:36 +01:00
toaster
c1af18cf66 Fix HWR_DrawConsoleFill. 2019-08-04 10:27:09 +01:00