Steel Titanium
4b690b20d3
Merge branch 'master' into addfile-verify-fix
2018-09-01 19:33:59 -04:00
mazmazz
73842cec71
Add MUSICPOSTBOSSFADEIN
2018-09-01 13:10:50 -04:00
mazmazz
797f2b6575
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-09-01 11:38:26 -04:00
mazmazz
abb67d35e3
Reset MIDI music properly on settings change
...
* Added reset flag to S_Start (now S_StartEx)
2018-09-01 11:37:53 -04:00
mazmazz
1aa4035594
Revert "Fix MIDI music not reloading sometimes on settings change"
...
This reverts commit be21072b58 .
2018-09-01 11:35:54 -04:00
mazmazz
be21072b58
Fix MIDI music not reloading sometimes on settings change
2018-09-01 11:34:03 -04:00
mazmazz
82512a3ce4
Fix MIDI music not reloading sometimes on settings change
2018-09-01 11:33:39 -04:00
mazmazz
da53fd8f8f
Merge branch 'music-cleanup' into musicplus-core
2018-09-01 11:22:15 -04:00
toaster
1dfe7e3da4
Update arrow rendering to use simple character function rather than overkill string function.
2018-08-31 22:38:56 +01:00
TehRealSalt
b26c30156b
Toggle All option
2018-08-31 14:41:37 -04:00
mazmazz
059f364740
Add Mixer X retrieve song length and position natively, if available
2018-08-31 13:52:01 -04:00
mazmazz
0f9f055961
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-31 13:27:11 -04:00
mazmazz
4810c48c08
Compile in modplug (for libopenmpt file detection)
2018-08-31 13:27:02 -04:00
TehRealSalt
27f7e5bb4a
Small fix
2018-08-31 13:23:05 -04:00
TehRealSalt
af0035aaba
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 13:18:19 -04:00
mazmazz
2cf2b0c66b
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-31 12:19:03 -04:00
mazmazz
e5b4cf2dcf
Fix MIDI not reloading when erroring on a player
2018-08-31 12:18:54 -04:00
Monster Iestyn
7fc4d864a8
Fix HOM removal not working properly for non-green resolutions
2018-08-31 17:14:44 +01:00
mazmazz
a4d6458ecd
Revert "Update SDL Windows dependency to 2.0.8"
...
This reverts commit adce4db5aa .
2018-08-31 12:00:33 -04:00
mazmazz
c78472539c
Revert "New SDL2 test files"
...
This reverts commit 3dfbb61546 .
2018-08-31 11:58:18 -04:00
mazmazz
cc4f59878a
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-31 11:23:25 -04:00
mazmazz
853fe38569
Compiled fluidsynth into libraries
2018-08-31 11:23:16 -04:00
Latapostrophe
3145c7a912
Cleanup + coloured text for spectators / PMs
2018-08-31 15:02:48 +02:00
Latapostrophe
b100112a70
Removed that one empty space thing
2018-08-31 13:56:11 +02:00
Latapostrophe
313c8b27a6
Cleaned up a little, courtesy of toaster
2018-08-31 13:52:53 +02:00
toaster
7e68741a42
Improve intermission drawer further.
...
* Change `MM:SS.MS` to `MM'SS"MS' to match all other recorded instances of time in-game.
* Add a full stop to NO CONTEST to scrounge up an extra four pixels to match the increased width of above.
* Make it such that the number of players per column will never be desynced with future code changes by tying it to a local #define.
* Other minor code improvements.
2018-08-31 12:37:15 +01:00
Latapostrophe
043d0581a6
Coloured names for chat
2018-08-31 13:30:40 +02:00
mazmazz
e33d385a6a
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-31 02:26:45 -04:00
mazmazz
580a3471a8
Updated SDL Mixer X binaries
2018-08-31 02:26:21 -04:00
TehRealSalt
1be9b16f3a
Scale the speed of SA dash pads with higher scales
...
Also, added a define for GROWNEVERMISSES, which fixes every single jump with Grow but with feels terrible.
2018-08-31 00:05:46 -04:00
TehRealSalt
2e809548e4
separate var for dashpad cooldown
...
- no longer has weirdness with pw_flashing
- can now have an SA1-style effect for it
2018-08-30 22:27:18 -04:00
TehRealSalt
5c9e1a7d68
Grow no longer sets flashing tics
...
Just causes a bunch of other, really dumb side-effects, and nothing else I could test suffers from it
2018-08-30 21:51:27 -04:00
TehRealSalt
9f6c132629
Karma players can bump again
2018-08-30 21:32:24 -04:00
TehRealSalt
5fa2ffd26e
Jawz reticule
2018-08-30 19:24:22 -04:00
Steel Titanium
277bec55c2
Only do this if the admin player isn't the server host also.
2018-08-30 18:32:26 -04:00
TehRealSalt
2f7563a5b0
Ignore texture on horizon lines when in OGL
...
Before: https://cdn.discordapp.com/attachments/300531341957529602/484842910475354124/kart0110.png
After: https://cdn.discordapp.com/attachments/270211093761097728/484841628771680258/kart0109.png
Not a solution, but better than the previous.
2018-08-30 17:53:25 -04:00
TehRealSalt
4018301434
Remove use of a duplicated sound
2018-08-30 17:50:47 -04:00
Digiku
b24a04989e
Merge branch 'nights-nofastattract' into 'master'
...
NiGHTS: Dummy out faster item attract
See merge request STJr/SRB2Internal!183
2018-08-30 17:26:42 -04:00
TehRealSalt
f549205721
Halved radius of MT_CHOMPER
2018-08-30 17:12:35 -04:00
TehRealSalt
bd3b346f32
Apply to bananas, eggmen, and mines also
2018-08-30 16:36:46 -04:00
TehRealSalt
4b38c3e48e
Put on player's center during this animation
2018-08-30 16:28:01 -04:00
TehRealSalt
85ee66f64a
Held Orbinaut & Jawz radius+scaling animation on spawn
2018-08-30 16:10:25 -04:00
TehRealSalt
56e74678af
More fundamental Jawz changes.
...
1.) Instead of prioritizing best angle above all else, it averages both distance and angle to figure out which is the best overall target.
2.) Jawz will completely cut out angles higher than 45 degrees, preventing instances where someone behind you is considered a better target than who you're looking at.
3.) Jawz does the 45 degree angle checking in Race as well, meaning that they will ignore racers that are neck & neck with you, even if they're technically the next place above you, so that Jawz doesn't take a hard left into a wall.
2018-08-30 15:30:27 -04:00
Monster Iestyn
9d8d239eab
Apparently I am blind and missed that splitscreen only CC offset that overrides the code for the other offset below
2018-08-30 20:08:17 +01:00
mazmazz
dcca56bc04
Dummy out NiGHTS item faster attract
2018-08-30 10:50:03 -04:00
Digiku
2b18908fe4
Merge branch 'nights-inufixes' into 'master'
...
NiGHTS Minor Fixes: Snappier paraloop attract; drill mash penalty; configurable link timer
See merge request STJr/SRB2Internal!156
2018-08-30 09:12:55 -04:00
mazmazz
f8588739b8
Drill mash penalty fix
2018-08-30 09:09:19 -04:00
mazmazz
631a053e92
Merge remote-tracking branch 'origin/master' into nights-inufixes
2018-08-30 08:13:34 -04:00
toaster
5a1e52ba33
Overlays and rings now properly handle encore-ness, in that they are sans encore (most of the time).
...
... :V
2018-08-30 13:13:25 +01:00
TehRealSalt
0fb69a859a
Foolish
2018-08-29 18:12:18 -04:00