Commit graph

193 commits

Author SHA1 Message Date
Zwip-Zwap Zapony
acff5c1ada Merge branch 'next' into drawcroppedpatch-improvements 2021-04-25 10:15:16 +02:00
SwitchKaze
c3d5740e98 Fix console text bleeding edge case
A single character could prematurely read if there were enough special characters to push 'c' past 'con_width'.
2021-04-06 15:06:44 -05:00
James R
84191252d2 Remove code that converts uppercase letters to lower, when coming from dedicated console 2021-04-04 17:01:54 -07:00
SwitchKaze
3895c02330 Revert "Remove key stuff"
This reverts commit a439e569
2021-04-02 15:46:08 -05:00
SwitchKaze
cb3a8f7a58 Remove key stuff 2021-04-02 15:46:08 -05:00
SwitchKaze
3faa98cf4a Expose inputs to Lua 2021-04-02 15:45:59 -05:00
SwitchKaze
6267abac8a Fix console text bleeding 2021-03-25 12:43:30 -05:00
GoldenTails
70eb3228f8 Pressing A Key Combination In The Console Crashes SRB2
get stryder7x in on this
2021-01-05 13:20:02 -06:00
GoldenTails
9327e96e4d Pause the console refresh while startup wads are loading. 2020-12-26 17:19:14 -06:00
Zippy_Zolton
45976d2304 magenta and green sonicx 2020-12-15 22:19:57 -06:00
Zippy_Zolton
07034cf441 fixes spaces 2020-12-14 16:14:20 -06:00
Zippy_Zolton
9b8bacd088 Redone colormaps by SonicX8000 2020-12-14 12:52:24 -06:00
Zippy_Zolton
c247b94be7 Merge branch 'next' of https://github.com/STJr/SRB2 into text-color 2020-12-14 00:16:38 -06:00
James R
b31c4db89d Remove trailing whitespace 2020-12-12 02:37:03 -08:00
Zwip-Zwap Zapony
029e79024b V_DrawCroppedPatch Lua exposure and improvements
Separated X and Y scale, and added colormap argument
Added V_*SCALEPATCH and V_PERPLAYER flags support
Made sx,sy,w,h into fixed-point values
Exposed to Lua as "v.drawCropped(...)"
(Also fix HWR_DrawStretchyFixedPatch ignoring vscale without pscale)
2020-12-11 23:43:38 +01:00
Jaime Ita Passos
5293c52bca Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
Zippy_Zolton
88c882fa9c 81 2020-10-20 19:59:33 -05:00
Zippy_Zolton
0f771edfd5 SonicX orange 2020-10-20 15:11:00 -05:00
Zippy_Zolton
03198ab31d SonicX aqua 2020-10-20 14:59:30 -05:00
Zippy_Zolton
45dd26476a SonicX8000 purple, peridot, rosy 2020-10-20 14:52:25 -05:00
Zippy_Zolton
b65ac1df30 sonicx azure 2020-10-20 14:40:10 -05:00
Zippy_Zolton
0b48f1052a pencilvoid aqua 2020-10-20 14:03:27 -05:00
Zippy_Zolton
4e985d7145 blue & red really seem like a hassle don't they 2020-10-19 20:36:59 -05:00
Zippy_Zolton
04eae86d0a t 2020-10-19 19:58:50 -05:00
Zippy_Zolton
81c9d2eae9 forgot to send this like 3 hours ago 2020-10-19 18:41:23 -05:00
Zippy_Zolton
d633f2495a red abd bkyue sikbucx 2020-10-19 14:12:28 -05:00
Zippy_Zolton
e5c891932a improvement 2020-10-18 23:47:14 -05:00
Zippy_Zolton
fed2fffaa1 better colors 2020-10-18 22:52:40 -05:00
Zippy_Zolton
5dc90289dc thanks goldie 2020-10-18 21:59:34 -05:00
Zippy_Zolton
e2d686ba42 update 2020-10-18 17:45:46 -05:00
Zippy_Zolton
2403cbd57b possibly final 2020-10-18 17:01:31 -05:00
Zippy_Zolton
94cee68d41 Calloc 2020-10-18 16:41:14 -05:00
Zippy_Zolton
14aec09d13 possibly fixed 2020-10-18 16:21:06 -05:00
Zippy_Zolton
3b79ca4fae Improved text colormaps 2020-10-18 16:00:01 -05:00
Jaime Passos
b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
James R
15008f31a7 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
355cc1a697 Merge branch 'autocomplete-aliases' into 'next'
Autocomplete aliases in console

