lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9992 commits 1 branch 29 tags 122 MiB
Commit graph

226 commits

Author SHA1 Message Date
Alam Ed Arias 24df9f032f Merge branch 'master' into next 2020-05-06 18:36:20 -04:00
Alam Ed Arias 38232ce07e fix build errors in public master 2020-05-06 18:35:54 -04:00
James R e100f21dda Merge branch 'loop-patch' into 'next' 
Let MUSICDEF set loop point

See merge request STJr/SRB2!762
 2020-04-09 19:47:43 -04:00
Louis-Antoine e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
fickleheart 05b2570ae7 Merge remote-tracking branch 'upstream/next' into lua-music 2020-03-18 22:43:07 -05:00
Monster Iestyn f4cb6e1f5e Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff 
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
 2020-03-09 13:54:56 +00:00
fickleheart f2c968dea8 Add JingleStatus hook for carrying custom jingle tunes 
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
 2020-02-23 17:20:44 -06:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R 3d00596c6a Don't override loop point if unset in MUSICDEF 2020-02-07 12:51:54 -08:00
James R c4ee113c71 Let MUSICDEF set loop point 2020-02-07 12:47:41 -08:00
James R 2d8ea7125c Remove unnecessary optimization 2020-01-20 15:36:27 -08:00
James R 9dbc54284e Opt into new MUSICDEF format (2.2.0 compatibility) 
The "VERSION" directive enables features available in a certain version of
SRB2. It may be used as "VERSION 2.2.0".
 2020-01-18 23:12:30 -08:00
James R 1317dba3e4 Refactor MUSICDEF parsing, actually count lines 
If you use strtok for (CR)LF, it'll skip the empty lines bruh.
 2020-01-18 22:17:47 -08:00
Alam Ed Arias d9742afb45 Merge remote-tracking branch 'origin/next' into next 2020-01-16 20:17:58 -05:00
James R 1f36bde25f Merge branch 'musicdef' into 'next' 
MUSICDEF parser changes.

See merge request STJr/SRB2!599
 2020-01-16 19:35:38 -05:00
Alam Ed Arias 0134be8b78 please stop breaking clang 2020-01-16 12:05:21 -05:00
James R 1113a13621 1upsound always plays a sound instead of jingle 2020-01-10 12:55:03 -08:00
James R 4bf3597116 Fix NOOPENMPT compiling 2019-12-30 19:19:17 -08:00
Jaime Passos 757480f219 Some cleanup in general. 2019-12-30 02:07:39 -03:00
Jaime Passos c303b1a435 Use strspn here. 2019-12-30 01:39:34 -03:00
Jaime Passos 773d564d6a MUSICDEF parser changes. 2019-12-30 00:22:27 -03:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
mazmazz be44f0701e Clean up music error messages 2019-11-30 11:53:45 -05:00
Jaime Passos 67d0499903 Fix stuck closed captioning 2019-11-25 20:16:17 -03:00
toaster 7c7eec4b9a Fix conditionset-based unlocks on the Sound Test. 2019-11-21 13:12:54 +00:00
toaster 261041dc69 Resolve #281. (Might have problems with non-SDL interfaces, but definitely good for what we're shipping with.) 2019-11-14 14:19:13 +00:00
toaster a7f2931b47 Update SFX definition to credit VAdaPEGA specifically, given we've made most credits more specific now too. 2019-11-13 15:02:06 +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
MascaraSnake 17013bf1b7 Merge branch 'jingle-fixes' into 'master' 
Fix some jingle resuming behavior when also changing base level music

See merge request STJr/SRB2Internal!415
 2019-11-12 15:41:53 -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
mazmazz 91eb380412 Fix some jingle resuming behavior with boss music switching 2019-10-26 15:02:45 -04:00
mazmazz 26cb75e961 Fix MIDI not being disabled when non-native 2019-10-26 12:09:27 -04:00
James R 64e7708832 I say damn you massive initializer! 2019-10-25 21:36:10 -07: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
James R cd252eb468 Console variables to toggle music/sound playing when the window is unfocused 
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
 2019-10-23 17:21:09 -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
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 a24814c2fc Add a "-noaudio" parm to cover "-nomusic" and "-nosound" 2019-10-22 20:09:33 -07:00
toaster 440b63ef13 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 cf4b5a1b9d * Comment out the notices that the two types of music are disabled (see issue #179; not a perfect fix, but good enough for now). 2019-09-07 11:49:13 +01:00
Alam Ed Arias cebc1d46f0 All C files should a newline at the end 2019-08-07 12:39:51 -04:00
mazmazz 46993268ae * 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 384dc0674e Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit 603d5805f7.
 2019-08-04 12:03:57 +01:00
toaster 603d5805f7 Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
 2019-08-04 11:32:55 +01:00
mazmazz ce39341c31 Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019 2019-08-04 02:52:33 -04:00
mazmazz bddafbeece Merge branch 'internal-musicplus-jingle' into musicplus-aug2019 2019-08-04 02:41:37 -04:00
mazmazz 91265379df Revert MUSSERV code removal from S_LoadMusic 
(but we'll probably purge it later, anyway...)
 2019-08-04 02:04:02 -04:00
mazmazz b99f06c0c9 Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx 2019-08-04 01:10:21 -04:00
mazmazz 353fefbd42 Slight refactor for jingle resume lapse time 2019-08-04 00:59:32 -04:00
mazmazz 81d0840301 Jingle resume: Don't set music position when music is replaced 2019-08-04 00:56:17 -04:00