MascaraSnake
03f60e972a
Merge branch 'left-right-ra-level-select' into 'master'
...
Left and Right Arrow keys also select level in Record Attack
See merge request STJr/SRB2Internal!363
2019-10-12 09:53:05 -04:00
toaster
a99fb74d4a
Prevent Time Attack level handler always beeping.
2019-10-12 09:42:03 -04:00
MascaraSnake
86a77b4886
Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag
2019-10-11 21:02:11 +02:00
James R
595d0c80c7
A-arrows on Record Attack level select
...
Menu code sucks, did you know?
2019-10-06 14:45:42 -07:00
James R
233ea2d07a
Key handler to allow selecting map by arrow keys in Record Attack
...
Enter still goes to the platter.
2019-10-06 14:11:16 -07:00
toaster
bc9f9d740a
Merge branch 'addons-menu-cleanup' into 'master'
...
Addons menu cleanup
See merge request STJr/SRB2Internal!316
2019-09-27 08:55:36 -04:00
James R
cf14b6257c
Automate the silly joystick menu items definition
2019-09-23 20:54:53 -07:00
James R
c5effff659
All for a cvar...
2019-09-23 20:23:40 -07:00
Steel Titanium
cecbf95002
Various of changes
...
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
2019-09-23 22:46:44 -04:00
Steel Titanium
a18872652f
Merge branch 'master' into internal-hotplug-stableid
2019-09-23 00:44:34 -04:00
Alam Ed Arias
924b76d4ee
Undo file mode change on menu files
2019-09-20 12:18:57 -04:00
toaster
d7ba804e22
Merge branch 'camerafix' into 'master'
...
Camera fixes
Closes #105
See merge request STJr/SRB2Internal!303
2019-09-20 11:51:30 -04:00
toaster
9c7d8d8990
Merge branch 'playerfixes' into 'master'
...
Some Player fixes and enhancements
Closes #216 , #219 , #222 , and #224
See merge request STJr/SRB2Internal!334
2019-09-20 11:39:32 -04:00
toaster
931f872467
Merge branch 'betterdirs' into 'master'
...
Better directory structure
See merge request STJr/SRB2Internal!321
2019-09-20 11:36:56 -04:00
lachwright
a797e3afed
Added Camera Options submenu (provided my files aren't broken again (please D:))
2019-09-19 17:34:04 +08:00
toaster
3f6a331f24
Change startchar's default value to 0 ( Resolves #222 ).
2019-09-18 12:26:34 +01:00
Nev3r
2b0a0dd90f
Merge branch 'deathstuff' into 'master'
...
Lots of death stuff
Closes #207
See merge request STJr/SRB2Internal!306
2019-09-16 16:32:45 -04:00
toaster
ccc1144a27
Merge branch 'luabanks' into 'master'
...
Lua save-banks!
See merge request STJr/SRB2Internal!295
2019-09-16 07:56:49 -04:00
toaster
22f7fd904f
Merge branch 'musicplus-resetmusic-followup' into 'master'
...
Follow-up fixes for reset-upon-dying music
See merge request STJr/SRB2Internal!284
2019-09-11 14:14:09 -04:00
toaster
534cc1fa67
Fix the Save Select platter drawing for the new player signpost art.
...
This might LOOK like an unrelated change, but it needs a new player.dta, so might as well keep that all localised!
2019-09-11 13:32:12 +01:00
toaster
41727318ff
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
2019-09-09 15:25:48 +01:00
Monster Iestyn
361fbf8f6a
Merge branch 'mprelated-tweaks' into 'master'
...
Various improvements and changes to multiplayer menu
See merge request STJr/SRB2Internal!300
2019-09-08 16:45:14 -04:00
Steel Titanium
0b5bc8f64f
Merge branch 'master' into internal-hotplug-stableid
...
Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.
2019-09-08 01:55:36 -04:00
Steel Titanium
414bff33bf
Better directory structure
2019-09-08 01:29:09 -04:00
mazmazz
f3d287990c
Fix NiGHTS attack menu not drawing correct background
2019-09-07 22:00:38 -04:00
toaster
7f69b52708
[slightly off-topic commit] don't allow MP Special Stages to be selectable via the MP level platter
2019-09-04 15:52:25 +01:00
James
0efeaa5d5f
Merge branch 'camorbit-sev' into camerafix
2019-08-31 14:53:43 -04:00
Steel Titanium
2821ec1807
Rename private mode to unlisted mode
2019-08-30 00:38:58 -04:00
Steel Titanium
4f71e2a3b0
Capitalize the 'if'
2019-08-30 00:36:10 -04:00
Steel Titanium
9f197df5e9
Add warning message when attempting to use the master server browser while modifiedgame is true.
2019-08-28 20:24:30 -04:00
Steel Titanium
1ae5987502
Rename offline mode to private mode
2019-08-27 18:05:30 -04:00
Steel Titanium
27e125e782
Allow letters to be used on ipv4 address field
2019-08-26 22:00:07 -04:00
Steel Titanium
74bcfda7dd
Reorder the main multiplayer menu
2019-08-26 21:49:12 -04: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
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
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
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
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