Commit graph

76 commits

Author SHA1 Message Date
James R
a5904808d1 Merge branch 'you-cant-escape-console' into 'master'
Open the console in menus and draw backpic correctly

See merge request STJr/SRB2!665
2020-01-12 15:38:51 -05:00
James R
3a9cc8db92 Let the console open in menus 2020-01-09 22:42:00 -08:00
James R
ed6a78fe05 Show Sonic's ass if con_backpic. No wait, I mean crop the backpic... 2020-01-09 22:39:01 -08:00
James R
cee3612dea Let Escape close the console 2020-01-09 22:16:46 -08:00
Louis-Antoine
61a681ed02 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Jaime Passos
845b82668b Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
toaster
69d43435f5 Improved "HELP" command!
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
Jaime Passos
ce8b821691 Merge remote-tracking branch 'jimita/renderswitch' into renderswitch 2019-09-10 18:12:01 -03:00
Jaime Passos
371e160940 I am the CEO of renderers 2019-09-09 16:20:17 -03:00
Jaime Passos
93ea8c4019 can i push this already? 2019-09-08 22:25:18 -03:00
Jaime Passos
11077c2bac still making things better 2019-09-08 21:37:24 -03:00
Jaime Passos
1cb22d5e6b initial stuff 2019-09-08 18:44:40 -03:00
Jaime Passos
398b320aec initial stuff 2019-09-08 18:27:35 -03:00
toaster
74c32c1b2b A good and bad ending cutscene now exist.
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)

Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
Steel Titanium
8d1db45599 Fix console back color not being correct.
This also adds support for using such colors in a text prompt
2019-06-26 22:08:17 -04:00
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Steel Titanium
2c4555493d Merge branch 'perpetual-modifier-updates' into 'master'
Set modifiers in a non-reactive manner

See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
Monster Iestyn
6827688575 Merge branch 'public_next' 2019-04-02 15:49:15 +01:00
James R
f995e8c241 Resize console upon resolution change
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
2019-03-26 12:30:02 -07:00
jameds
a8aea17469 Keep color across wrapped lines
And this works by inserting the same color code on each wrapped line.
2019-03-26 12:07:11 -07:00
jameds
f6143dafb0 Scroll console immediately upon pressing PageUp 2019-03-26 12:05:23 -07:00
james
e4a1470116 Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
mazmazz
7a97ebe985 Dummy out SRB2-CHAT console colors
Pending translation to 2.2 palette indexes
2019-01-07 21:54:38 -05:00
mazmazz
4f40d2abdb Merge errors for compile 2019-01-07 17:05:20 -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
de0943352a Revert default console backcolor to green; changed from CHAT commit 2018-12-24 20:57:11 -05:00
Digiku
15c9404f91 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
1b8be7f1a4 Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +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
mazmazz
ede6b183b1 Merge branch 'addons_menu' into 'master'
Addons menu

See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
MPC
9372baf427 Software plane fixes 2018-12-14 14:08:25 -03:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
MPC
7c18702f84 Render the startup screen on OpenGL mode 2018-11-10 15:56:13 -03:00
mazmazz
b7af1e385b Set up separate background color for prompts vs. console 2018-11-09 22:38:55 -05:00
Latapostrophe
a00b03b765 Fix capslock being wonky. 2018-08-19 11:25:20 +02:00
Latapostrophe
fe0b6dc600 Fix old chat detection. 2018-08-19 11:12:21 +02:00
Latapostrophe
c2ff88bb62 Fixed sub 400p chat for console 2018-07-31 23:56:23 +02:00
Latapostrophe
a4bded8e9e SRB2chat test rework 2018-07-31 11:10:02 +02:00
toaster
2cc8696bf1 Bit of a random one today, but the branch approaches completion...
* Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL.
* Blueberry bushes, both normal and Xmas, from patch.dta.
* BSZ tulips, also from patch.dta!
* Frozen Hillside badniks - Penguinator and Pophat.
* Frozen Hillside ice decoration!
* Fixed some big bugs with the DSZ light beams.
* Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c
* Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels.
* State optimisation.
* Serious cruft-removal of the NiGHTS drone thinker.
* Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs.
* Tweak NiGHTS player flashing.
* Add text colour support to the titlecard font.
* Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability.
* Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time.
* Fix that thing where flying mid-spin didn't enact autobrake.
* Modify graymap a little on Sryder's suggestion.
* [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 17:22:28 +01:00
toasterbabe
fe61c5d80e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
# Conflicts:
#	src/d_main.c
#	src/st_stuff.c
2018-03-24 17:17:01 +00:00
Monster Iestyn
c11a2ad9b6 Merge branch 'public_next'
# Conflicts:
#	src/sdl/i_system.c
2018-03-04 19:18:13 +00:00
toasterbabe
5e42d1dfad * Add new console text colours - sky, purple, aqua, peridot, azure, brown, rosy, and invert.
* Remove redundant check from V_DrawFadeScreen().
* Clean up potential endless sound source in Race HUD.
2018-03-02 13:32:55 +00:00
Monster Iestyn
ce78df03d0 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
bef710aa8f 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
toasterbabe
8372bde91b Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus 2017-10-18 21:02:50 +01:00
Monster Iestyn
52620ac9b1 Obliterated OS/2 2017-10-07 18:11:14 +01:00
Monster Iestyn
7481ffef2a Wiped out Wii (and Wii Linux) 2017-09-29 21:03:28 +01:00