c2cd9a71fa
Fix con_backpic
2020-03-17 13:05:54 -03:00
b9d7b3e5c5
Merge remote-tracking branch 'upstream/master' into shaders-222
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
# src/i_video.h
# src/r_main.c
# src/r_main.h
# src/screen.c
# src/sdl/i_video.c
# src/sdl/ogl_sdl.c
# src/w_wad.c
2020-03-14 12:52:15 -05:00
711c8ed6b4
Merge branch 'console-in-menus-mk-ii' into 'master'
...
Console in menus again!
See merge request STJr/SRB2!797
2020-02-23 18:15:43 -05:00
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
a9a0601c84
Revert "Revert "Let the console open in menus""
...
This reverts commit 705cf9fd40
2020-02-17 16:37:13 -08:00
00bdb41640
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
2020-02-17 12:28:16 -03:00
705cf9fd40
Revert "Let the console open in menus"
...
This reverts commit ef3d462eb7
2020-02-16 17:14:54 -08:00
b38f336dc5
why does this still exist?
2020-02-08 18:19:27 -03:00
3afc766f5e
Oops
2020-01-30 23:58:35 -08:00
f8666d6cee
Merge branch 'word' into 'master'
...
Word jumping
See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
50d1226224
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
ef3d462eb7
Let the console open in menus
2020-01-09 22:42:00 -08:00
48dd6b0580
Show Sonic's ass if con_backpic. No wait, I mean crop the backpic...
2020-01-09 22:39:01 -08:00
3179797331
Let Escape close the console
2020-01-09 22:16:46 -08:00
702b23ec3f
Put the word jumping code in functions
2020-01-08 12:58:19 -08:00
0d3c03ccd6
Left word jump (whoo that took long)
2020-01-08 02:54:17 -08:00
9e703f935a
Right word jump
2020-01-08 01:03:44 -08:00
5bde4df439
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
9248f12d55
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
c6253bb6f9
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
8f3e59b43d
Improved "HELP" command!
...
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
8057eeaaca
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
da93e0f1f5
I am the CEO of renderers
2019-09-09 16:20:17 -03:00
dc93cafda9
can i push this already?
2019-09-08 22:25:18 -03:00
725d0b4c44
still making things better
2019-09-08 21:37:24 -03:00
c7e01a558e
initial stuff
2019-09-08 18:44:40 -03:00
2863ede7bf
initial stuff
2019-09-08 18:27:35 -03:00
063e350c63
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
251494c3c8
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
66bc287688
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
8a14427420
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
07a66e5355
Merge branch 'public_next'
2019-04-02 15:49:15 +01:00
e8071e66e4
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
b9b36a44a8
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
587586f4bb
Scroll console immediately upon pressing PageUp
2019-03-26 12:05:23 -07:00
356249dade
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
dfc427e81a
Dummy out SRB2-CHAT console colors
...
Pending translation to 2.2 palette indexes
2019-01-07 21:54:38 -05:00
b3f7b169b2
Merge errors for compile
2019-01-07 17:05:20 -05:00
075f28b7c8
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
bfc501a271
Revert default console backcolor to green; changed from CHAT commit
2018-12-24 20:57:11 -05:00
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
1b61e15b1b
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
b32f50648d
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
9c2197db17
Software plane fixes
2018-12-14 14:08:25 -03:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
ff642df1f2
Render the startup screen on OpenGL mode
2018-11-10 15:56:13 -03:00
7daf5d4727
Set up separate background color for prompts vs. console
2018-11-09 22:38:55 -05:00
40b4d63620
Fix capslock being wonky.
2018-08-19 11:25:20 +02:00
b09019dc4a
Fix old chat detection.
2018-08-19 11:12:21 +02:00
03dc4c9680
Fixed sub 400p chat for console
2018-07-31 23:56:23 +02:00
ac7c249fd2
SRB2chat test rework
2018-07-31 11:10:02 +02:00
3725203bcd
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
33afd94252
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
61923f3b1f
Merge branch 'public_next'
...
# Conflicts:
# src/sdl/i_system.c
2018-03-04 19:18:13 +00:00
33d5baa2aa
* 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
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
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
8372bde91b
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus
2017-10-18 21:02:50 +01:00
52620ac9b1
Obliterated OS/2
2017-10-07 18:11:14 +01:00
7481ffef2a
Wiped out Wii (and Wii Linux)
2017-09-29 21:03:28 +01:00
49542cdaa1
Remove XBOXSTATIC and FILESTAMP, since only the XBOX port needed them
2017-09-29 19:46:23 +01:00
5a16c39af0
XBOX was eXecuted
2017-09-29 19:27:17 +01:00
f4e535a64d
Burned Dreamcast port at the stake
2017-09-29 18:19:34 +01:00
5bd71970ad
Make chat visible in the evaluation gamestate.
2017-09-18 21:38:51 +01:00
a4fc3372ca
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into addfile_menu
...
# Conflicts:
# src/m_menu.c
2017-05-06 23:24:21 +01:00
66f56bbba3
* Menu always updates for file load... by doing the refresh in the drawing function, eep. Oh well.
...
* M_StartMessages when file loading goes wrong! (Determined by CONS_Alerts of warning level CONS_WARNING and CONS_ERROR happening after W_LoadWadFile has been called.)
* Now actively tries to keep your place on the menu if files are deleted between calls to preparefilemenu().
* More enums! DIR_ (for if you want to try embed more metadata in the dirmenu strings) and REFRESHDIR_ (for refreshing the menu and handling warnings).
* Handle changing size menu between calls to opendir() better.
* Don't crash on draw/enter attempt if one of the dirmenu's is null.
* Moved the addons menu to OP_MainMenu instead of MainMenu for now so it can be tested in MP without needing to mess with several menus.
* Display the amount of space used for serverinfo_pak's fileneeded on the addons menu, both visually and with a percentage.
2017-05-03 22:36:08 +01:00
95d89078f5
Removal of cv_allcaps for console stuff.
2017-04-14 20:43:30 +01:00
c545194bef
update colors to new palette
2016-11-10 16:53:27 -08:00
1ff498fcfd
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
...
# Conflicts:
# src/console.c
2016-11-10 16:20:03 -08:00
55400a262d
go fuck yourself stupid compiler
...
...your guesses should not be treated as errors.
2016-11-04 02:02:26 -07:00
010c52aed2
show highlight BG over ellipses if highlight extends offscreen
...
+ bug fixes
2016-11-03 19:36:43 -07:00
e245cdfcbf
Console with moving cursor, selections, etc
2016-11-03 17:30:30 -07:00
bb20cfd6be
Clipboard copy/paste testing
...
(unfinished, but basics work)
2016-11-03 01:43:57 -07:00
c277125fe7
modifier key status made globally accessible
...
now also properly handles L/R simultaneous presses
2016-11-02 15:23:22 -07:00
8107765677
make console back color use just one section of memory
...
let's be honest, it's pretty dumb to have every single possible back colormap in memory when only one is being used at a time
2016-11-02 14:26:35 -07:00
032313260a
Merge branch 'public_next' into master
2016-05-20 17:58:57 -04:00
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
3a045c4cc9
Fix the green text after reduced pal changes
2016-02-28 23:30:52 -08:00
549d3aeb3f
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-28 08:20:50 -08:00
d76e21b546
fix bind out of bounds / keystring misreading
2016-01-28 08:15:34 -08:00
3bfc402241
whitespace cleanup
2016-01-21 13:53:21 -05:00
1ed5407821
update stuff
2015-11-07 13:56:21 -06:00
e054f4b6c6
Drawfills and Console
...
All relevant DrawFills had colours changed.
Console background colour changed.
Text colourmapping changed.
2015-07-23 18:56:05 +01:00
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
f03e591f64
change SDL into HAVE_SDL
2014-07-25 19:10:24 -04:00
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
Jaime Passos