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

322 commits

Author SHA1 Message Date
Steel Titanium
2137d5ec21 Lots of changes 
* Show emblem requirement on record attack menu
* Use bigger emblems on the menu.
* Display your best number of collected rings in yellow if reached perfect bonus.
* Adjusted XTRA frames (again)
 2019-10-15 22:54:21 -04:00
TehRealSalt
c6566ec31a Merge branch 'master' into versus-record 2019-10-03 01:32:59 -04:00
TehRealSalt
06d27ae36e Merge branch 'master' into fortnite 2019-09-27 06:36:11 -04:00
TehRealSalt
22796b7633 Merge master 2019-09-27 03:44:37 -04:00
Sal
39115db560 Merge branch 'sky-improvements' into 'master' 
Sky improvements

See merge request KartKrew/Kart!174
 2019-09-27 03:06:51 -04:00
TehRealSalt
9cb834b004 Capsule counter, map change when spawning capsules mid-game 2019-09-24 11:24:01 -04:00
TehRealSalt
e84c618da8 Rudimentary Record Attack support 2019-09-24 07:17:05 -04:00
TehRealSalt
38bb44e732 Separate into k_pwrlv.c, add defines to reduce amount of magic numbers 2019-09-23 08:26:42 -04:00
TehRealSalt
b8a752e40a Merge master 2019-09-18 21:47:11 -04:00
TehRealSalt
47da526313 Use texture names instead of predesignated sky numbers 2019-09-18 19:29:28 -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
TehRealSalt
1ef09699d1 Functional gameplay 
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score

Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
 2019-09-15 20:19:48 -04:00
TehRealSalt
d3f1b4f82c Greased horizontals 2019-09-12 02:01:30 -04: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
8b045a8f15 Lua save-banks! 
* Array of 8 INT32's natively embedded into savedata (net and SP)!
* Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game.
* Requires reservation to avoid clobber-conflicts.
    * Access via `reserveLuabanks()` - returns a read-write userdata.
    * Assign userdata to local variable or global rawset to use later.

Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
 2019-08-24 18:25:27 +01: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
534b98251b Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit a76668f55a.
 2019-08-04 12:03:57 +01: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
mazmazz
8a637168f4 Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b 2019-08-04 03:22:36 -04:00
toaster
8ac6d43886 * Made the evaluation screen even more attractive. 
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
 2019-07-29 14:55:36 +01:00
Monster Iestyn
0fb5a82215 Merge branch 'public_next' 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
#	src/p_user.c
#	src/r_data.c
 2019-06-29 20:55:58 +01:00
Steel Titanium
8a80426408 Merge branch 'public-musicplus-feature-endoflevel' into 'next' 
Fade out music at end of level, before intermission

See merge request STJr/SRB2!472
 2019-06-28 18:21:07 -04:00
Steel Titanium
25e67ee061 Add startrings level header option 2019-06-23 18:15:40 -04:00
TehRealSalt
31534fe96b Merge branch 'master' into versus-record 2019-05-29 22:23:17 -04:00
TehRealSalt
99ed66ac46 Bubble Shield, Flame Shield changes 2019-05-21 01:01:29 -04:00
wolfy852
9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1 
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
 2019-05-12 03:40:02 -05:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
 2019-05-06 22:40:12 -05:00
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
mazmazz
d944156744 Merge remote-tracking branch 'origin/master' into menu-execs 2019-05-02 18:47:43 -04:00
TehRealSalt
435862b29d finished scrambles 2019-04-26 13:34:30 -04:00
TehRealSalt
ea2bcb3b99 Update from master 2019-04-19 20:14:06 -04:00
TehRealSalt
a3d2b48329 Fix up more stuff 
Now in a mergable state
 2019-04-18 12:20:13 -04:00
TehRealSalt
089be795a2 Huge splitscreen refactor 
Did not get to finish all refactoring or even compile this, I'll continue later
 2019-04-18 03:08:11 -04:00
James R
03c27101df "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
0c6c401d88 Add title to netreplays and do some format cleanup 2019-03-24 18:48:14 -05:00
Monster Iestyn
5d059da843 Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa 
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
 2019-03-18 22:00:23 +00:00
mazmazz
a181f12af3 Declare exitfadestarted properly 2019-03-15 11:01:41 -04:00
mazmazz
822b4d12bf Merge branch 'public_next' 2019-03-15 01:43:03 -04:00
mazmazz
1381343a2e Implement MUSICINTERFADEOUT level header 2019-03-15 01:05:52 -04:00
mazmazz
a34daa4a0c Merge remote-tracking branch 'origin/master' 2019-03-15 00:33:12 -04:00
mazmazz
83e89ba62c Merge branch 'public_next' 2019-03-15 00:33:06 -04:00
mazmazz
5e06530829 Implement MIXNIGHTSCOUNTDOWN 
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
 2019-03-14 23:10:14 -04:00
mazmazz
2eb04ab17d Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
wolfs
f4947820e4 Merge branch 'maxskins-bump' into 'next' 
Bump MAXSKINS to 128 + Clean up skin struct

See merge request KartKrew/Kart-Public!82
 2019-03-11 19:28:16 -04:00
wolfy852
d0fe0abc9c Remove disableSpeedAdjust 2019-03-11 17:23:41 -05:00
TehRealSalt
6aa55bdbe2 Merge remote-tracking branch 'kartpublic/next' into fortnite 2019-03-11 13:49:12 -04:00
James
4f9109501e Hyu b gone 2019-02-19 23:15:31 -05:00
TehRealSalt
3246ca6b33 More finished power level 
broken, can't finish
 2019-01-16 14:49:42 -05:00
TehRealSalt
a14c5c3381 Merge branch 'master' into versus-record 2019-01-16 02:26:30 -05:00