Commit graph

609 commits

Author SHA1 Message Date
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
Steel Titanium
305e3bb9db Add _ to the record and nights attack tracks for organization 2019-09-07 22:57:20 -04:00
mazmazz
f3d287990c Fix NiGHTS attack menu not drawing correct background 2019-09-07 22:00:38 -04:00
Jaime Passos
02f9256574 Cleanup. 2019-09-06 16:05:46 -03:00
Jaime Passos
153d0347cb Ignore key held events. 2019-09-06 15:25:11 -03: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
mazmazz
c662413edd WIP 2.2 title screen (Alacroix) 2019-09-02 22:40:28 -04: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
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