thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-07 16:42:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
7088 commits 2 branches 14 tags 206 MiB
Commit graph

7088 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
1112730d8a Increase maximum number of Luabanks to 16 on Steel's suggestion. (Using the Web IDE 'cuz I'm tired, so no new exe; luckily I made the code flexible to constant replacement!) 2019-09-11 14:22:56 -04:00
toaster
22f7fd904f Merge branch 'musicplus-resetmusic-followup' into 'master' 
Follow-up fixes for reset-upon-dying music

See merge request STJr/SRB2Internal!284
 2019-09-11 14:14:09 -04:00
toaster
e99b0869a3 Forgot to put these in Lua. (Not gonna make a fifth exe today just for this one change, though.) 2019-09-11 17:32:41 +01: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
Steel Titanium
d03a0f2edc Merge branch 'flats-png_port' into 'master' 
Flats png port, fixed

See merge request STJr/SRB2Internal!323
 2019-09-11 11:57:29 -04:00
James
5404fce6e4 Added cam_adjust, de-ghettoified the camera in general 2019-09-11 10:45:59 -04:00
toaster
840eecbb02 Fix an issue where completing a stage normally would not correctly set startrings for the next one (as opposed to warping directly or dying inside it). 2019-09-11 14:25:22 +01:00
toaster
534cc1fa67 Fix the Save Select platter drawing for the new player signpost art. 
This might LOOK like an unrelated change, but it needs a new player.dta, so might as well keep that all localised!
 2019-09-11 13:32:12 +01:00
toaster
1695e4102f Tweak gameovertics slightly to avoid having no sound for too long. 2019-09-11 13:30:24 +01:00
toaster
667dcd5bca Continue screen! With aaaaaall the new assets to go with it. 
* https://cdn.discordapp.com/attachments/428262628893261828/621129794045870108/srb20077.gif
* https://cdn.discordapp.com/attachments/428262628893261828/621129785124585502/srb20078.gif
* I will be accepting no further questions at this time.
 2019-09-11 00:50:51 +01:00
Jaime Passos
0695b6ecc1 Merge remote-tracking branch 'origin/master' into gl_skydome 2019-09-10 19:20:20 -03:00
Jaime Passos
285ba4ee06 Enable usage of R_DrawSpan_8_MMX if drawing a flat with powers-of-two dimensions 2019-09-10 17:25:21 -03:00
James
0208de2d5b Lach has blessed us with a remade cam_adjust. 2019-09-10 10:11:03 -04:00
toaster
ca616fe314 Add the new s1, s2, cd, 3db and kc sounds to sounds.c and sounds.h! 
These have been in srb2.pk3 for a while, but they were inaccessible because of not having in-game references.
 2019-09-10 15:06:20 +01:00
toaster
038340ff46 Update SPR2 defaulting for SPR2_CNT1. 2019-09-10 14:44:04 +01:00
Alam Ed Arias
37d6106619 Merge branch 'undo_322' into flats-png_port 2019-09-09 15:05:43 -04:00
Alam Ed Arias
8eb6c3a50c Revert "Revert "Merge branch 'flats-png_port' into 'master'"" 
This reverts commit 8286f55e8e.
 2019-09-09 15:05:17 -04:00
Alam Ed Arias
8a69d97a12 Be clear on what FALLTHRU we really want 2019-09-09 15:02:13 -04: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
Nev3r
845e86ec12 Merge branch 'flats-png_port' into 'master' 
Flats png port

See merge request STJr/SRB2Internal!322
 2019-09-09 14:16:10 -04:00
Jaime Passos
2574914843 Merge remote-tracking branch 'origin/master' into flats-png_port 2019-09-09 14:12:28 -03:00
toaster
41727318ff Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-09 15:25:48 +01:00
toaster
7eaf43810a DON'T PUSH ALONE - first dregs of continue screen 2019-09-09 15:25:36 +01:00
Steel Titanium
e1b14d3d7d Fix function being redefined 2019-09-08 19:39:23 -04: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
toaster
74e6c147d7 Merge branch 'spawnobject-linedef' into 'master' 
Linedef type 461 (Spawn Object)

See merge request STJr/SRB2Internal!304
 2019-09-08 18:58:50 -04:00
Steel Titanium
8d2f3eb575 Move mobj_t declaration to top of the block 2019-09-08 17:14:47 -04:00
Steel Titanium
b979594c17 Fix this mistake 2019-09-08 16:54:40 -04:00
Monster Iestyn
361fbf8f6a Merge branch 'mprelated-tweaks' into 'master' 
Various improvements and changes to multiplayer menu

See merge request STJr/SRB2Internal!300
 2019-09-08 16:45:14 -04:00
toaster
14c44a6825 Merge branch 'nightsattackfixes' into 'master' 
NiGHTS attack fixes

Closes #205

See merge request STJr/SRB2Internal!319
 2019-09-08 16:42:45 -04:00
toaster
0217d693f2 Merge branch 'ending-star' into 'master' 
Endings: Fireworks fallback graphics.

See merge request STJr/SRB2Internal!296
 2019-09-08 16:28:52 -04:00
toaster
380f9ec07d Update SPR2_XTRA references for adjusted player.dta content. 2019-09-08 21:28:12 +01:00
toaster
1e11fe650f Merge branch 'flippost' into 'master' 
Flippost

Closes #206 and #191

See merge request STJr/SRB2Internal!320
 2019-09-08 16:24:58 -04:00
toaster
17a2038489 Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale. 2019-09-08 21:21:36 +01:00
toaster
f523cb107e Merge branch 'newegg' into 'master' 
Newegg dot blag

See merge request STJr/SRB2Internal!305
 2019-09-08 16:11:50 -04:00
toaster
8acf86cf10 Extend gameovertics again by two seconds. 2019-09-08 18:03:51 +01:00
toaster
abcf4f82ad Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-08 18:00:25 +01:00
toaster
5eb6b408a1 Fade time before Game Over track. 
Notably, can no longer use P_PlayJingle because of pre-fade.
 2019-09-08 18:00:01 +01:00
Jaime Passos
87f0013831 Implement all the other alpha blend styles 2019-09-08 13:21:00 -03:00
Steel Titanium
0b5bc8f64f Merge branch 'master' into internal-hotplug-stableid 
Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.
 2019-09-08 01:55:36 -04:00
Steel Titanium
414bff33bf Better directory structure 2019-09-08 01:29:09 -04:00
mazmazz
f3d287990c Fix NiGHTS attack menu not drawing correct background 2019-09-07 22:00:38 -04:00
Jaime Passos
13f181acd0 opengl patch translucency 2019-09-07 22:43:29 -03:00
Jaime Passos
6860e4a85d if that function can't return NULL why should i do this? 2019-09-07 19:02:50 -03:00
Jaime Passos
45c629c174 probably want to Z_Free this............... 2019-09-07 18:56:08 -03:00
Jaime Passos
1095c4a4c7 fix non powers of two spans 2019-09-07 18:20:49 -03:00
toaster
09f7dc1350 * Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) 
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
 2019-09-07 22:12:47 +01:00
Jaime Passos
27970e22e1 fix translucency 2019-09-07 16:54:26 -03:00