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
Latapostrophe
4c88271cfb
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
Latapostrophe
34f13e9f20
merge conflict
2018-12-16 16:48:15 +01:00
Monster Iestyn
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Wolfy
cabe9871e3
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
mazmazz
72a32696a5
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 11:10:18 -05:00
toaster
e8e44e1a2f
Fix the player in 16th not being visible in rankings
2018-11-18 20:05:17 +00:00
Latapostrophe
0c16dad2d7
forgot whitespaces....
2018-11-17 22:23:23 +01:00
Latapostrophe
30255b4c9a
Fix capslock not working outside of chat/console and shifting non letter characters
2018-11-17 22:21:10 +01:00
Latapostrophe
4702c6fcf7
Merge branch 'master' into lua-hudlib
2018-11-03 22:25:33 +01:00
toaster
9f1acf3528
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
f0a4388998
I forgot a }, you may slap me.
2018-10-31 17:14:32 +01:00
Latapostrophe
9fe01d90d8
Resolved merge conflict and renamed gamerankings to minirankings
2018-10-31 15:18:05 +01:00
toaster
bac297b658
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
toaster
c71e71a4b4
Fix ping alignment.
2018-10-30 22:44:05 +00:00
toaster
76a5f98c62
Make the horizontal line at the bottom of the tab rankings use the duptweaks.
2018-10-30 22:09:04 +00:00
toaster
ee4cbe4b51
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup
2018-10-30 22:08:17 +00:00
Latapostrophe
295bf081a7
A few additions to the hud library
2018-10-30 18:24:03 +01:00
toaster
4766d3fbea
Merge branch 'master' into 'toast_pokes'
...
# Conflicts:
# src/hu_stuff.c
2018-10-29 07:04:35 -04:00
toaster
1c01e1af14
Merge branch 'master' into 'chars_cleanup'
...
# Conflicts:
# src/hu_stuff.c
2018-10-29 06:48:18 -04:00
toaster
6ab0faae6f
Ping offset fixed even more
2018-10-28 18:06:21 +00:00
toaster
62bd9fafbf
fix ping drawing offset (this won't be in the exe I uploaded before I disappear for a bit)
2018-10-28 16:34:02 +00:00
toaster
9195885ff5
unused variable [screams]
2018-10-28 16:29:56 +00:00
toaster
3c04b2103b
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
TehRealSalt
8d7d84e72a
This bothers me, so I might as well do it while I'm in here.
2018-10-27 21:48:50 -04:00
TehRealSalt
7e15e8b55d
"if !splitscreen" instances that SHOULD be "if netgame"
2018-10-27 21:45:04 -04:00
toaster
88b13212d9
Minor things that annoyed me to NO GOOD END.
...
* Tweak the demo info layout (holding tab while demoplayback) to better match the Viewpoint text in MP.
* Make the tab rankings view support widescreen better, including the spectator ticker (but not the player name layout).
* Make the tab rankings view always have a darkened background, to get around the fact we can't darken it based on player state for battle.
* Remove FREE PLAY from tab rankings.
2018-10-27 20:43:33 +01:00
Latapostrophe
ef08560bf4
Reimplemented the splitscreen chat fix
2018-10-25 20:02:43 +02:00
Latapostrophe
bd1c7e2bc6
Fixed the menu highlight thing
2018-10-25 19:41:14 +02:00
Latapostrophe
35f576c166
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
2018-10-25 13:21:44 +02:00
Latapostrophe
532b2a26ec
Console color default changed to Black + resolved mergeconflict hopefully
2018-10-21 14:58:50 +02:00
Latapostrophe
c578617220
Merge branch 'chat-changes' of git.magicalgirl.moe:KartKrew/Kart into chat-changes
2018-10-21 14:53:22 +02:00
Latapostrophe
84b513a952
Console background color default changed to Black + Resolved merge conflict (hopefully)
2018-10-21 14:51:34 +02:00
toaster
9ad5b9da80
Merge branch 'master' into 'chat-changes'
...
# Conflicts:
# src/hu_stuff.c
2018-10-21 08:27:28 -04:00
TehRealSalt
4afae2968e
Optimize
2018-10-16 12:25:51 -04:00
Latapostrophe
102d45f590
More stuff goes in HU_AddChatText, fixed /pm list not having the correct coords if kartspeedometer was on.
2018-10-11 21:39:19 +02:00
Latapostrophe
4b2cb6b4e5
HU_AddChatText cleanup for future use + chat mode Window (Hidden) added.
2018-10-10 21:24:55 +02:00
TehRealSalt
511944a1f1
Merge branch 'master' into net-screen
2018-10-09 15:43:38 -04:00
Sal
dac50d0a7c
Merge branch 'sal-cleanup' into 'master'
...
Sal cleanup
See merge request KartKrew/Kart!23
2018-10-09 15:33:52 -04:00
TehRealSalt
b6ff542803
Merge branch 'master' into net-screen
2018-10-09 14:41:59 -04:00
TehRealSalt
ab0c7b6ba8
use cvar mins
2018-10-08 14:49:48 -04:00
TehRealSalt
aa4c42fa98
Scale chat in splitscreen
...
Only covers things on P1's screen now
2018-10-08 14:38:29 -04:00
TehRealSalt
3e99d4838e
Simpler loop
2018-10-08 13:58:16 -04:00
TehRealSalt
1bce22cf72
Merge branch 'master' into sal-cleanup
2018-10-08 00:22:44 -04:00
TehRealSalt
1acee694aa
Don't let chat/console eat inputs from anyone besides player 1
2018-10-08 00:14:29 -04:00
