Commit graph

92 commits

Author SHA1 Message Date
toaster f182bb867f 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-20 22:57:47 +01:00
toaster b0326b6dec 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-18 18:51:24 +01:00
Monster Iestyn 66bc287688 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Monster Iestyn 600a373739 Merge branch 'master' into next 2019-05-13 16:07:30 +01:00
Alam Ed Arias addf2bb3c4 Fix NONET build 2019-05-13 01:51:36 -04:00
Monster Iestyn 2fb569857a 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 356249dade Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
mazmazz 8ea8bf2587 Chat arrow offsets 2019-01-07 22:34:48 -05:00
mazmazz 5066e340f4 Update SRB2-CHAT nickname colors to 2.2 skincolors 2019-01-07 22:26:39 -05:00
mazmazz a775a63dfd WIP hu_stuff merge fixes 2019-01-07 17:56:55 -05:00
mazmazz 075f28b7c8 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 814db7e371 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
mazmazz 32697ddf61 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2018-12-24 18:51:11 -05:00
Latapostrophe db8e1c0393 Fix the chat being displayed in singleplayer if there are stillmessages 2018-12-23 10:50:36 +01:00
mazmazz 3703a032f0 Buildbot fixes 2018-12-23 03:39:27 -05:00
mazmazz 6ebc41a554 Check target < MAXPLAYERS before PM 2018-12-23 02:25:58 -05:00
mazmazz 56320a35ce Use TinyFont for chat arrows 2018-12-22 22:40:04 -05:00
mazmazz 7e9411f320 Minor code cleanup, CHAT 2018-12-22 21:17:01 -05:00
mazmazz a66a2021ba Draw up and down arrows by string 2018-12-22 20:57:53 -05:00
mazmazz fb3722a6f3 Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN 2018-12-22 20:52:32 -05:00
mazmazz 0f0e30924f One more free(nodenum) 2018-12-22 20:35:12 -05:00
mazmazz 5badc11159 Fix integer overflow on for loop decrements 2018-12-22 20:18:25 -05:00
Latapostrophe c7060aa5ad 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 619dd9d08a 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 10521d161c Fix various bugs with the chat. 2018-12-21 22:28:28 -05:00
mazmazz 1fcf607b41 Fix strncpy nodenum length overflow 2018-12-17 21:31:00 -05:00
mazmazz 876ddd48f1 Change int to INT32 2018-12-17 19:09:05 -05:00
mazmazz bf21b7c483 Mixed D&C fixes for HU_DrawTeamTabRankings 2018-12-17 19:03:09 -05:00
mazmazz 7a92c9d3d0 Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
mazmazz 245a125551 Fix compile errors 2018-12-17 18:55:21 -05:00
Latapostrophe 2fdf27c507 make sure to change p_dispy and not y for /pm list. Also make MPC happy. 2018-12-17 21:39:49 +01:00
Latapostrophe ff957baae3 Don't overlap ringslinger HUD 2018-12-17 21:31:31 +01: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
Monster Iestyn 33c1ac33f5 Merge branch 'next' into 21-version
# Conflicts:
#	src/d_netcmd.c
2018-12-02 15:45:07 +00:00
Wolfy b8ce51bff2 Multiple admins
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
2018-11-29 06:46:59 -06:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz 2acad7ad86 Dont show Hold to Retry HUD when using Pause/Break key 2018-11-21 11:10:18 -05:00
Monster Iestyn 5eddb1f455 Merge branch 'master' into hud-n-menu-tidbits 2018-08-29 21:28:11 +01:00
Monster Iestyn 1af8d3ac02 Merge branch 'master' into hud-n-menu-tidbits
# Conflicts:
#	src/m_menu.c
#	src/screen.c
#	src/st_stuff.c
2018-08-28 20:51:46 +01:00
Monster Iestyn aa863e481e Add INFLIVES macro, to make it easier to find infinite lives-related code 2018-08-23 20:09:39 +01:00
Latapostrophe 40b4d63620 Fix capslock being wonky. 2018-08-19 11:25:20 +02:00
Latapostrophe b09019dc4a Fix old chat detection. 2018-08-19 11:12:21 +02:00
Latapostrophe 8747a8529d Changed chat position,
Added chat back tint
Fixed word wrapping glitches
2018-08-19 10:58:29 +02:00
Monster Iestyn 55fd60b29b Merge branch 'master' into leveltitle-tinkering
# Conflicts:
#	src/hu_stuff.h
2018-08-10 20:03:59 +01:00
Latapostrophe 03dc4c9680 Fixed sub 400p chat for console 2018-07-31 23:56:23 +02:00
Latapostrophe ad187c26f0 Repositionning chat & bugfixes 2018-07-31 15:57:19 +02:00
Latapostrophe ac7c249fd2 SRB2chat test rework 2018-07-31 11:10:02 +02:00
Monster Iestyn fe6b47dc00 Merge branch 'master' into leveltitle-tinkering
# Conflicts:
#	src/hu_stuff.h
#	src/st_stuff.c
2018-06-14 21:26:44 +01:00
toaster a3f7e07e4d Improve retrying text presentation.
* Now reads "HOLD TO RETRY...".
* Behind the white flash.
* Shows on button tap for about half a second.
2018-06-14 14:41:14 +01:00