Commit graph

1981 commits

Author SHA1 Message Date
James R
cbcbe9f15b Reset DISPLAYPLAYERS if someone leaves 2020-06-06 22:28:13 -07:00
Sally Coolatta
8be2b26435 Merge branch 'grand-pricks' into nametags 2020-06-06 20:27:40 -04:00
Sally Coolatta
136bb1d252 Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player 2020-06-06 19:45:13 -04:00
Sally Coolatta
2a30fc365f Fix totalring/xtralife getting reset 2020-06-05 19:29:00 -04:00
Sally Coolatta
25c3774dc1 Let Sneakers stack with each other endlessly.
PROBABLY REALLY CONTROVERSIAL, so it's in this other branch... but it's tamer than it sounds, and it's *really* fun.

https://cdn.discordapp.com/attachments/275750804227489794/718541704822784061/kart0158.gif

https://cdn.discordapp.com/attachments/275750804227489794/718545963408687155/kart0161.gif

https://cdn.discordapp.com/attachments/275750804227489794/718543467847876689/kart0160.gif
2020-06-05 15:29:08 -04:00
Latapostrophe
f33e4d62a0 Sort conflicts, fix misordered follower bubble states in dehacked 2020-06-05 02:33:39 +02:00
Sally Coolatta
2a7f79b800 Merge branch 'grand-pricks' into nametags 2020-06-04 17:21:36 -04:00
Sally Coolatta
f4c0011a76 Merge branch 'master' into grand-pricks 2020-06-04 14:41:56 -04:00
Sally Coolatta
120dc253af Merge remote-tracking branch 'origin/iwantmychat' into nametags 2020-06-03 20:19:26 -04:00
Sally Coolatta
fac8f7f538 You get 1ups for carrying rings to the goal 2020-06-03 16:34:23 -04:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
Sally Coolatta
086ea73c2f Merge branch 'master' into respawn-updates 2020-06-01 15:49:30 -04:00
LJ Sonic
aeeb6e1b02 Merge branch 'next' into 'fix-spawn-desynch'
# Conflicts:
#   src/p_map.c
2020-06-01 08:15:02 -04:00
lachwright
48f167d75c Merge branch 'next' into dashmode-fixes 2020-05-30 18:13:21 +08: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
Sally Coolatta
285de3357d Add back to resynch & savegame, shorten names of a few variables 2020-05-29 13:12:07 -04:00
Sally Coolatta
d062a35a3a Huge respawn overhaul
- Moved respawn code to its own file
- Reorganized a lot of the code related to respawning
- As a result of the massive reorganization, I squashed several bugs. Most notably: mid-game joiners having weird spawns, being able to skip laps by respawning.
- Respawn lightsnake no longer takes you straight to your nextwaypoint -- it now has a minimum distance forward that it tries to put you at when you respawn.
2020-05-29 01:04:51 -04:00
Monster Iestyn
239b758cd1 Merge branch 'master' into next 2020-05-28 16:34:06 +01:00
Louis-Antoine
d886e35576 Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
Sally Coolatta
20b2dabae9 Merge branch 'pet-robo' into grand-pricks 2020-05-25 12:44:59 -04:00
mazmazz
0294f8d26a Fix NOWIPE bugs with colormap fade and title card 2020-05-25 00:20:23 -04:00
Sally Coolatta
9933687c6e Merge branch 'master' into pet-robo 2020-05-24 17:18:02 -04:00
Sal
f0ed1a58ce Merge branch 'demoman-tf2' into 'master'
Additional local explosion effects.

See merge request KartKrew/Kart!263
2020-05-23 21:29:38 -04:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
Sally Coolatta
0282615c38 Merge branch 'master' into pet-robo 2020-05-18 15:18:37 -04:00
Sally Coolatta
e425eabf04 Merge branch 'master' into grand-pricks 2020-05-17 11:39:39 -04:00
Sally Coolatta
0dd19f4f50 Merge branch 'master' into new-menus 2020-05-16 04:37:44 -04:00
toaster
76da8262e6 Correctly reset map/timer for retries where the first map in Marathon Run is LF_NORELOAD (by forcing a reload when the retry option is used). 2020-05-15 21:17:57 +01:00
toaster
5495ea16aa * In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default.
* Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 16:33:20 +01:00
toaster
7c97218284 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode
# Conflicts:
#	src/doomdef.h
2020-05-15 13:23:37 +01:00
toaster
4c412d931a Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.)
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.

Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).

Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.

Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 23:10:00 +01:00
Latapostrophe
6c68c95654 Make explosions cause earthquakes and initiate flashpals 2020-05-14 17:55:33 +02:00
Sally Coolatta
47c2c875d5 Increase bot difficulty every match based on placement, implement rival tag
Rival tag does not have an in-game indicator, but it is there & it gives the bot better odds
2020-05-14 02:18:32 -04:00
Latapostrophe
bf30ad91e4 Don't save Luavars in record attack, especially not for ghosts 2020-05-14 01:41:06 +02:00
Sally Coolatta
5c8275f905 Don't reset score when retrying 2020-05-13 05:21:35 -04:00
Sally Coolatta
fa5fccffc5 Implement lives system
Lose a life & restart the current race if you place below the top half. Lose all of your lives, and you get kicked to the title screen.
2020-05-13 02:14:39 -04:00
Sally Coolatta
249fff87ad Merge branch 'new-cars-movie' into colorize-tweak 2020-05-12 22:46:46 -04:00
Sally Coolatta
0038241325 Merge branch 'master' into new-cars-movie 2020-05-12 22:41:37 -04:00
Sally Coolatta
63797b35f7 Merge branch 'pet-robo' into grand-pricks 2020-05-12 22:40:02 -04:00
Sally Coolatta
1788d29263 Merge branch 'master' into pet-robo 2020-05-12 22:38:23 -04:00
sphere
4d9d125a99 Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f5d931cc Skincolor code cleanup
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04:00
Sally Coolatta
e2d95ae9c1 Fake results for bots that didn't get to finish in time 2020-05-09 23:08:11 -04:00
Sally Coolatta
8bb145e249 Use proper scoring system in GP 2020-05-09 22:33:10 -04:00
Sally Coolatta
4ae81ff236 Add menu for selecting cup & other options 2020-05-09 20:03:14 -04:00
Sally Coolatta
06002beb65 Add cupheaders to g_game.c
Whoops
2020-05-09 18:42:00 -04:00
Sally Coolatta
b4f8d708a4 Merge branch 'master' into new-menus 2020-05-09 17:04:10 -04:00
Jaime Passos
a4d6addbca Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
Latapostrophe
6e016b3f0b Use Followercolor_cons_t to account for extra values and avoid more dumb crashes 2020-05-09 11:57:33 +02:00