Commit graph

496 commits

Author SHA1 Message Date
James R
e123b2acd7 Stop drawing after the scores hud 2019-07-17 12:29:10 -07:00
James R
a2739b8032 Fix minor errors 2019-06-23 16:33:53 -07: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
James R
8ee25a7c8a Begin using the font system 2019-06-03 14:57:58 -07:00
James R
0b0b7c480b Set up with the font system 2019-06-03 14:57:05 -07:00
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
TehRealSalt
407344299c Rename colors
My attempt at compromise didn't work, so I'll just have it my way
2019-05-14 21:00:40 -04:00
TehRealSalt
ddaf5658d5 Finish skincolors
The only thing remaining is super colors, but I'm not too fussed about that for a merge request because
2019-05-13 23:21:07 -04: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
TehRealSalt
dc41fe3d8d Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff 2019-05-12 17:19:49 -04:00
TehRealSalt
3e93180d3d Don't cover chat with pause effect 2019-05-06 22:39:20 -04:00
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
TehRealSalt
2e22194677 Final v1 colors
- 11 new colors: Skunk, Artichoke, Pigeon, Walnut, Cinnamon, Lemonade, Quarry, Crocodile, Azure, Thunder, & Wristwatch
- Updated Dawn, Sunset, Cream, Gold, Olive, Vomit, Lime, Plague, & Caribbean
- Updated opposite colors for Bubblegum & Camouflage in response to the new colors
2019-04-26 18:18:53 -04:00
TehRealSalt
089be795a2 Huge splitscreen refactor
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
fickleheart
c21072ec29 Show music credit for credits 2019-03-31 13:09:49 -05:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
0c6c401d88 Add title to netreplays and do some format cleanup 2019-03-24 18:48:14 -05:00
fickleheart
be458c1d05 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
2019-03-19 22:17:25 -05: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
fickleheart
a16243e84d Deduplicate character shifting code 2019-03-10 18:09:15 -05:00
Alam Arias
9aff7ba875 Merge branch 'next' into join-passwords 2019-03-09 18:19:44 -05:00
Alam Arias
8502a5823f c is only for chat_in 2019-03-09 18:18:14 -05:00
fickleheart
acf1827d9e Handle capslock in just one place...? 2019-03-09 16:55:18 -06:00
Sally Cochenour
5d0fbc2af0 Reorder colors, ensure colored names are set properly 2019-03-06 03:15:07 -05:00
Sally Cochenour
008d9c9dc0 10 new colors
new Crimson (old Crimson was renamed to Scarlet), new Peach (the replacement from last commit was renamed to Cream), Cherry, Nova, Copper, Handheld, Algae, Pastel, Fuchsia, and Toxic. Also, updated Robo-Hood.
2019-02-27 00:08:13 -05:00
wolfy852
8f276f7791 ...remove this forgotten comment too while I'm at it. 2019-02-19 18:54:24 -06:00
wolfy852
733c472e1f Reorganization + kill old interfaces 2019-02-19 18:52:57 -06:00
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