Commit graph

25568 commits

Author SHA1 Message Date
TehRealSalt
798cf3c8ae Rebalance Battle items in response to last night's netgame 2018-08-26 14:58:21 -04:00
mazmazz
123c781b27 Fix S_ChangeMusic newmusic -> mmusic, merge error 2018-08-26 14:22:14 -04:00
mazmazz
0939cabd57 Make SDL Mixer X win32-exclusive 2018-08-26 14:20:41 -04:00
mazmazz
3dfbb61546 New SDL2 test files 2018-08-26 14:12:11 -04:00
mazmazz
ed6ec14797 Merge branch 'music-cleanup' into music-sdlmixerx 2018-08-26 14:04:54 -04:00
toaster
dec11f37ff Increase the amount of time between the switch to the Rankings half of intermission and ranking is calculated a tad.
Turns out it wasn't taking the length of the level-to-rankings switch animation into account!
2018-08-26 17:31:04 +01:00
toaster
98ccb96938 Real time reordering of intermission rankings as rank counts up!
Also features jittering of the intermission elements because I thought it'd be fun, plus some better handling of players leaving (and then new ones joining) mid-intermission.
2018-08-26 16:23:50 +01:00
toaster
f2b73e15b4 * Exempt drop shadows from encore remapping.
* Make MT_GHOST's encoremapping depend on whether the source was encoremapped.
* Revamp how sector typegroup 2, type 15 inverts the encoremapping (so planes don't get awkwardly desynchronised).
2018-08-26 15:15:03 +01:00
toaster
44c33561b5 Merge branch 'sonicitems' into encore 2018-08-26 12:45:02 +01:00
toaster
6365e6b2f9 Undef SHITPLANESPARENCY downstream from vanilla, as promised. 2018-08-26 12:43:31 +01:00
toaster
41b7625fa7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
# Conflicts:
#	src/g_game.c
#	src/v_video.c
2018-08-26 12:42:55 +01:00
toaster
b26828805e Missed one! 2018-08-26 12:38:53 +01:00
toaster
e564f76416 Dumbass copypaste rectified, stplyr is NOT valid in mobjthinker code. toaster, stop making commits to sonicitems 2018-08-26 12:27:45 +01:00
TehRealSalt
b7caeccda9 Merge branch 'sonicitems' into encore 2018-08-26 00:12:02 -04:00
TehRealSalt
efa439f6bf Merge branch 'sal-misc' into sonicitems 2018-08-26 00:11:19 -04:00
mazmazz
c8a802bb6b Fixed post-boss music change with mapmusname comparison 2018-08-25 22:19:15 -04:00
mazmazz
b7c8f7fab7 Case-insensitive music_name comparison 2018-08-25 22:00:31 -04:00
mazmazz
7d42877ff2 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-08-25 21:55:49 -04:00
mazmazz
a622982a90 Remove tolower music_name, because we do case-insensitive matching now 2018-08-25 21:53:22 -04:00
mazmazz
1999544b62 Case-insensitive music matching 2018-08-25 21:50:56 -04:00
mazmazz
3cf24dc9b7 Case-insensitive music_name comparison 2018-08-25 21:42:39 -04:00
mazmazz
9fd8387830 Load mapmus vars post-boss even if another tune is playing, like a jingle 2018-08-25 17:42:46 -04:00
Monster Iestyn
7c321b4248 Merge branch 'v_video_killed_the_r_radio_star' into 'master'
v_video Killed The r_radio Star

See merge request STJr/SRB2!270
2018-08-25 16:43:25 -04:00
Monster Iestyn
7f0d75f741 Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master'
Zalloc Potter and the Death-Free Hallows

See merge request STJr/SRB2!269
2018-08-25 16:43:14 -04:00
Monster Iestyn
eb681b4b45 Merge branch 'lighting_fixes_plane_n_simple' into 'master'
Lighting fixes? Plane and simple!

See merge request STJr/SRB2!268
2018-08-25 16:43:00 -04:00
mazmazz
142807392e UINT32 muspostbosspos fix 2018-08-25 16:28:56 -04:00
mazmazz
e588460fe5 MUSICPOSITION -> MUSICPOS
* Added muspos level header var to lua

# Conflicts:
#	src/dehacked.c
#	src/lua_maplib.c
#	src/p_setup.c
2018-08-25 16:23:01 -04:00
mazmazz
6bb5280fbc MUSICPOSITION -> MUSICPOS
* Added muspos level header var to lua
2018-08-25 16:21:34 -04:00
mazmazz
26d309992a MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS 2018-08-25 16:18:09 -04:00
toaster
60177bba79 Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP. 2018-08-25 21:17:34 +01:00
mazmazz
bc0038ca3e Merge branch 'musicplus-core' into musicplus-feature-postboss
# Conflicts:
#	src/dehacked.c
#	src/p_setup.c
2018-08-25 16:11:29 -04:00
mazmazz
13854fbffb Added MUSICPOSTBOSSTRACK and MUSICPOSTBOSSPOSITION level header/variables 2018-08-25 16:10:46 -04:00
mazmazz
f30cf2b6cc Added MUSICPOSTBOSS level header for boss post-defeat music 2018-08-25 16:02:12 -04:00
mazmazz
5ed5f469b2 Add MUSICPOSITION level header and mapmusposition variable to instantly jump to position
* Cutscene support too!
2018-08-25 15:59:20 -04:00
mazmazz
0ff0b0a3fb Remove S_ChangeMusic call in G_PlayerReborn because redundant to S_Init 2018-08-25 15:23:48 -04:00
toaster
241c9c2260 Clean up a bunch of v_video.c functions that previously exhibited unfortunate side effects when run in non-green resolutions.
* V_DrawFixedPatch and ilk:
	* Change the offset of V_FLIP so it's not one screen-pixel off where its non-flipped sprite would have started being drawn from.
	* Write to x and y as well as desttop so that anti-screen-overflow checks later in the function behave properly with non-green resolutions.

* V_DrawFill:
	* Reduce number of operations performed upon `c`.

* V_DrawString and ilk:
	* Offset the left and right boundary checks in non-green resolutions such that you can actually draw stuff to the left of basevid screen x coordinate 0.
2018-08-25 19:52:17 +01:00
Digiku
eb5f4bcdb0 Merge branch 'op-nightshoop' into 'master'
NiGHTS objectplace: Place new hoop 1713 instead of 1705

See merge request STJr/SRB2Internal!136
2018-08-25 13:23:51 -04:00
mazmazz
68f0a25323 Add MUSIC_FORCERESET flag 2018-08-25 13:18:14 -04:00
toaster
ace4c46d5f Fix up them there ghosts!
* Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know?
* Make ghosts spawn properly on slopes.
2018-08-25 17:11:49 +01:00
toaster
6bd034e3dc Continuing my recent streak of making random lighting/colormap-related fixes to long-standing bugs:
* Fix that thing where ALL transparent FOF planes were continuously fullbright unless encased in a fog which disables sprite fullbrightness, which was long-hated by many people in the community!
	* For backwards compatibility, setting flag 1 in that fog field (which is probably the most common "in-the-wild" usage of this feature) will continue to make objects un-fullbright.
	* For situations where you desperately want the behaviour to be enabled, you can apply fog flag 2.
* Change the fadestart and fadeend range in which colormaps are generated.
	* The problem HERE was that the darkest light level reached by generated colormaps was actually slightly brighter than the darkest level reached by normal colormaps.
	* The typo I fixed does have SOME basis in fact - standard colormap lumps are 34 (33 in 0-indexing) long rather than 32 (31), but whoever wrote this didn't realise that the code for generating them didn't do it DooM style, just bright-to-dark with no extras on the end...
2018-08-25 16:46:45 +01:00
mazmazz
cc6c9d878d Lua add S_MusicName 2018-08-25 08:08:30 -04:00
mazmazz
a7def0ac3d Add S_MusicName back as a convenience function
* Move MUSICRATE to doomdef.h
2018-08-25 08:08:25 -04:00
mazmazz
7155f42c6c Add MUSICRATE to dehacked 2018-08-25 08:08:04 -04:00
mazmazz
0493fc6879 #ifdef MUSICRATE 1000 for adjustable music timings 2018-08-25 08:07:34 -04:00
wolfy852
8134098558 Expose NEWTICRATE and NEWTICRATERATIO to Lua
This should keep 70FPS-compatible scripts from throwing nil value errors.
2018-08-25 03:40:43 -05:00
mazmazz
db410cb236 Update functions for other targets 2018-08-24 18:20:53 -04:00
mazmazz
512a5f0e1b I_SongPlaying detect GME properly 2018-08-24 18:03:50 -04:00
mazmazz
c05be4e0b5 Stub I_UnloadSong because we already unload in I_StopMusic
* Stop-gap for now. Ideally the logic would be in the respective places.

# Conflicts:
#	src/sdl/mixer_sound.c
2018-08-24 18:02:46 -04:00
mazmazz
07cfc1a29a Volume fixes
# Conflicts:
#	src/sdl/mixer_sound.c
2018-08-24 18:01:57 -04:00
mazmazz
350dbf639c I_SongPlaying detect GME properly 2018-08-24 18:00:39 -04:00