Commit graph

598 commits

Author SHA1 Message Date
Jaime Passos
6be45ec241 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 20:24:42 -03:00
Jaime Passos
d95a93b537 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
toaster
da1b4f2277 Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.) 2019-11-14 12:52:34 +00:00
MascaraSnake
14477748be Merge branch 'stopclock' into 'master'
Stop the clock!

See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
MascaraSnake
7cfc7b38c5 Merge branch 'forceskin_bs' into 'master'
MP Charsel menu fixes

See merge request STJr/SRB2Internal!457
2019-11-13 14:00:11 -05:00
toaster
7b640bc81e * Prevent (extremely unlikely) wraparound of patch frame calculation for the epynomous Radio (sigsegv prevention).
* Use thinstring for Authors field on the screen.
2019-11-13 13:44:00 +00:00
MascaraSnake
d591554a5d Merge branch 'radiomode' into 'master'
Radio mode

See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
Jaime Passos
3354169769 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
MascaraSnake
66123b8165 Merge branch 'internal-md3-vanilla-c' into 'master'
Internal MD3 merge 2 good riddance glBegin

See merge request STJr/SRB2Internal!362
2019-11-12 15:44:20 -05:00
MascaraSnake
b04452f7de Merge branch 'nonightsbot2' into 'master'
Properly fix bot showing up in NiGHTS stages (resolves #261 for real).

Closes #261

See merge request STJr/SRB2Internal!417
2019-11-12 15:41:01 -05:00
Digiku
c2d09ac4e4 Merge branch 'new-title-multi-res' into 'master'
2.2 Title Screen

See merge request STJr/SRB2Internal!439
2019-11-11 08:46:36 -05:00
toaster
e388b34abe * Correctly grey out skin on MP charsel menu if skinchange is restricted.
* Also grey out colour if team gametype.
2019-11-10 15:21:14 +00:00
toaster
a82902a378 Minor addition: Get in the way less when doing Record Attack stuff in DEVELOP builds. (Can revert before this branch is merged, but was necessary to test...) 2019-11-08 15:48:11 +00:00
James R
e5f3863708 Merge branch 'recordattack-menu-draw-fix' into 'master'
Record attack fixes

See merge request STJr/SRB2Internal!441
2019-11-07 17:53:03 -05:00
James R
546f313616 Merge branch 'secrets-charsel-music-fix' into 'master'
Fix char select music not playing in secrets menu

Closes #272

See merge request STJr/SRB2Internal!421
2019-11-07 17:51:38 -05:00
toaster
5f8671b100 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
d45ed97e50 Update m_menu.c 2019-11-04 12:30:28 -03:00
Steel Titanium
16c107e2ac
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
fc02b73534 Remove TTCOUNTERSET to simplify custom title SOC 2019-11-02 12:40:12 -04:00
mazmazz
0c1b5f07f0 Merge remote-tracking branch 'origin/master' into new-title 2019-11-01 21:06:46 -04:00
Jaime Passos
94ab276508 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
toaster
22649f698e 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
23c6011348 Fix char select music not playing in secrets menu 2019-10-27 13:12:36 -04:00
toaster
0c52de7a29 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
a58c794691 Missing ; 2019-10-27 12:03:52 +01:00
mazmazz
c7c72a4892 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
MascaraSnake
03c5b70fc5 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
4a9eb387f7 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
2a8e5b7bff 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
ff061fb813 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
080ff854b8 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
48173beb35 Menu options 2019-10-23 17:31:10 -07:00
James R
9162ba87cc Revert sound and music window focus related toggles
This partially reverts commit 5ac8a26814.
2019-10-23 15:24:34 -07:00
Steel Titanium
bfce75d5cd
Disable restriction for `DEVELOP` builds only 2019-10-23 16:29:50 -04:00
james
aa9f19512c Use less confusing player sorting key names 2019-10-22 21:41:34 -07:00
James R
5ac8a26814 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
12540dca32 Make "Focus lost" HUD overlay optional 2019-10-22 20:30:05 -07:00
Steel Titanium
b219be6f5e
Remove level select restrictions in Multiplayer 2019-10-19 21:37:03 -04:00
James R
fc97ccd7d4 Fix item selection not returning to "Specify IPv4 Address" 2019-10-19 13:07:20 -07:00
James R
4a15e2d1d8 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
dfdbc0afe3 Don't fade to character select from secret level select 2019-10-19 12:42:53 -07:00
James R
25d8b7d5ea Don't fade to Server Options 2019-10-19 12:25:02 -07:00
Steel Titanium
3e0a9cf742
Revert my old attempt of making the level music fade out before game over jingle 2019-10-19 14:36:30 -04:00
toaster
bf761a26d6 * 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
28607a81b5
Kill off SPR2_NTAG 2019-10-16 18:25:20 -04:00
Steel Titanium
edea290b0f
Show "Press ESC to exit" string on NiGHTS Attack menu too 2019-10-16 18:00:54 -04:00
Steel Titanium
dc0a1899ec
Fix ifselectvalnextmapnobrace indentation 2019-10-16 17:49:21 -04:00
Steel Titanium
38d044e475
Seperate name tag sprite into SPR2_NTAG 2019-10-16 00:22:05 -04:00
Steel Titanium
9c33f160a6
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
8f3e59b43d Improved "HELP" command!
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00