Commit graph

633 commits

Author SHA1 Message Date
toaster
a8169e3844 Sound test is cool now!
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif

* Port MUSICDEFs from Kart.
    * Safe to modify without modifying game, so we can put it in music.dta eventually.
    * "Title", "AltTitle", "Authors" fields are self-evident.
    * "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
    * "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
    * Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
    * Now called "V_DrawStretchyFixedPatch".
    * "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
    * Available to Lua under v.drawStretched!
    * Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.

Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
2019-11-05 16:23:46 +00:00
Jaime Passos
48c7dd6b92 Update m_menu.c 2019-11-04 12:30:28 -03:00
Steel Titanium
0a33e47619 Fix garbage string being drawn on record attack menu
Pretty silly of me to assume it would be NUL-terminated by default.
2019-11-03 21:43:09 -05:00
mazmazz
0b6651eb00 Remove TTCOUNTERSET to simplify custom title SOC 2019-11-02 12:40:12 -04:00
mazmazz
49917d6f3f Merge remote-tracking branch 'origin/master' into new-title 2019-11-01 21:06:46 -04:00
Jaime Passos
76a5b60e39 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
toaster
95e8ea0f8a Fix map_cons_t[] not having a null terminator, which should hopefully allow Lach to actually start their builds up on Mac again. 2019-10-28 11:34:20 +00:00
mazmazz
26100abdc4 Fix char select music not playing in secrets menu 2019-10-27 13:12:36 -04:00
toaster
4334384855 Fix bot showing up in NiGHTS stages with a two-pronged approach.
* Sometimes, D_MapChange is passed a mapnum of -1, to complete an existing mapchange. Don't handle botingame checks when that happens.
* Disable charsel on secret level platter when selected map is a NiGHTS stage, since gameplay will be identical across characters (consistent with NiGHTS Attack).

Also:

