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
6933 commits 1 branch 12 tags 205 MiB
Commit graph

6933 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
0d38d7087b Use strtok instead of strtok_r 2019-08-07 01:29:05 -04:00
MascaraSnake
c6b49391c9 Set Fang's minimum bounce strength to 1.5 times jump strength 2019-08-06 23:35:20 +02:00
MascaraSnake
3786604203 Don't zero out momz when landing on slopes. 
This fixes Fang's bounce on slopes and doesn't seem to make a difference otherwise, but there's still a non-zero chance this broke something.
 2019-08-06 23:18:53 +02:00
mazmazz
2c7eb91460 * Added FORCERESETMUSIC level header 
* cv_resetmusicbyheader toggle to disable said override
* Never reset music during time attack
* Change cv_resetmusic default back to off
 2019-08-04 20:02:38 -04:00
toaster
da848d5216 Fix spindashing on a moving surface causing you to change state to rolling instead of spindashing. 
(MI said I could commit to master since it was only a single line.)
 2019-08-04 19:11:58 +01:00
toaster
9cdeee5b84 Merge branch 'revert_revert_musicplus' into 'master' 
Revert "Revert MusicPlus"

See merge request STJr/SRB2Internal!282
 2019-08-04 13:58:01 -04:00
toaster
1425185804 Merge branch 'ringsparkle' into 'master' 
New ring sparkles

See merge request STJr/SRB2Internal!271
 2019-08-04 11:46:40 -04:00
Steel Titanium
7dfe696819 Last min changes 2019-08-04 11:34:55 -04:00
toaster
735f0f5bac Merge branch 'statefix' into 'master' 
Quick state fixes

See merge request STJr/SRB2Internal!283
 2019-08-04 10:53:38 -04:00
toaster
a664956c87 * Fix the thing where you "roll" in run/walk frames if you hold spin after jumping. 
* Fix the thing where you don't go through super transformation frames when starting NiGHTS.
 2019-08-04 15:25:13 +01:00
toaster
b928c5fc98 Revert "Revert "Fix MIDI Soundfont code shadowing a global variable."" 
This reverts commit d880a02fa1.
 2019-08-04 12:04:01 +01:00
toaster
534b98251b Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit a76668f55a.
 2019-08-04 12:03:57 +01:00
MascaraSnake
6eec0f48c1 Merge branch 'revert_musicplus' into 'master' 
Revert musicplus (for now)

See merge request STJr/SRB2Internal!281
 2019-08-04 07:02:48 -04:00
toaster
a76668f55a Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 0f89fb123f, reversing
changes made to 8fb211d8cf.
 2019-08-04 11:32:55 +01:00
toaster
d880a02fa1 Revert "Fix MIDI Soundfont code shadowing a global variable." 
This reverts commit 8a1b36322d.
 2019-08-04 11:28:04 +01:00
MascaraSnake
f8e4a2431a Merge branch 'gcc7_corrections_aug2019' into 'master' 
ACTUALLY fix for gcc7

See merge request STJr/SRB2Internal!280
 2019-08-04 06:19:33 -04:00
toaster
8a1b36322d Fix MIDI Soundfont code shadowing a global variable. 2019-08-04 10:28:10 +01: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
Digiku
0f89fb123f Merge branch 'musicplus-aug2019-b' into 'master' 
MusicPlus August 2019 merge

Closes #6

See merge request STJr/SRB2Internal!279
 2019-08-04 03:33:05 -04:00
mazmazz
8a637168f4 Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b 2019-08-04 03:22:36 -04:00
Digiku
8fb211d8cf Merge branch 'gcc7-fixes-aug2019' into 'master' 
gcc7 compile fixes (Fall through; spr2 var comparison)

See merge request STJr/SRB2Internal!277
 2019-08-04 03:19:25 -04:00
mazmazz
7ef6ffbf42 Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019 2019-08-04 02:52:33 -04:00
mazmazz
12e86aaa44 Merge branch 'internal-musicplus-jingle' into musicplus-aug2019 2019-08-04 02:41:37 -04:00
mazmazz
16cc42166b Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019 2019-08-04 02:40:53 -04:00
mazmazz
753ea04fe3 Mixer X menu touchup 2019-08-04 02:30:34 -04:00
mazmazz
cc31ab232d Revert djgppdos fade function inadvertent merge 2019-08-04 02:09:35 -04:00
mazmazz
7b0b6c5dc1 Revert MUSSERV code removal from S_LoadMusic 
(but we'll probably purge it later, anyway...)
 2019-08-04 02:04:02 -04:00
mazmazz
e100a04f71 Fix HWR_DrawConsoleFill call extra input 2019-08-04 01:33:15 -04:00
mazmazz
51d80dcea0 Fix HWR_DrawConsoleFill call extra input 2019-08-04 01:33:06 -04:00
mazmazz
336f54e90c Merge branch 'gcc7-fixes-aug2019' into musicplus-sdlmixerx 2019-08-04 01:10:34 -04:00
mazmazz
8ab76b50c6 Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx 2019-08-04 01:10:21 -04:00
mazmazz
ffa9475c54 Slight refactor for jingle resume lapse time 2019-08-04 00:59:32 -04:00
mazmazz
d0eb838583 Jingle resume: Don't set music position when music is replaced 2019-08-04 00:56:17 -04:00
mazmazz
05008f5dff Fix 1up intermission jingle not playing 2019-08-04 00:15:31 -04:00
mazmazz
efccaf3dc4 Fix HWR_DrawConsoleFill call extra input 2019-08-04 00:15:15 -04:00
mazmazz
dd37b9fa0a Merge branch 'gcc7-fixes-aug2019' into internal-musicplus-jingle 2019-08-03 23:44:06 -04:00
mazmazz
ae05d8c0dd Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle 2019-08-03 23:38:49 -04:00
mazmazz
ae1632b7bf gcc7 compile fixes (Fall through; spr2 var comparison) 2019-08-03 23:01:10 -04:00
mazmazz
3684095619 gcc7 compile fixes (Fall through; spr2 var comparison) 2019-08-03 23:00:21 -04:00
mazmazz
d83bee2bad Merge remote-tracking branch 'origin/master' into musicplus-feature-dying-fp 2019-08-03 22:49:20 -04:00
mazmazz
0abb038938 Fix titlemap music bug 2019-08-03 22:49:12 -04:00
mazmazz
eee3eaee57 Fix titlemap music bug 2019-08-03 22:48:40 -04:00
mazmazz
5fa27c57e0 Merge branch 'master' into musicplus-feature-dying-fp 2019-08-03 22:22:39 -04:00
Steel Titanium
37c50467f3 Ring sparkle mirroring 2019-08-03 18:28:53 -04:00
Steel Titanium
ea32155715 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into ringsparkle 2019-08-03 17:33:28 -04:00
toaster
dec517f224 Merge branch 'ending' into 'master' 
ENDINGS

See merge request STJr/SRB2Internal!264
 2019-08-03 16:23:51 -04:00
toaster
c841193acc Merge branch 'bossenable' into 'master' 
Boss enable linedef (type 449)

See merge request STJr/SRB2Internal!272
 2019-08-03 16:23:22 -04:00
toaster
618d0844e4 Merge branch 'snaptoground-fix' into 'master' 
Snap to ground fix

Closes #165

See merge request STJr/SRB2Internal!274
 2019-08-03 16:22:47 -04:00
toaster
9386a36fac Merge branch 'mpspec_cleanup' into 'master' 
MP/Old Special Stage ring stuff

See merge request STJr/SRB2Internal!276
 2019-08-03 16:22:23 -04:00