Commit graph

366 commits

Author SHA1 Message Date
wolfy852
5172deb345 Fix compiler warnings 2019-02-16 08:32:14 -06:00
Latapostrophe
4129dae3af Move ping display in i_video for consistency with showfps display 2019-02-16 13:38:50 +01:00
Latapostrophe
aeef900bc2 Lower default ping timeout + Fix chat arrows being missing while we're at it 2019-02-16 12:19:03 +01:00
Latapostrophe
01b585f22a Forgot to change this back from testing 2019-02-15 21:08:56 -06:00
wolfy852
db280e64a1 New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
wolfy852
da82535475 Ping kick changes + other quality of life improvements [REDO] 2019-02-15 20:51:44 -06:00
fickleheart
1c6046ac43 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/g_game.c
#	src/k_kart.c
2019-02-06 20:47:35 -06:00
Alam Arias
380bce88a0 remove whitespaces 2019-02-05 15:42:37 -05:00
james
460bc3c4ec Show scores but not "Player 1" in netreplays 2019-02-04 21:23:48 -08:00
james
e4a1470116 Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
Sal
327a11721c Merge branch 'gamepad-tweaks' into 'next'
Gamepad Improvements: Round 2

See merge request KartKrew/Kart-Public!24
2019-01-13 20:32:17 -05:00
wolfy852
4d8cf39320 Allow any key to abort network connection, ignore non-keyboard keys in chat 2019-01-13 19:22:54 -06:00
TehRealSalt
dff273d990 Minor misc fixes 2019-01-12 02:53:14 -05:00
wolfy852
93908a5610 Fix chat toggle not working 2019-01-11 02:38:49 -06:00
wolfy852
65a3b9f765 Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 2019-01-11 00:18:45 -06:00
wolfy852
d1bbebcbea Fix player 2 not being able to play while the chat is open
Also attempts to fix the d-pad typing characters into the chat box.
2019-01-10 06:08:12 -06:00
TehRealSalt
5be9f9e2d4 Add MUSICDEF lump for defining custom songs & replacing existing songs
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
TehRealSalt
09da50000e Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
Marco Z
74c57ad447 Kart Public Next merge 2019-01-08 18:43:49 -05: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
SeventhSentinel
046d66d803 Fix errors from merge 2019-01-06 01:00:30 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
SeventhSentinel
9365f7f235 Minor touchups/cleanup 2019-01-04 16:47:03 -05:00
SeventhSentinel
74aba46823 In-game music credits 2019-01-04 04:44:55 -05:00
mazmazz
2fe8317103 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2019-01-02 19:23:59 -05:00
mazmazz
238be26915 Fix strncpy nodenum length overflow 2019-01-02 19:23:56 -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
Latapostrophe
be35a106c5 Don't overlap ringslinger HUD 2018-12-17 21:31:31 +01:00