* Replace IT_DYBIGSPACE hack in M_SetupChoosePlayer, and replace with a more direct workaround system for not being able to select characters before warping.
2019-10-27 12:20:17 +00:00
Nev3r
2b33529b7c Missing ; 2019-10-27 12:03:52 +01:00
mazmazz
31d7254d14 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
MascaraSnake
0073310c39 Merge branch 'newmenus' into 'master'
Better looking menus, nametags and much more. (Resolves #245 and #244 and #252)

Closes #245, #244, and #252

See merge request STJr/SRB2Internal!389
2019-10-25 17:46:16 -04:00
MascaraSnake
f5f21db2f4 Merge branch 'window-focus-music' into 'master'
Window focus options for playing sounds/music

See merge request STJr/SRB2Internal!407
2019-10-25 15:37:06 -04:00
MascaraSnake
2004577314 Merge branch 'james-kart' into 'master'
My changes to Kart

See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
MascaraSnake
7c9c2553b2 Merge branch 'kartport_namedvalues' into 'master'
Kart-port - Named cvar values + Improved "HELP" command (round 3)

See merge request STJr/SRB2Internal!388
2019-10-25 15:32:56 -04:00
MascaraSnake
13edddc735 Merge branch 'be-more-nice-with-levelselect-mp' into 'master'
Remove level select restrictions in DEVELOP Multiplayer

Closes #238

See merge request STJr/SRB2Internal!399
2019-10-25 15:26:09 -04:00
James R
98308c5485 Menu options 2019-10-23 17:31:10 -07:00
James R
57d6baac56 Revert sound and music window focus related toggles
This partially reverts commit 96a12b6bed.
2019-10-23 15:24:34 -07:00
Steel Titanium
5dd1b52024 Disable restriction for `DEVELOP` builds only 2019-10-23 16:29:50 -04:00
james
24f0a95d59 Use less confusing player sorting key names 2019-10-22 21:41:34 -07:00
James R
96a12b6bed Miscellaneous window de-focus options
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
2019-10-22 21:15:20 -07:00
James R
a157fe9ac0 Make "Focus lost" HUD overlay optional 2019-10-22 20:30:05 -07:00
Steel Titanium
4e2e2a0a61 Remove level select restrictions in Multiplayer 2019-10-19 21:37:03 -04:00
James R
25dc99a50b Fix item selection not returning to "Specify IPv4 Address" 2019-10-19 13:07:20 -07:00
James R
10c74c0d6a Fix "You must specify an IP address" message returning to title instead of MP menu 2019-10-19 13:01:06 -07:00
James R
3c2ccd7107 Don't fade to character select from secret level select 2019-10-19 12:42:53 -07:00
James R
85b453e5b9 Don't fade to Server Options 2019-10-19 12:25:02 -07:00
Steel Titanium
5527cb051f Revert my old attempt of making the level music fade out before game over jingle 2019-10-19 14:36:30 -04:00
toaster
869c2e0d1a * Implement fixes/tweaks as written on the gitlab.
* `SPR2_NTAG` last vestiges removal.
    * Removed need for `getskinfromdescription()` by calculating it once, at Menu load, and storing in `description_t`.
    * Fixed nametag colour issues.
    * Support widescreen with nametags.

* Fix a metric SHITTON of compiler errors.
    * Redefining `x` and `y` within scope of previous `x` and `y` (`M_DrawSetupChoosePlayerMenu`)
    * GCC straight up will not let you cast a `const char*` to a `char` (`V_DrawNameTag`)
    * Redefining `lines` within the scope of the global.
    * Redefining `string` within the function-specific `string`.
    * It would be recommended for y'alls to turn ERRORMODE on!
2019-10-19 18:15:54 +01:00
Steel Titanium
dcce4e3cea Kill off SPR2_NTAG 2019-10-16 18:25:20 -04:00
Steel Titanium
cb90f39a58 Show "Press ESC to exit" string on NiGHTS Attack menu too 2019-10-16 18:00:54 -04:00
Steel Titanium
2243a1eaa9 Fix ifselectvalnextmapnobrace indentation 2019-10-16 17:49:21 -04:00
Steel Titanium
cddad58a54 Seperate name tag sprite into SPR2_NTAG 2019-10-16 00:22:05 -04:00
Steel Titanium
2137d5ec21 Lots of changes
* Show emblem requirement on record attack menu
* Use bigger emblems on the menu.
* Display your best number of collected rings in yellow if reached perfect bonus.
* Adjusted XTRA frames (again)
2019-10-15 22:54:21 -04:00
toaster
69d43435f5 Improved "HELP" command!
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
toaster
61a242cc95 * Fix cv_pointlimit's weird behaviour in match mode by standardising the switching between "named" and "range" values in CV_AddValue.
* Optimise M_ChangeCvar.
2019-10-15 12:24:31 +01:00
toaster
8bab035279 Added some examples of cvars that can use named values.
* Pandora's box now has infinite lives show up as "Infinite" instead of "-1".
* `pointlimit None`
* `timelimit None`
* Ported `basenumlaps` (with "Map default" value) from Kart to replace `usemaplaps`, for if Circuit ever gets shown any love ever again.
* `respawndelay Off`
* `resynchattempts Don't`
2019-10-15 11:49:37 +01:00
Steel Titanium
676c81bfd1 More record attack stuff.
Show emblem requirements.

Committed because I need sleep...
2019-10-15 01:55:50 -04:00
toaster
442c22f456 Prevent wraparound on Level platter when there are less than 3 rows.
Addresses #251 - I wanted to keep the scrolling because it looks nice and because I don't want to fuck with these drawers too bad.
2019-10-14 17:17:00 +01:00
Jaime Passos
8ba122a3fd A bunch of stuff 2019-10-14 02:24:44 -03:00
Steel Titanium
2aa72aa2d4 Merge branch 'master' into newmenus 2019-10-13 20:12:48 -04:00
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
Steel Titanium
61ada17da1 Basic outline color support.
This is a huge hack as it requires another font set, with each character's offset manually being set using SLADE.
2019-10-10 02:00:52 -04:00
Steel Titanium
43cd0e5dd0 WIP: New character select name font 2019-10-09 00:28:01 -04: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
Jaime Passos
4a0b423342 nights attack 2019-10-02 22:02:13 -03:00
Jaime Passos
7f0032b9b1 character select 2019-10-02 21:57:04 -03:00