Sal
9fb290577a
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
dead0475ce
Allow any key to abort network connection, ignore non-keyboard keys in chat
2019-01-13 19:22:54 -06:00
TehRealSalt
89f12599c6
Minor misc fixes
2019-01-12 02:53:14 -05:00
wolfy852
622509682a
Fix chat toggle not working
2019-01-11 02:38:49 -06:00
wolfy852
d5e16dca63
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
2019-01-11 00:18:45 -06:00
wolfy852
73369679f5
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
de72403fb9
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
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
Marco Z
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
SeventhSentinel
49f2d65e95
Fix errors from merge
2019-01-06 01:00:30 -05:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
SeventhSentinel
3e37d131ed
Minor touchups/cleanup
2019-01-04 16:47:03 -05:00
SeventhSentinel
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
mazmazz
6166b78c87
Fix gcc 8 compile by using strcpy instead of memcpy for PM
2019-01-02 19:23:59 -05:00
mazmazz
c338115ebc
Fix strncpy nodenum length overflow
2019-01-02 19:23:56 -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
TehRealSalt
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05: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
toaster
a6d48f0ef4
Fix the player in 16th not being visible in rankings
2018-11-18 20:05:17 +00:00
Latapostrophe
477400020d
forgot whitespaces....
2018-11-17 22:23:23 +01:00
Latapostrophe
e9767df4ff
Fix capslock not working outside of chat/console and shifting non letter characters
2018-11-17 22:21:10 +01:00
Latapostrophe
4cbc270b6d
Merge branch 'master' into lua-hudlib
2018-11-03 22:25:33 +01:00
toaster
659e6fa617
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case.
...
* Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'!
* Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites.
* Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
Latapostrophe
1928dd86f1
I forgot a }, you may slap me.
2018-10-31 17:14:32 +01:00
Latapostrophe
7a04fd1097
Resolved merge conflict and renamed gamerankings to minirankings
2018-10-31 15:18:05 +01:00
toaster
26241d32ce
Have HU_DrawRankings and K_drawKartPositionFaces learn a thing or two from each other, considering the latter was originally copypasted code from the former but then diverged a bit.
...
Hopefully this solves our disconnect woes.
2018-10-30 23:01:17 +00:00