Commit graph

63 commits

Author SHA1 Message Date
toaster f125573048 Some minor things to help draw sonicitems to a close.
* "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme".
* Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow).
* Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place.
* Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 18:35:56 +01:00
toaster 2b7298e959 *A biggie: two-tier intermission screen!
* Have the entire thing slide the fuck away a short while into the intermission.
	* The tab screen is modified to work off similar behaviour and presentation.
* To go with it, a revamp of how Battle's scoring is handled.
	* It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race.
	* No more resetting of score between battle rounds.
* Minor, unrelated general code cleanup in places.
* Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 20:23:46 +01:00
TehRealSalt 9da279006f Merge branch 'master' into sonicitems 2018-07-10 17:02:55 -04:00
toaster 0accb8fca7 While we're doing it, fix the animation/music happening while paused! 2018-07-10 19:51:34 +01:00
TehRealSalt ec0c358755 Merge branch 'master' into sonicitems 2018-07-08 17:51:44 -04:00
TehRealSalt 7e7f4dc5bc F_WaitingPlayersTicker() -> F_WaitingPlayersTicker(void) 2018-07-06 19:44:21 -04:00
SeventhSentinel d25f0b0d7e Killed another file I accidentally made 2018-07-04 16:12:05 -04:00
toaster 249bb594d8 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:29:21 +01:00
toaster b0d9110e5f Intermissions...
* Do the gametype change stuff on the voting screen.
* Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical.
* Have the timer at the bottom be the highlight colour.
* Map hell! LF2_HIDEINMENU is craftily reused...
* Less allocation and deallocation for the adjacent G_RandMaps.

