Commit Graph

46 Commits

Author SHA1 Message Date
fickleheart 2fbb0ca5f4 Show music credit for credits 2019-03-31 13:09:49 -05:00
wolfy852 1fb65c72ff Reorganization + kill old interfaces 2019-02-19 18:52:57 -06:00
wolfy852 82dbf45fa4 Fix compiler warnings 2019-02-16 08:32:14 -06:00
wolfy852 07e56e550e New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
wolfy852 88b5a056c8 Fix the chat being incorrectly placed in splitscreen 2019-01-11 16:04:12 -06:00
wolfy852 6c4decfef3 Don't check splitscreen in OLDCHAT 2019-01-10 13:52:58 -06:00
SeventhSentinel 73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
Digiku d72e3fe71c Merge branch '2122-patch-dta-update' into '2122-version'
Changes related to 2.1.22 patch.dta update

See merge request STJr/SRB2!417
2018-12-23 18:08:38 -05:00
mazmazz 94858aedfe Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 23:20:01 -05:00
mazmazz a9fb17dab1 Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)"
This reverts commit 6400729034.
2018-12-22 22:40:58 -05:00
mazmazz 6400729034 Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 21:48:24 -05:00
mazmazz e0176670f4 Correct splitscreen check in OLDCHAT 2018-12-22 21:30:39 -05:00
mazmazz fb3722a6f3 Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN 2018-12-22 20:52:32 -05:00
Latapostrophe 45aba493c7 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
Latapostrophe 25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
TehRealSalt 5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Monster Iestyn b3e8a1ed88 HU_Start should not have FUNCMATH, it has side effects 2018-11-07 21:37:42 +00:00
toaster a9b4a56d23 Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
* Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps.
* Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix).
* Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything.
* Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers.
* Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
toaster 791dc079ec Merge branch 'master' into 'chat-changes'
# Conflicts:
#   src/hu_stuff.c
2018-10-21 08:27:28 -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 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
Latapostrophe 346c6bce96 HU_AddChatText cleanup for future use + chat mode Window (Hidden) added. 2018-10-10 21:24:55 +02:00
Latapostrophe 4aea053c2f Allow client to open chat and scroll even if muted. 2018-10-03 20:09:32 +02:00
Latapostrophe b09019dc4a Fix old chat detection. 2018-08-19 11:12:21 +02:00
toaster b319c2d9b8 * Homogenise old chat mode detection, which includes `cv_consolechat.value`, `dedicated`, and `vid.width < 640`.
* Make the chat notification sounds work in old chat mode.
2018-08-03 23:01:09 +01:00
Latapostrophe 3af7b7bf91 merge sonicitems into chat-changes so that it's not lagging 10 years behind 2018-07-31 19:45:49 +02:00
Latapostrophe ac7c249fd2 SRB2chat test rework 2018-07-31 11:10:02 +02:00
toaster a036e9cdc8 A bunch of little things.
* Fix both cv_timelimit and cv_pointlimit as "hidden options" for people to play with if they know about them via the console.
* Show GAME SPEED on the tab screen.
* Fix Invincibility and Grow's music changes being broken. (I didn't test them properly when making them P_RestoreMusic calls, sorry.)
* Stop showing the First Person Kart view in spectator mode, per Sal's request.
2018-07-18 21:40:04 +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 ec0c358755 Merge branch 'master' into sonicitems 2018-07-08 17:51:44 -04:00
toaster 97348beb66 Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably:
* Remove FUNCMATH from all void-returning functions, given GCC80 specifically complains about this case.
	* Extend the length of all extant buffers to the safety threshold recommended by the compiler.
	* Add void casts to WS_getaddrinfo's setting to prevent complaints about incompatible typecasts.
	* Extend the charsel, face, and superface buffer sizes and writes to include the null terminator. (I didn't really want to do this because it's not even particularily NEEDED, but there was literally zero way to get around the request that I could find with multiple online searches. I tried.)
2018-07-07 16:52:01 +01:00
toaster cf6f85a72a Don't look at this commit too closely until after netgame, I want to surprise yalls!!
* Lots of menu changes!
	* Little arrows next to changeable cvars!
	* Show default value for sliders!
	* Pretty pretty pretty.
	* I don't know how to describe some of these changes.
* Effectively nuke MIDI music support!
* Skiddown at the start of a race is more interesting!
* Spinning in waterslides!
* Tiny bugfix in voting, plus a little celebration...
2018-06-30 23:18:13 +01:00
wolfy852 8abeae7805 Chat Manager 2018-06-15 05:20:01 -05:00
TehRealSalt 0fe06a0089 Add the accent 2018-03-29 13:35:40 -04: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
Wolfy 36439da320 Resurrect the minimap
Still kinda broken.
2017-12-18 18:07:38 -06: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
STJrInuyasha b2c71944f6 Revert "Chat and console improvements" 2016-11-03 00:34:15 -07:00
Louis-Antoine 2d72b2fac6 You can now move the cursor in command prompt and chat, using left/right, ctrl+left/right, home/end, and select text with shift 2016-11-02 19:31:06 +01:00
ZTsukei d631d0ef04 S_PLAY states, HUD stuff 2016-08-14 23:51:25 -04:00
ZTsukei e4a970f894 Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
Alam Ed Arias 4d6a3e3398 FUNCMATH fun 2016-06-12 16:08:48 -04:00
Inuyasha f07585191b copyright dates/statements updated and such
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
ZTsukei dd4bb4259a Some hu_stuff 2016-03-27 10:43:59 -04:00
Alam Ed Arias b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00