stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-01 15:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity
6750 commits 173 branches 41 tags 356 MiB
Commit graph

6750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
5eddb1f455 Merge branch 'master' into hud-n-menu-tidbits 2018-08-29 21:28:11 +01:00
Monster Iestyn
28bbe71c57 Merge branch 'hud-cleaning' into 'master' 
Hud cleaning

See merge request STJr/SRB2Internal!170
 2018-08-29 16:22:48 -04:00
Monster Iestyn
523a02aa54 Merge branch 'master' into hud-cleaning 2018-08-29 20:46:35 +01:00
Monster Iestyn
1c5080151d Fix typo introduced by changes to the setrings command 2018-08-29 20:46:08 +01:00
mazmazz
38bb71bada Add mapmusposition placeholder to LE 413 change music 2018-08-29 15:21:17 -04:00
Monster Iestyn
a48326383c Merge branch 'master' into hud-cleaning 
# Conflicts:
#	src/y_inter.c
 2018-08-29 16:39:02 +01:00
mazmazz
6d97a10273 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00
Digiku
900cbf72c8 Merge branch 'nightsplus-laplogic' into 'master' 
NiGHTS: Track player mare lap variables

See merge request STJr/SRB2Internal!143
 2018-08-29 10:58:05 -04:00
mazmazz
dc86fe9b5f Merge remote-tracking branch 'origin/master' into nightsplus-laplogic 2018-08-29 10:16:49 -04:00
Digiku
e0601616fe Merge branch 'nights-bumper-fix' into 'master' 
NiGHTS: Fix player positioning when touching Bumper

See merge request STJr/SRB2Internal!165
 2018-08-29 06:02:24 -04:00
Digiku
a28cc10861 Merge branch 'op-nights-bumper' into 'master' 
Objectplace: Place NiGHTS Bumpers with the player's fly angle

See merge request STJr/SRB2Internal!166
 2018-08-29 06:01:27 -04:00
Digiku
f8332f6765 Merge branch 'nights-nightserizeangle' into 'master' 
NiGHTS: Reset player another/flyangle on De/Nightserize

See merge request STJr/SRB2Internal!139
 2018-08-29 04:27:02 -04:00
Digiku
4882b7c3f8 Merge branch 'intermission-bonuslivesmax' into 'master' 
Intermission: MaxBonusLives level header option for # of lives in score tally

See merge request STJr/SRB2Internal!162
 2018-08-29 04:25:03 -04:00
Digiku
9746442a93 Merge branch 'le-ringspheres' into 'master' 
Line Execs: Make Ring triggers accept spheres in NiGHTS levels

See merge request STJr/SRB2Internal!163
 2018-08-29 04:24:47 -04:00
Digiku
78c78d9e63 Merge branch 'sphere-ring-concurrence' into 'master' 
Change SETSPHERES console command to SETRINGS to handle player->spheres transparently

See merge request STJr/SRB2Internal!167
 2018-08-29 04:24:23 -04:00
mazmazz
b0be27a54e Fix music fade out when MUSICPOSTBOSS is not specified or doesn't exist 2018-08-28 18:46:30 -04:00
Monster Iestyn
73a66d22df At toaster's suggestion, have 2p control whether closed captioning is moved up if the powerup display is 1st person only 2018-08-28 20:57:43 +01:00
Monster Iestyn
1af8d3ac02 Merge branch 'master' into hud-n-menu-tidbits 
# Conflicts:
#	src/m_menu.c
#	src/screen.c
#	src/st_stuff.c
 2018-08-28 20:51:46 +01:00
Monster Iestyn
58a844d3cf Merge branch 'public_next' 
# Conflicts:
#	src/r_things.c
#	src/v_video.c
 2018-08-28 19:31:08 +01:00
mazmazz
9c35b3dfc5 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-08-28 10:27:49 -04:00
mazmazz
9a5b8ec671 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-08-28 10:23:13 -04:00
mazmazz
75e6ad72ed Fix MIDI looping/non-looping 2018-08-28 10:16:06 -04:00
mazmazz
0bea5729a7 Revise LUAh_MusicChange hook 2018-08-28 10:10:56 -04:00
mazmazz
9244a13721 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-27 08:40:36 -04:00
mazmazz
359a71c059 Move cvars to D_RegisterClientCommands for config recall 2018-08-27 08:40:24 -04:00
mazmazz
36d650c530 Remove MP3 warning for win32 Mixer X 2018-08-27 06:16:55 -04:00
mazmazz
b760fbe89b Corrected unterminated #endif in sdl_sound 2018-08-27 06:15:01 -04:00
mazmazz
b701316505 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-27 05:59:55 -04:00
mazmazz
07ae007980 Remove unused methods (for now?) 2018-08-27 05:53:43 -04:00
mazmazz
9f6e913d43 Load Fluidsynth soundfont upon cvar change 2018-08-27 05:52:01 -04:00
mazmazz
878dc1af92 Lazy midi reload support on menu 2018-08-27 00:43:25 -04:00
mazmazz
535aed24bb Advanced submenu for sound options 2018-08-26 23:58:43 -04:00
mazmazz
cc9d554dfd Revert "Sound scroll menu attempt" 
This reverts commit 7b11855041.
 2018-08-26 23:46:55 -04:00
mazmazz
7b11855041 Sound scroll menu attempt 2018-08-26 23:46:20 -04:00
mazmazz
28545822ba Checkpoint: Add FluidSynth and Timidity support 2018-08-26 23:03:38 -04:00
mazmazz
8ee27d3297 Makefile comments 2018-08-26 23:02:57 -04:00
mazmazz
59185f4ad1 New SDL Mixer X builds with FluidSynth and Timidity 2018-08-26 23:02:29 -04:00
Monster Iestyn
61836e1565 Merge branch 'master' into next 2018-08-26 21:10:41 +01:00
Monster Iestyn
c67767c580 Merge branch 'yo_screen_so_wide_y_is_invalid' into 'master' 
Yo Screen So Wide y Is Invalid

See merge request STJr/SRB2!271
 2018-08-26 16:07:06 -04:00
mazmazz
65e5794ee3 HAVE_MIXERX and NOMIXERX compile flags (win32 only) 2018-08-26 15:12:00 -04:00
mazmazz
73b4c4c5b4 Fix S_ChangeMusic newmusic -> mmusic, merge error 2018-08-26 14:22:14 -04:00
mazmazz
768ce1a46f Make SDL Mixer X win32-exclusive 2018-08-26 14:20:41 -04:00
mazmazz
eafed06a29 New SDL2 test files 2018-08-26 14:12:11 -04:00
mazmazz
35fdcee071 Merge branch 'music-cleanup' into music-sdlmixerx 2018-08-26 14:04:54 -04:00
toaster
710550bb9d Missed one! 2018-08-26 12:38:53 +01:00
mazmazz
0f42363a97 Fixed post-boss music change with mapmusname comparison 2018-08-25 22:19:15 -04:00
mazmazz
a7ae059949 Case-insensitive music_name comparison 2018-08-25 22:00:31 -04:00
mazmazz
c82a5de4b7 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-08-25 21:55:49 -04:00
mazmazz
9f3549e5e1 Remove tolower music_name, because we do case-insensitive matching now 2018-08-25 21:53:22 -04:00
mazmazz
01c6dbed5c Case-insensitive music matching 2018-08-25 21:50:56 -04:00