Other stuff...
* Fix command_map_f not resetting players' score in battle.
* Shiny titlescreen!
* Fix a random bonus newline in one of the quit messages.
2018-07-02 23:23:04 +01:00
Sryder c8f61edea5 Screen for waiting during intermission after connecting 2018-07-02 22:11:03 +01:00
TehRealSalt 36b52e1c67 Merge remote-tracking branch 'refs/remotes/srb2public/next'
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/m_misc.c
2018-04-07 18:43:59 -04:00
TehRealSalt 1c0e9eb12c I just realized that SRB2's credits are listed in alphabetical order of last name
(I had to research the Polish alphabet to figure out where Fooruman's
name should've been, hah)
2018-03-30 14:14:08 -04:00
Sryder 0aaae501d3 Warnings must die 2018-03-30 18:53:23 +01:00
Sryder 66f220d6ad Merge branch 'master' into openglquickfixes 2018-03-30 18:09:41 +01:00
TehRealSalt 7516a1dc0c Doing one more step to totally ensure that matchesplayed is unlocking stuff 2018-03-30 12:16:15 -04:00
TehRealSalt e86aa94f74 Zigs & better scroll 2018-03-29 18:11:06 -04:00
TehRealSalt 2cc2b68e38 Oh boy another real name 2018-03-29 14:48:45 -04:00
TehRealSalt 0fe06a0089 Add the accent 2018-03-29 13:35:40 -04:00
TehRealSalt 6fa54576f6 Real naaaames 2018-03-29 12:57:41 -04:00
TehRealSalt 713fba7111 More full names, and more names 2018-03-29 01:34:31 -04:00
TehRealSalt f2bc7d16c9 Allow skipping (for real this time) 2018-03-28 22:12:45 -04:00
TehRealSalt d07419b6ac Allow skipping 2018-03-28 21:52:35 -04:00
TehRealSalt ad42a9f63c Some more credit adjustments 2018-03-28 20:32:53 -04:00
TehRealSalt 9dd14531ee More credit stuff 2018-03-28 19:27:26 -04:00
TehRealSalt 38b59aaaf1 Actually, ehhh, let's remove full names for everyone who hasn't went "yes, I want my full name on Kart's credits 2018-03-28 16:25:43 -04:00
TehRealSalt caa000d5d6 A quick credits draft
Please give me corrections and people to add. I've not been here as long
as some people, so there is 100% probably people I missed
2018-03-28 16:17:04 -04:00
Sryder 527df5c248 Fix OpenGL Title Screen Sky
My IDE doesn't seem to like Vada's name.
2018-03-17 15:11:32 +00:00
toasterbabe fee8714109 i suck at the alphabet! 2018-03-14 16:55:33 +00:00
toasterbabe a5ab9f01bb oh yeah this guy's name needs changing too 2018-03-14 16:49:10 +00:00
toasterbabe 68cb919205 down with cis 2018-03-14 16:47:19 +00:00
TehRealSalt 672c4b5298 Record best lap time in Record Attack
- Record Attack replays now save best lap time
- Removed instances of NiGHTS Attack
- Removed a lot of unlockable that have no use in Kart (ultimate mode,
perfect bonus, score emblems, etc)
- Removed all methods of activating ultimate mode
2018-01-21 19:15:26 -05:00
TehRealSalt 0401a8654a Merge remote-tracking branch 'refs/remotes/origin/master' into buuump
# Conflicts:
#	src/f_finale.c
2018-01-15 16:20:10 -05:00
Sryder13 1448956f26 Fix checkers position in non-green resolutions 2018-01-15 04:03:27 +00:00
Sryder13 96612ab934 Base title screen, gets screen fade working from intro->title for the fade to work 2018-01-15 03:40:25 +00:00
TehRealSalt 3f1b312c77 Title screen 2018-01-13 14:24:02 -05:00
TehRealSalt c70a2f51aa Tweeeeeaks
- MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples
- Made some Battle-related messages only happen in netgames
- Messed with the timing on the intro
2017-12-28 18:37:25 -05:00
Wolfy 25599ff813 Multiple admins 2017-11-10 23:34:37 -06:00
Sryder13 1f7caee344 Highres intro graphic 2017-10-25 23:05:19 +01:00
Sryder13 f7b637663c Setup intro finally 2017-10-25 20:30:02 +01:00
Sryder 68d439a783 Merge branch 'upstream/next' into zarrotsu_vanillamerge
# Conflicts:
#	src/Makefile
#	src/doomdef.h
#	src/hardware/hw_main.c
#	src/p_mobj.c
#	src/p_user.c
#	src/r_segs.c
#	src/sdl/i_video.c
#	src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Monster Iestyn 4ac709141a Added LJSonic to credits, altered how my own name + nick is shown in credits 2017-01-15 19:23:25 +00:00
Monster Iestyn ab3f677e66 F_EndCutScene now sets cutsceneover to true BEFORE running Y_EndGame and the like, not AFTER 2016-08-25 17:58:54 +01:00
ZTsukei 3a3180ce05 Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
ZTsukei e4a970f894 Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
toasterbabe 71f5d4ea85 ...completely misunderstood the reasons we weren't merging toast_slopes, mom holy fuck i'm stupid and bad
Enjoy your slopes without physics, people :D
2016-06-20 00:20:20 +01:00
toasterbabe 9e87f6d85d i did so much in this branch, so UPGRADE ME TO PROGRAMMER
note: once this is merged into internal, you should probably remove me from "programming assistance" so i'm not duplicated for no clear reason. unless you want me to slowly take over every section in the credits >:3c
2016-06-10 22:45:42 +01:00
Inuyasha f07585191b copyright dates/statements updated and such
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Wolfy 0549ac270b Merge branch 'toast_credits' into 'next'
One more name in the credits

I probably messed up by making toast_credits based on master instead of next. If that's blocking, just delete this branch and I'll re-do it. It's a single line, though - shouldn't exactly matter so much.

Could probably stand to be merged into Internal as well, since I hadn't actually worked on any textures when we'd updated the credits there.

See merge request !69
2016-05-04 16:25:16 -04:00
toasterbabe a4a5ac161f One line through selfish methods. Probably works in both Next and Internal. 2016-05-04 20:14:24 +01:00
Inuyasha a8bca89dbd Merge branch 'backport_unslot-music' into 'next'
BACKPORT: removal of music slots

Relevant commits cherry-picked. Basically everything except the internal music track name switches.

See merge request !43
2016-03-03 22:31:21 -05:00