thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-26 23:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6936 commits 2 branches 14 tags 206 MiB
Commit graph

6936 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
eb315d3662 Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?) 2019-09-18 16:06:13 +01:00
toaster
09fce66717 Fix Knuckles being able to climb up solid midtextures by repeatedly gliding at them. (addresses #174 checkbox 2) 2019-09-18 15:26:21 +01:00
toaster
7a4d1eefdb Change threshold on autobrake skidding sound/animaton to runspeed rather than half of runspeed. 2019-09-18 14:16:52 +01:00
toaster
e8cf839d2f Only set flight time to 0 if skin has SPR2_SWIM spriteset. 2019-09-18 14:11:06 +01:00
toaster
c93c88c769 Fix solidity of lava in reverse gravity. (Resolves #216) 2019-09-18 13:55:20 +01:00
toaster
d82eb22457 More swim stuff! 
* Prevent being able to damage enemies from below while swimming.
* Make the swim-specific bubbles happen at the hands instead of where the propeller would be.
* Improve placement/angle of swimming tails overlay.
* Immediately set flight time to 0 if a player is being carried underwater.
 2019-09-18 13:46:17 +01:00
toaster
187072a215 Merge branch 'patch-blending-aggregate-return-fix' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into charfixes 2019-09-18 12:46:36 +01:00
toaster
97a5cbd445 Completely untested cuz I need to commit before I can merge the compile fix, but the intent of this commit is: 
* Fix S_PLAY_FLY_TIRED animation being fast.
* Add moving tails to S_PLAY_SWIM animation!
* Fix autobrake happening when your controls are locked by pw_nocontrol/PF_STASIS. (Resolves #219, hopefully..?)
 2019-09-18 12:46:18 +01:00
toaster
3f6a331f24 Change startchar's default value to 0 (Resolves #222). 2019-09-18 12:26:34 +01:00
Jaime Passos
f5b7c9951f compile fix 2019-09-17 22:29:53 -03:00
Jaime Passos
fcf3359732 Merge branch 'revert-63c99dd2' into 'master' 
Revert "Merge branch 'gl_skydome' into 'master'"

See merge request STJr/SRB2Internal!331
 2019-09-17 21:14:52 -04: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
toaster
e7465699ad Merge branch 'morecactis' into 'master' 
More harmful cactus

See merge request STJr/SRB2Internal!329
 2019-09-16 16:36:06 -04:00
Nev3r
2b0a0dd90f Merge branch 'deathstuff' into 'master' 
Lots of death stuff

Closes #207

See merge request STJr/SRB2Internal!306
 2019-09-16 16:32:45 -04:00
Nev3r
c732a4f2ad Merge branch 'abilityclean' into 'master' 
Clean up an ungodly amount of shit relating to abilities.

Closes #195, #167, and #177

See merge request STJr/SRB2Internal!307
 2019-09-16 16:09:20 -04:00
toaster
ccc1144a27 Merge branch 'luabanks' into 'master' 
Lua save-banks!

See merge request STJr/SRB2Internal!295
 2019-09-16 07:56:49 -04:00
Jaime Passos
dd61585ee1 Merge branch 'croppedpatchbleed' into 'master' 
Fix the V_DrawCroppedPatch bleeding on the current charsel screen.

See merge request STJr/SRB2Internal!311
 2019-09-15 12:37:46 -04:00
Jaime Passos
ef2d19502b Merge branch 'png-patches' into 'master' 
PNG patches

See merge request STJr/SRB2Internal!327
 2019-09-15 12:23:46 -04:00
Nev3r
77f2be12eb Merge branch 'horizontal-springs' into 'master' 
Always force player camera direction for springs with horizontal thrust component.

See merge request STJr/SRB2Internal!330
 2019-09-15 12:18:22 -04:00
Nev3r
d6e02c20b3 Always force player camera direction for springs with horizontal thrust component. 2019-09-15 17:43:19 +02:00
Steel Titanium
a333f20d13 More harmful cactus 2019-09-12 21:36:13 -04:00
Jaime Passos
020c91b7d5 () 2019-09-12 16:12:31 -03:00
Jaime Passos
f2a3d8a840 Merge remote-tracking branch 'origin/master' into png-patches 2019-09-12 16:04:20 -03:00
Jaime Passos
d2bc3de4ae Moved this macro 2019-09-12 16:03:44 -03:00
Steel Titanium
5ba4e604b2 Merge branch 'newicon' into 'master' 
New EXE icon

See merge request STJr/SRB2Internal!265
 2019-09-12 14:05:32 -04:00
Jaime Passos
e3ceadbfe3 Fix powers-of-two checks 2019-09-12 14:32:31 -03:00
toaster
88000b87b0 I_Error if no frames are found for a loaded skin's SPR2_STND subspriteset, given this is what everything will default to if nothing else is provided, and I really don't wanna go across the code adding checks for sprite2s not existing (since R_GetSkinSprite2, under all circumstances other than this one, is capable of bouncing back). 2019-09-12 12:52:25 +01:00
Jaime Passos
f91e8e126e Crash prevention 2019-09-11 20:38:15 -03:00
Jaime Passos
6a7454acf7 Read user chunks 2019-09-11 20:18:04 -03:00
Jaime Passos
df966fe305 Merge remote-tracking branch 'origin/master' into png-patches 2019-09-11 17:08:17 -03:00
Jaime Passos
6623359b06 Transparency, not translucency 2019-09-11 17:03:50 -03: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
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
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
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