Commit graph

111 commits

Author SHA1 Message Date
Louis-Antoine
fc01862eeb bruh 2020-01-15 15:57:38 +01:00
Louis-Antoine
6d703add73 Cleanup chat code a little 2020-01-15 15:48:03 +01:00
LJ Sonic
fd18f1cb7f Merge branch 'fix-node-player-mixups' into 'master'
Fix node player mixups

See merge request STJr/SRB2!684
2020-01-12 15:57:20 -05:00
Louis-Antoine
82876c2eff Replace all instances of XD_KICK with a SendKick function 2020-01-12 19:43:04 +01:00
Louis-Antoine
61a681ed02 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
MascaraSnake
abdfc2d237 Merge branch 'exit-move-lj' into 'master'
Post-exit movement

See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
James R
a8a6add1fc Shift ping display in scores HUD up, so it aligns with the bottom of player name 2019-11-17 18:53:17 -08:00
James R
51a2b76970 Snapping for showping, so it doesn't jump way up on non-green 2019-11-17 18:52:05 -08:00
Steel Titanium
b1f39e836d Better ping implementation. 2019-11-17 20:22:47 -05:00
Louis-Antoine
1ef50d8813 Show the exit icon for finished players 2019-11-17 23:44:48 +01:00
James R
1c2eb88163 Don't confuse node with player in commands
(cherry picked from commit 17bdf39dc8372ed9c6c31fa8d00eba03396a55bf)
2019-11-15 16:07:15 -08:00
Jaime Passos
845b82668b Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
Steel Titanium
61ada17da1 Basic outline color support.
This is a huge hack as it requires another font set, with each character's offset manually being set using SLADE.
2019-10-10 02:00:52 -04:00
Steel Titanium
43cd0e5dd0 WIP: New character select name font 2019-10-09 00:28:01 -04:00
Jaime Passos
398b320aec initial stuff 2019-09-08 18:27:35 -03:00
toaster
74c32c1b2b A good and bad ending cutscene now exist.
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)

Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
toaster
b2488f11b7 Remove some more 2.1-related ringslinger offsets to the chat. 2019-06-22 20:17:09 +01:00
toaster
892240bb77 HUD stuff.
* Re-fix chat HUD position, and make it not move in match (which it needed to do in 2.1).
* Fix HU_drawPing for the new palette.
* Change the condition for greying out players, since the current one was buggy.
* Allow for tokens on the coop MP HUD, and use the small emeralds so there's space for them.
* Fix the mapping between skincolours and name colours in new chat, specifically to take into account every possible text colour (as opposed to the port previously done, which only used the 2.1 text colours and looked like ass as a result).
2019-06-22 16:54:05 +01:00
toaster
982d97a267 Do some minor HUD fixes.
* Move HUD text's anchoring to underneath STR instead of above Lives.
* Adjust chat position slightly, to take advantage of SRB2's HUD layout having less content towards the bottom (unlike Kart, where it has roughly equal).
* Fix Match emeralds not displaying while in tab rankings with all-seven invuln/shoes bonus active.
2019-06-22 16:53:38 +01:00
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Monster Iestyn
c8e3748a1c Merge branch 'master' into next 2019-05-13 16:07:30 +01:00
Alam Ed Arias
be13ab4830 Fix NONET build 2019-05-13 01:51:36 -04:00
Monster Iestyn
5d059da843 Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
2019-03-18 22:00:23 +00:00
james
e4a1470116 Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
mazmazz
e5125d0746 Chat arrow offsets 2019-01-07 22:34:48 -05:00
mazmazz
1821edeee7 Update SRB2-CHAT nickname colors to 2.2 skincolors 2019-01-07 22:26:39 -05:00
mazmazz
38ad1ec027 WIP hu_stuff merge fixes 2019-01-07 17:56:55 -05:00
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
mazmazz
bd4874aa53 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
mazmazz
34964a07a8 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2018-12-24 18:51:11 -05:00
Latapostrophe
c282d546d7 Fix the chat being displayed in singleplayer if there are stillmessages 2018-12-23 10:50:36 +01:00
mazmazz
5c75e1e5c2 Buildbot fixes 2018-12-23 03:39:27 -05:00
mazmazz
3b408b19e4 Check target < MAXPLAYERS before PM 2018-12-23 02:25:58 -05:00
mazmazz
9453a10097 Use TinyFont for chat arrows 2018-12-22 22:40:04 -05:00
mazmazz
3c3ddc4cc9 Minor code cleanup, CHAT 2018-12-22 21:17:01 -05:00
mazmazz
31c5b6fd66 Draw up and down arrows by string 2018-12-22 20:57:53 -05:00
mazmazz
123462672c Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN 2018-12-22 20:52:32 -05:00
mazmazz
1c914ec5ff One more free(nodenum) 2018-12-22 20:35:12 -05:00
mazmazz
49222b1663 Fix integer overflow on for loop decrements 2018-12-22 20:18:25 -05:00
Latapostrophe
9e49a9ca5d Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message. 2018-12-22 16:44:58 +01:00
Latapostrophe
09dbb6d631 Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages. 2018-12-22 12:34:17 +01:00
Steel Titanium
0ea0dbef8e Fix various bugs with the chat. 2018-12-21 22:28:28 -05:00
mazmazz
d07f44457f Fix strncpy nodenum length overflow 2018-12-17 21:31:00 -05:00
mazmazz
54abae1dde Change int to INT32 2018-12-17 19:09:05 -05:00
mazmazz
a607372283 Mixed D&C fixes for HU_DrawTeamTabRankings 2018-12-17 19:03:09 -05:00
mazmazz
6a87980afd Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
mazmazz
7c7d85bf74 Fix compile errors 2018-12-17 18:55:21 -05:00
Latapostrophe
71074ccce1 make sure to change p_dispy and not y for /pm list. Also make MPC happy. 2018-12-17 21:39:49 +01:00