Commit graph

633 commits

Author SHA1 Message Date
Steel Titanium
1491d68122 Fix record attack foreground not appearing.
I'm not sure why it suddenly broke when the same condition worked before.
2019-08-19 22:10:52 -04:00
Jaime Passos
a37caff23e Fix character description text rendering. 2019-08-19 18:49:23 -03:00
Jaime Passos
42590d5aff Cool defines 2019-08-19 16:19:25 -03:00
Jaime Passos
21f2553a98 hghdfhdjhdhkdlfh 2019-08-19 15:34:12 -03:00
Jaime Passos
1ef58da49b slight cleanup 2019-08-19 15:27:20 -03:00
Jaime Passos
af8c67c59a uh 2019-08-19 14:43:48 -03:00
Jaime Passos
518bb32ecb did The Thing 2019-08-19 14:23:03 -03:00
Jaime Passos
4ce5840289 More character select work 2019-08-18 22:26:52 -03:00
Jaime Passos
4ba044c30b Tweak Record Attack screen just a little bit 2019-08-18 20:35:16 -03:00
Jaime Passos
ec797ee106 how do i code 2019-08-18 19:46:55 -03:00
Jaime Passos
b214a4c123 Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus 2019-08-18 19:35:14 -03:00
Jaime Passos
513d34aef8 Character select WIP 2019-08-18 19:34:54 -03:00
Steel Titanium
17cbd9a986 New music for record attack and nights attack menus 2019-08-18 17:32:52 -04:00
Steel Titanium
07cf717e33 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus 2019-08-18 13:46:50 -04:00
Jaime Passos
b31c012063 Merge remote-tracking branch 'origin/master' into newmenus 2019-08-18 14:46:34 -03:00
Steel Titanium
6b16560832 Merge branch 'master' into newmenus 2019-08-14 22:51:06 -04:00
Monster Iestyn
aaa3467faa Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua 2019-08-12 14:00:26 +01:00
Alam Ed Arias
06b339f6ae curbgname need one more byte to hold the NULL 2019-08-08 23:46:08 -04:00
Alam Ed Arias
9d5abfcee0 Fix compiling without MixerX support 2019-08-07 12:42:07 -04:00
mazmazz
2c7eb91460 * Added FORCERESETMUSIC level header
* cv_resetmusicbyheader toggle to disable said override
* Never reset music during time attack
* Change cv_resetmusic default back to off
2019-08-04 20:02:38 -04:00
Steel Titanium
933f249d96 More menu stuff 2019-08-04 13:26:25 -04:00
toaster
534b98251b Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
This reverts commit a76668f55a.
2019-08-04 12:03:57 +01:00
toaster
a76668f55a Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
This reverts commit 0f89fb123f, reversing
changes made to 8fb211d8cf.
2019-08-04 11:32:55 +01:00
mazmazz
7ef6ffbf42 Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019 2019-08-04 02:52:33 -04:00
mazmazz
753ea04fe3 Mixer X menu touchup 2019-08-04 02:30:34 -04:00
mazmazz
8ab76b50c6 Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx 2019-08-04 01:10:21 -04:00
mazmazz
d83bee2bad Merge remote-tracking branch 'origin/master' into musicplus-feature-dying-fp 2019-08-03 22:49:20 -04:00
mazmazz
5fa27c57e0 Merge branch 'master' into musicplus-feature-dying-fp 2019-08-03 22:22:39 -04:00
Steel Titanium
8a98d54844 Stuff 2019-08-03 21:21:01 -04:00
Steel Titanium
90365ffc52 Work on menus 2019-08-03 17:30:51 -04:00
Steel Titanium
6ff08671cd Merge branch 'master' into newmenus 2019-08-01 18:36:42 -04: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
d181486c3f Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into musicplus-sdlmixerx 2019-07-22 22:22:12 -04:00
Steel Titanium
490e3fe9a9 Merge branch 'master' into musicplus-sdlmixerx 2019-07-22 22:20:08 -04:00
Steel Titanium
d44702cb0e Some fixup 2019-07-22 22:01:05 -04:00
Steel Titanium
83eab15c78 menu stuff 2019-07-16 00:07:55 -04:00
Monster Iestyn
b0f30ca0df Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead.
(I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)
2019-07-15 20:25:57 +01:00
Monster Iestyn
a424fce29d Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks 2019-07-14 22:36:14 +01:00
Monster Iestyn
1ec917f44e remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/ 2019-07-14 22:28:19 +01:00
Monster Iestyn
5303475033 Fixes for menus:
* add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds
* increase bgname to 9 to include the extra NULL byte? (is this a good idea actually)
* make M_IterateMenuTree ignore menu levels without a menutype value
2019-07-14 21:58:48 +01:00
Monster Iestyn
59b346b6d1 Use M_SetupNextMenu to actually set up the Sound Options menu "properly" instead of the old hacks.
If you wanted the game to reset the item selected to the top option like before though, I left a line commented out that would do that for you. Unlike the old item = 0 way, it would automatically be corrected for headers and other spaces (thus kind of future-proofing this code)
2019-07-08 21:17:40 +01:00
mazmazz
f7936876be Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -04:00
Monster Iestyn
c4fd565db5 Merge branch 'titlemap-fix' into 'master'
Fix Titlemap with mazmazz's fancy menu stuff

See merge request STJr/SRB2Internal!228
2019-06-28 18:15:46 -04:00
Monster Iestyn
c146778c2e Merge branch 'levelselect-tweaks' into 'master'
Some small tweaks to level select

See merge request STJr/SRB2Internal!230
2019-06-25 16:50:44 -04:00
toaster
032ef98209 Support backspace for resetting various menu values, just like Kart. 2019-06-22 16:50:46 +01:00
toaster
e27a43f976 Improve rain/weather.
* Like Kart, remove cv_precipdensity.
* Like Kart, replace "Infinite" draw distance value with "None".
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
2019-06-22 16:50:30 +01:00
Nev3r
d2a2dee033 Add Sryder's orbital camera thing as an option. 2019-06-20 13:33:31 +02:00
Steel Titanium
8e5593c207 Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props
2019-06-11 17:48:00 -04:00
toaster
81a07293e6 Fix Titlemap with mazmazz's fancy menu stuff
Handled by changing some defaults.

Untested, experimenting with Gitlab Web IDE as reconfiguring my build environment is likely to be a pain and I'd like to put that off as long as possible please
2019-06-10 15:43:47 -04:00
Steel Titanium
29dd330878 Some small tweaks 2019-06-03 17:34:51 -04:00