Commit graph

56 commits

Author SHA1 Message Date
SeventhSentinel
73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
mazmazz
bfc501a271 Revert default console backcolor to green; changed from CHAT commit 2018-12-24 20:57:11 -05:00
Digiku
8d56c2f486 Merge branch 'addons-backport' into '2122-version'
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
2018-12-23 18:08:06 -05:00
Latapostrophe
1b61e15b1b Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +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
mazmazz
b32f50648d Merge branch 'addons_menu' into 'master'
Addons menu

See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
MPC
9c2197db17 Software plane fixes 2018-12-14 14:08:25 -03:00
TehRealSalt
5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05: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
MPC
ff642df1f2 Render the startup screen on OpenGL mode 2018-11-10 15:56:13 -03:00
toaster
8d4ce113e4 Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1. 2018-11-05 12:49:28 +00:00
Latapostrophe
e5d4020f3e 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
db60bdd49d Merge branch 'chat-changes' of git.magicalgirl.moe:KartKrew/Kart into chat-changes 2018-10-21 14:53:22 +02:00
Latapostrophe
10d8105a52 Console background color default changed to Black + Resolved merge conflict (hopefully) 2018-10-21 14:51:34 +02:00
toaster
791dc079ec Merge branch 'master' into 'chat-changes'
# Conflicts:
#   src/hu_stuff.c
2018-10-21 08:27:28 -04:00
Latapostrophe
e2394d47a1 More messages in chatbox + new console backcolours 2018-10-21 14:09:25 +02:00
TehRealSalt
35528276d2 Optimize 2018-10-16 12:25:51 -04:00
TehRealSalt
1807466474 Simpler loop 2018-10-08 13:58:16 -04:00
TehRealSalt
3101eb1a18 Don't let chat/console eat inputs from anyone besides player 1 2018-10-08 00:14:29 -04:00
TehRealSalt
6bae5e952b Brown text colormap instead of teal, revert sky-blue 2018-10-04 18:07:56 -04:00
TehRealSalt
744c41bc8a Edit the text remaps
Lighter sky, lighter pink, steel is now called steel-blue
2018-10-04 14:30:54 -04:00
toaster
6cc7f97d8a Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into addons_menu
# Conflicts:
#	src/m_menu.c
2018-09-22 23:00:46 +01:00
toaster
3a76605772 * Seven new text colours! Gold, Lavender, Tea-green, Steel, Pink, Teal, and Peach, all added to the menu highlights cvar.
* Revamp the saycmd colour list to take advantage of them. Peach and Purple are used the least...
* In all of the string drawers, replace colormap only when charflags changes.
* Add V_SKYMAP to dehacked.c alongside the above (oversight from when I added it yonks ago...)
2018-09-22 18:22:04 +01:00
toaster
b6dbecd2f8 Addons menu.
Bitch.
2018-08-28 21:08:47 +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
toaster
b319c2d9b8 * Homogenise old chat mode detection, which includes cv_consolechat.value, dedicated, and vid.width < 640.
* Make the chat notification sounds work in old chat mode.
2018-08-03 23:01:09 +01:00
toaster
ad119af07b * Get chat to compile with errormode on.
* Add chat options to the HUD and Sound Option menus.
2018-08-02 23:52:07 +01:00
Latapostrophe
03dc4c9680 Fixed sub 400p chat for console 2018-07-31 23:56:23 +02:00
Latapostrophe
9109bb1ee7 Fix console leftover + positionning 2018-07-31 23:35:16 +02:00
Latapostrophe
ac7c249fd2 SRB2chat test rework 2018-07-31 11:10:02 +02:00
toaster
fa2aa98e04 * ACTUALLY fix waiting for players chat.
* Correct minor bug with blink cursor on IP in multiplayer menu.
2018-07-04 00:58:32 +01:00
toaster
e76c328129 Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists...
More menu/highlight things:
* Rename "Default" to "Game type", to make clearer what it's doing.
* Tweak race colouring slightly.
* Put a highlight around the level select icon, and make it consistent with voting.
* Allow setting the highlight colour to affect the intermissions.
* Fix bug with gametype colour getting for record attack.

A handful of skincolour things:
* Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name.
* Fix incomplete Steel Blue -> Steel rename.
* Merge the very similar Blueberry and Sapphire...
* ... so Sapphire can be backported!
* And Ruby too.
2018-07-02 13:20:04 +01:00
toaster
776c66514d Menu stuff!
* Bar of levels.
* Colourisation!
* New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid!
* New single page statistics screen!
* V_DrawFixedPatch now works at the edge of the screen!

Ghost fixes!
* On minimaps!
* Free memory after use!
* Don't spawn in midair on slopes!
2018-07-01 19:29:13 +01:00
TehRealSalt
36b52e1c67 Merge remote-tracking branch 'refs/remotes/srb2public/next'
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/m_misc.c
2018-04-07 18:43:59 -04:00
Monster Iestyn
6e21059713 Eat unprintable keys too, since there's no reason to feed them to G_Responder anyway when the console is open 2018-02-23 20:08:02 +00:00
Monster Iestyn
fb3e78c020 Make CON_Responder eat Ctrl+key combos that have no effect, instead of passing the key on to G_Responder 2018-02-20 17:06:03 +00:00
TehRealSalt
202ad11b43 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:20:23 -05:00
TehRealSalt
cc0c99640f Work so far
Crashes, but baseline's there
2018-01-27 01:17:08 -05:00
TehRealSalt
9339b96449 Use KARTKREW instead of CONSBACK
Less lump redundancy, no longer need the poor downscaled version :V
2018-01-16 22:32:39 -05:00
TehRealSalt
c2db0ddca2 Battle hud stuff?! 2017-12-23 20:55:23 -05:00
ZTsukei
f50ecc0dcd Most items work (netgame needs testing), will do fireballs later. 2017-02-26 17:38:24 -05:00
Inuyasha
55400a262d go fuck yourself stupid compiler
...your guesses should not be treated as errors.
2016-11-04 02:02:26 -07:00
Inuyasha
010c52aed2 show highlight BG over ellipses if highlight extends offscreen
+ bug fixes
2016-11-03 19:36:43 -07:00
Inuyasha
e245cdfcbf Console with moving cursor, selections, etc 2016-11-03 17:30:30 -07:00
Inuyasha
bb20cfd6be Clipboard copy/paste testing
(unfinished, but basics work)
2016-11-03 01:43:57 -07:00
Inuyasha
c277125fe7 modifier key status made globally accessible
now also properly handles L/R simultaneous presses
2016-11-02 15:23:22 -07:00