See merge request STJr/SRB2!1113
2020-10-08 20:30:07 -04:00
James R
dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Steel Titanium
4eaa7e969f Add new STARTUP lump, for the splash screen 2020-08-28 17:11:38 -04:00
Jaime Passos
78cc4a78d0 Refactor renderer switching 2020-08-14 22:27:16 -03:00
Jaime Passos
1751d7afed Cache the console patch only once in CON_DrawBackpic 2020-08-14 20:48:15 -03:00
James R
aa19bce4a9 Autocomplete aliases in console 2020-08-14 00:00:45 -07:00
James R
8301e4f93c Merge branch 'word-delet' into 'next'
Word delete and backspace in console

See merge request STJr/SRB2!1092
2020-08-09 20:46:37 -04:00
James R
23f218117c Merge branch 'http-mserv' into 'next'
HTTP Based Master Server + Multithreading

See merge request STJr/SRB2!940
2020-08-09 20:24:26 -04:00
Jaime Passos
91ed56ef40 Refactor patch loading 2020-08-08 05:16:47 -03:00
Steel Titanium
0d48d4c833 WIP: Remove support for DOS
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
James R
a9a68474f7 Ctrl + Backspace/Delete in Console 2020-07-24 04:06:04 -07:00
James R
479bbeacbe Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
SteelT
bff6b19056 Merge branch 'marathonmode' into 'next'
MARATHON RUN

See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
James R
fec8879797 Use Unlock_state here too
(cherry picked from commit a6ce21b450644a79b08b9533166704c7ef093816)
2020-05-14 17:28:55 -07:00
toaster
d593e2e1bb Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.)
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.

Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).

Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.

Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 23:10:00 +01:00
James R
47bc3bff13 Put some mutex on CONS_Printf etc. hahaha 2020-05-13 17:26:34 -07:00
James R
fe9b933b97 Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Jaime Passos
1904e3b5e9 Fix OpenGL 2020-03-17 15:23:13 -03:00
Jaime Passos
c2cd9a71fa Fix con_backpic 2020-03-17 13:05:54 -03:00
fickleheart
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
James R
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
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
a9a0601c84 Revert "Revert "Let the console open in menus""
This reverts commit 705cf9fd40.
2020-02-17 16:37:13 -08:00
Jaime Passos
00bdb41640 Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-17 12:28:16 -03:00
James R
705cf9fd40 Revert "Let the console open in menus"
This reverts commit ef3d462eb7.
2020-02-16 17:14:54 -08:00
Jaime Passos
b38f336dc5 why does this still exist? 2020-02-08 18:19:27 -03:00
James R
3afc766f5e Oops 2020-01-30 23:58:35 -08:00
James R
f8666d6cee Merge branch 'word' into 'master'
Word jumping

See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
James R
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
James R
ef3d462eb7 Let the console open in menus 2020-01-09 22:42:00 -08:00
James R
48dd6b0580 Show Sonic's ass if con_backpic. No wait, I mean crop the backpic... 2020-01-09 22:39:01 -08:00
James R
3179797331 Let Escape close the console 2020-01-09 22:16:46 -08:00
James R
702b23ec3f Put the word jumping code in functions 2020-01-08 12:58:19 -08:00
James R
0d3c03ccd6 Left word jump (whoo that took long) 2020-01-08 02:54:17 -08:00
James R
9e703f935a Right word jump 2020-01-08 01:03:44 -08:00
Louis-Antoine
5bde4df439 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
Jaime Passos
9248f12d55 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Jaime Passos
c6253bb6f9 Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
toaster
8f3e59b43d Improved "HELP" command!
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
Jaime Passos
8057eeaaca Merge remote-tracking branch 'jimita/renderswitch' into renderswitch 2019-09-10 18:12:01 -03:00
Jaime Passos
da93e0f1f5 I am the CEO of renderers 2019-09-09 16:20:17 -03:00
Jaime Passos
dc93cafda9 can i push this already? 2019-09-08 22:25:18 -03:00
Jaime Passos
725d0b4c44 still making things better 2019-09-08 21:37:24 -03:00
Jaime Passos
c7e01a558e initial stuff 2019-09-08 18:44:40 -03:00
Jaime Passos
2863ede7bf initial stuff 2019-09-08 18:27:35 -03:00
toaster
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
Steel Titanium
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
Monster Iestyn
66bc287688 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Steel Titanium
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
Monster Iestyn
07a66e5355 Merge branch 'public_next' 2019-04-02 15:49:15 +01:00
James R
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
jameds
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
jameds
587586f4bb Scroll console immediately upon pressing PageUp 2019-03-26 12:05:23 -07:00
james
356249dade Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
mazmazz
dfc427e81a Dummy out SRB2-CHAT console colors
Pending translation to 2.2 palette indexes
2019-01-07 21:54:38 -05:00
mazmazz
b3f7b169b2 Merge errors for compile 2019-01-07 17:05:20 -05:00
mazmazz
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
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