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

107 commits

Author SHA1 Message Date
fickleheart
cf11f1ef6e SUPER EXPERIMENTAL FREEZE-B-GONE 2020-03-05 22:19:39 -06: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
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
1381343a2e Implement MUSICINTERFADEOUT level header 2019-03-15 01:05:52 -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
James
4f9109501e Hyu b gone 2019-02-19 23:15:31 -05:00
toaster
0037f5c91d First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit next or master. 2019-01-15 19:01:55 +00:00
Sal
900c6df765 Merge branch 'mobjscale-global' into 'next' 
Add a global for mobjscale

See merge request KartKrew/Kart-Public!10
 2019-01-08 17:00:34 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
Steel Titanium
2ba11a6d69 Support for per-map intermission music 2019-01-02 05:15:23 -05:00
mazmazz
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
TehRealSalt
079c0ec709 Save override for level header 
Kind of like 2.2's, but with backwards-compatability with 2.1
 2018-12-16 20:09:59 -05:00
SeventhSentinel
d9a3b37e30 Add a mapobjectscale global 
Should be no different than it was before, now it's just less tedious to type :V
 2018-12-12 21:55:59 -05:00
Monster Iestyn
94ad0b880f Merge branch 'next' into 21-version 
# Conflicts:
#	src/d_netcmd.c
 2018-12-02 15:45:07 +00:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Wolfy
42fc67a639 Remove hardcoded limit on admins 
# Conflicts:
#	src/d_netcmd.c
 2018-11-29 07:05:49 -06:00
Wolfy
cabe9871e3 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06:00
Sal
521b67834b Merge branch 'netcode-vars-strict' into 'master' 
Make netcode var defaults stricter, add Advanced Server Options

See merge request KartKrew/Kart!110
 2018-11-27 12:27:47 -05:00
TehRealSalt
74daafd9eb Advanced Server Options menu 
More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
 2018-11-27 12:10:46 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
d3fb778a52 Keep track of the place SPB is following 
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
 2018-11-24 20:41:17 -05:00
TehRealSalt
9bec65ca03 Franticized items for 2nd place VS SPB'd 1st 2018-11-22 23:38:54 -05:00
TehRealSalt
541443cfe8 add TOL_TV to dehacked 2018-11-16 12:04:24 -05:00
TehRealSalt
65d79b190c Ensure MS packets are sent correctly 2018-11-16 12:01:57 -05:00
TehRealSalt
c7b0df8172 Merge remote-tracking branch 'srb2public/next' 
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
 2018-11-07 16:15:14 -05:00
TehRealSalt
193941945e The motherload: all of my Lua is hardcoded 
This took like 6 straight hours of work, never ask me for anything ever again
 2018-10-29 05:00:08 -04:00
Latapostrophe
a16864f79e Resolved conflict 2018-10-25 01:35:55 +02:00
Latapostrophe
c74c4e9549 Midnight Channel: HUD static effect hardcode 2018-10-24 23:55:12 +02:00
mazmazz
bf93dace76 Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
TehRealSalt
71452edda2 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -04:00
TehRealSalt
2ae44ab10e New SPB 
May not make it to R1, but oh well
 2018-10-18 04:43:50 -04:00
TehRealSalt
c4a249366c Merge branch 'master' into no-spectate-griefing 2018-10-16 16:38:35 -04:00
TehRealSalt
0717db3f31 Prevent spectate griefing 
If the player count dips below what was stored on the start of the last lap, then don't do time over so that someone can't just spectate at the end of a race out of rage. Y'all are assholes :V
 2018-10-15 18:41:34 -04:00
toaster
1142fddc71 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
 2018-10-14 21:52:05 +01:00
Monster Iestyn
41fbdce21e debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else 2018-10-11 19:59:09 +01:00
toaster
ae0e569cfb Add a SECTIONRACE map flag. So far, all it does is prevent the number of laps from exceeding the map default, but it's a base to work off of if we want to add any other changes specifically for section races in future. 2018-10-01 12:12:48 +01:00
TehRealSalt
8bc02a3ec6 raceexittime var 2018-09-22 18:59:26 -04:00
mazmazz
32c48af258 MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz
23acc47b39 nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled 
(cherry picked from commit 07738fb0bcf640a4349337373f451fe68e024b2a)
 2018-09-14 10:35:51 -04:00
toaster
e8c436ab76 * Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). 
* A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby!
* Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value.
* Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
 2018-08-11 22:23:40 +01:00
toaster
670ad8cbd1 Merge branch 'sonicitems' into encore 
# Conflicts:
#	src/st_stuff.c
 2018-08-10 15:35:00 +01:00
toaster
435784d6c0 Wolfs flagged up midi variable stuff in his review so far, so this is a correction in that vein. 2018-08-10 14:25:24 +01:00