Commit graph

92 commits

Author SHA1 Message Date
TehRealSalt 9acd0ffe8b Fix for waiting player screen animation 2018-11-18 06:34:29 -05:00
TehRealSalt e85e621d2c Minor credits issues 2018-11-16 12:05:57 -05:00
TehRealSalt 692ea23a42 Final credits 2018-11-15 22:55:01 -05:00
TehRealSalt f859139353 Final title screen 2018-11-14 00:30:51 -05:00
TehRealSalt 7c2535808f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-13 21:02:49 -05:00
TehRealSalt 1ab5ac58a7 Title demos don't interrupt the music 2018-11-13 21:01:59 -05:00
toaster 5d2e638e8a final menu tweaks before i fall asleep in my chair 2018-11-14 01:27:01 +00:00
TehRealSalt d0f21ca415 Merge branch 'sfx-clean' 2018-11-12 04:26:02 -05:00
TehRealSalt 91ae26e213 Use S2 rips on the title screen 2018-11-11 19:22:15 -05:00
Sryder 6af56273bf Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
Monster Iestyn fced19d291 Merge branch 'master' into next 2018-11-10 19:05:33 +00:00
TehRealSalt 69287984db Merge branch 'master' into staff_names 2018-11-08 14:47:38 -05:00
Monster Iestyn 0bdbdd1b1e Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00:00
toaster 8e6ecb5e98 * Add numbers to the staff name strings as Sryder requested.
* Make the maximum number of staff ghosts 99 instead of 100. It's a minor thing, and insignificant in the grand scheme of things, but it fixes a bugbear I haven't been able to get out of my head since originally starting to maintain this code. (In the case of 100, it'd do S00, which'd have some fucky effects on ordering. If we WANTED to start with S00, we shoulda used that slot in the first place.)
2018-11-07 21:42:10 +00:00
TehRealSalt 499faec555 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
toaster 5ccfc111e8 Disable attempt at preventing replays with the same staff member back to back, based on Discord discussion. If the RNG does this to you, you're on your own. 2018-11-05 23:18:34 +00:00
toaster 7be7c600bf Cleaner code logic. Should make no real difference to exe, so not gonna upload another. 2018-11-05 14:28:32 +00:00
toaster 0d0eaf5f99 Fix "laststaff" setting 2018-11-05 14:03:09 +00:00
toaster 75d08f2048 TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!!
Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
Monster Iestyn 29b242a5bd Merge branch 'endgame-code-refactor-backport' into 'next'
Endgame code refactor

See merge request STJr/SRB2!297
2018-10-19 17:31:19 -04:00
toaster a1e1aa81b5 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 31f3f8b8e7 Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame 2018-10-11 21:24:53 +01:00
Monster Iestyn 9c464742b7 Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
toaster d42736fe3d Include srb2.org in the credits per Rob's wishes. 2018-10-01 21:23:00 +01:00
toaster 21ba9921da Some credits tweaks (alphabetical ordering plus new names, plus slight downwards adjustment of TYLER52) 2018-09-28 20:10:22 +01:00
Sal 8ff0e976c2 Merge branch 'new-voices' into 'master'
New voices

See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
TehRealSalt 118d9caad1 New voices
- Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?)
- Win/lose quotes are played at full volume for the person who said it.
- A new sound effect plays when you hit someone with voices disabled.
- Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions
- Added our skin sound constants to the dehacked list.
- Unrelated: finish line sfx plays in splitscreen
2018-08-28 16:29:50 -04:00
toaster a6d1e799f9 * 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 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
colette 0a931a1364 Update f_finale.c 2018-07-07 20:20:46 -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