thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
29697 commits 1 branch 12 tags 205 MiB
Commit graph

105 commits

Author SHA1 Message Date
Eidolon
a4d304a1f5 Update copyright years to 2025 2025-02-13 15:32:26 -06:00
Sally Coolatta
8f88c29387 SRB2 -> DRRR copyright in hardware folder 2024-04-05 10:00:33 -04:00
toaster
690244825b * Fixed blending in OpenGL. 
* Caught a UDMF-only crash for Software (where linedef alpha is low but nonzero).
 2021-04-03 19:29:06 +01:00
Zippy_Zolton
b153276057 Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
Jaime Passos
cdc4a6d86e Implement blend modes 2020-10-27 00:03:41 -03:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -03:00
Jaime Passos
d283cc1d2a Rename structs, turn GrTextureFormat_t into an enum 2020-07-06 00:52:10 -03:00
Jaime Passos
146da28f88 Remove GrTexInfo 2020-07-06 00:35:48 -03:00
LJ Sonic
ac070380c1 Merge branch 'cez3debris' into 'next' 
New Debris for CEZ3

See merge request STJr/SRB2!1012
 2020-07-04 07:00:20 -04:00
Zippy_Zolton
f3a9ba447b t_lspr 2020-06-20 14:16:22 -05:00
Hannu Hanhi
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
lachwright
645c324d51 Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
fickleheart
33a9e5aa83 Merge remote-tracking branch 'upstream/master' into shaders-222 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
#	src/i_video.h
#	src/r_main.c
#	src/r_main.h
#	src/screen.c
#	src/sdl/i_video.c
#	src/sdl/ogl_sdl.c
#	src/w_wad.c
 2020-03-14 12:52:15 -05:00
Jaime Passos
933e690da3 i want to die 2020-01-28 00:41:41 -03:00
Jaime Passos
2d4945d558 Update copyright text 2020-01-23 20:12:15 -03:00
Tatsuru
065b8adf42 In-map visual indicator 2020-01-19 19:02:03 -03:00
Sally Cochenour
d2e3c832da Merge next 2020-01-07 07:35:39 -05:00
Jaime Passos
ba40acf626 Fix broken dynlight list because of a SPR_NON2 that doesn't exist 2019-12-28 22:57:37 -03:00
Sally Cochenour
add2497220 Port of Jimita's shader stuff + my lighting shader 
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
 2019-12-25 14:22:01 -05:00
lachwright
eb80360850 Add missing GFZD spriteset 2019-11-21 01:14:24 +08:00
MascaraSnake
04fbb5dbd3 Merge branch 'cobalt-ai' into 'master' 
CobaltBW's Tails AI

See merge request STJr/SRB2Internal!358
 2019-11-18 17:26:28 -05:00
lachwright
cd38e4ba1a Add flight indicator 2019-11-18 15:17:27 +08:00
lachwright
814ee200fa Add Dragonbomber enemy 2019-11-18 05:23:59 +08:00
James R
fd74f1848c Fix nonpacked to packed cast for OpenGL 2019-11-07 16:30:29 -08:00
James R
7c0d5b3bcf There's some whitespace... 2019-11-07 14:56:42 -08:00
toaster
0842d1f328 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks 
# Conflicts:
#	extras/conf/SRB2-22.cfg
 2019-10-25 20:32:15 +01:00
lachwright
3e584e5ad9 Add green flame sprites, state, and object 2019-10-21 16:22:20 +08:00
lachwright
53835bcb1a Add new ATZ gargoyle sprites 2019-10-21 13:43:02 +08:00
toaster
8649b1e353 Fix hw_light.c list (not gonna make an exe for this) 2019-10-19 15:50:16 +01: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
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
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
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
Jaime Passos
2574914843 Merge remote-tracking branch 'origin/master' into flats-png_port 2019-09-09 14:12:28 -03:00
Jaime Passos
b28af03b1c Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -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
85d46b49e1 Correct some extant fuckups. 2019-07-14 14:21:32 +01:00
toaster
6a90505009 Correct some more minor issues with hw_light.c and the ALAM_LIGHTING. (Hi Alam! ^u^) 2019-07-13 14:07:40 +01:00
toaster
2fbb0bbb52 I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here. 2019-07-13 13:43:22 +01:00
Jonas Sauer
b7c783223a Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
 2019-07-13 01:42:03 +02:00