Jaime Passos
740deea181
Don't draw borders or patches if not necessary.
2019-08-26 20:49:04 -03:00
toaster
8b045a8f15
Lua save-banks!
...
* Array of 8 INT32's natively embedded into savedata (net and SP)!
* Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game.
* Requires reservation to avoid clobber-conflicts.
* Access via `reserveLuabanks()` - returns a read-write userdata.
* Assign userdata to local variable or global rawset to use later.
Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
2019-08-24 18:25:27 +01:00
Jaime Passos
6b4a86d31b
NiGHTS Attack menu: Let patch offsets control the alignment of the top border.
2019-08-20 21:45:55 -03:00
James R
06c441703f
Old string drawing functions are dumb
2019-08-20 16:33:39 -07:00
Jaime Passos
4fa44a16c0
Fix character select menu to use the new Color_Opposite array.
2019-08-20 19:08:45 -03:00
Jaime Passos
92817a8991
Merge remote-tracking branch 'origin/master' into newmenus
2019-08-20 19:07:34 -03:00
Steel Titanium
997b6bb9d3
Draw record attack foreground even if a message is currently on-screen.
2019-08-20 00:15:35 -04:00
Jaime Passos
2460f670f7
Unlock all cached patches, fix accidental merge conflict.
2019-08-20 00:41:06 -03:00
Jaime Passos
3da02a2056
Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus
2019-08-20 00:21:28 -03:00
Jaime Passos
4b13ba15c9
Remove new character select screen transitions.
...
I should not have implemented it in the first place.
2019-08-20 00:18:34 -03:00
Jaime Passos
fb889d3d1a
New Record Attack menu.
2019-08-20 00:12:22 -03:00
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