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

333 commits

Author SHA1 Message Date
Sally Coolatta
b9436ee015 More fixing up 
Got tired again, but now it makes it to f_finale
 2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up 
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
 2020-08-11 16:13:17 -04:00
Sally Coolatta
737f01fae0 Move axis_input_e to g_game.h 2020-08-10 17:04:02 -04:00
Sally Coolatta
3e50f83f63 Fix function definition for PlayerJoyAxis 2020-08-10 17:02:10 -04:00
Sally Coolatta
a771bb0047 Merge g_game.c/h 2020-08-10 13:09:26 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
20dcd07fa4 Merge g_game.c/h 
Also includes required changes to g_demo.c/h
 2020-08-09 14:43:13 -04:00
toaster
94dbb0ebe1 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save 
# Conflicts:
#	src/g_game.c
 2020-06-25 10:48:36 +01:00
James R
34eeb98cc4 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
toaster
3b3256be8f Special saves! 
All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts.

Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear...

One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
 2020-06-22 19:00:47 +01:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Louis-Antoine
d886e35576 Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Jaime Passos
a4d6addbca Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
Latapostrophe
59452ae026 Merge branch 'v2-master' into followme-internal 2020-05-04 12:52:47 +02:00
James R
a1502046cf Merge remote-tracking branch 'origin/master' into resume 2020-04-30 09:32:40 -07:00
James R
8490919257 Bye death fades 2020-04-19 22:06:22 -07:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
James R
7e0aa16e70 Reset Invincibility (and Grow) music to the start if stacked 
Toggleable via the resetspecialmusic cvar.
 2020-03-21 22:28:55 -07:00
James R
7023ccc239 Death fades music 
Cvars are respawnfademusicout and respawnfademusicback. Both measure
milliseconds.
 2020-03-21 22:28:55 -07:00
James R
911dd57334 Restore level music to where it left off 
Toggleable via the resume cvar.
 2020-03-21 22:28:55 -07:00
James R
8524c3749d Fade level music back in after Invincibility and Grow 
Cvars are invincibilitymusicfade and growmusicfade. Both measure milliseconds.
 2020-03-21 22:28:54 -07:00
James R
52fa738ef8 Replace even more ints with INT32 2020-03-21 13:18:17 -07:00
Monster Iestyn
ffb2674a6e Merge branch 'next' into demos-refactor 
# Conflicts:
#	src/g_game.c

(also update g_demo.c)
 2020-03-20 17:48:31 +00:00
Monster Iestyn
ac7a71f85b Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c 2020-03-19 20:09:55 +00:00
Jaime Passos
84f977ff7a Fix G_TOLFlag returning the wrong type 2020-03-02 00:20:53 -03:00
Jaime Passos
9d0e3465f9 G_CoopGametype, for all the GT_COOP cases 2020-02-29 00:57:22 -03:00
James R
0c814ce42d Sync look back 
Also fixes look back applying to the first
player in parties instead of locally.
 2020-02-23 23:21:20 -08:00
James R
02757eac82 Fix and fully implement leaving parties 2020-02-23 23:20:20 -08:00
James R
46ac563eaf Implement big bad parties (splitscreen with network players) 
Use the 'invite' command to invite another player to your party.

If that player accepts, via the 'acceptinvite' command, they and any
splitscreen players on their machine will be added after the players
in your party. They may also use the 'rejectinvite' command.

Use the 'leaveparty' command to leave a party. You and any splitscreen players
on your machine will be removed from the party. Players after you will be
shifted to take your place on the splitscreen.
 2020-02-23 23:20:20 -08:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine
a997683d1c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2020-01-22 03:57:22 +01:00
Louis-Antoine
7d615ed94b Refactor player spawning code a little 2020-01-22 03:19:15 +01:00
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart
ce0c42a767 Merge branch 'newcontrols' into next-newcontrols 2020-01-04 09:56:24 -06:00
fickleheart
992ead1c85 Merge remote-tracking branch 'origin/master' into newcontrols 2020-01-04 09:35:12 -06:00
James R
b342301373 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:39:05 -08:00
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2019-12-31 12:58:36 -06:00
fickleheart
0ffb1e11f9 Fix tailsbot behavior that broke with Simple mode 2019-12-30 23:58:58 -06:00
fickleheart
758bb8f3ae Update playstyle menu handling to use analog/directionchar combo 2019-12-30 15:15:37 -06:00
fickleheart
e0d09a457e Convert simple movement to directionchar+analog 
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
 2019-12-30 15:05:24 -06:00
fickleheart
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
James R
08016fbdca Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08:00
Jaime Passos
62d79eef2a Same deal, but for starposts. 2019-12-27 17:14:56 -03:00
Jaime Passos
ff80c4ef4d Preparing for the inevitable gametype rule that will handle cooplives... 2019-12-27 17:08:20 -03:00
Jaime Passos
203f4c50a0 add G_CompetitionGametype(void) 2019-12-27 12:28:00 -03:00
Jaime Passos
c6dd9f016e Title card fixes. 2019-12-24 16:22:25 -03:00
Jaime Passos
100144d4db Merge remote-tracking branch 'origin/master' into gametype-clownery 2019-12-23 18:21:13 -03:00
Jaime Passos
920d99976c Lua! Lua! Lua! 
Expecting the buildbot to complain
 2019-12-19 02:13:09 -03:00