Steel Titanium
|
0f5d685d1f
|
Only do this if the admin player isn't the server host also.
|
2018-08-30 18:32:26 -04:00 |
|
Digiku
|
6ab0eb53f9
|
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 |
|
Monster Iestyn
|
4083ee9df7
|
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
|
fed72c344a
|
Dummy out NiGHTS item faster attract
|
2018-08-30 10:50:03 -04:00 |
|
Digiku
|
baa6ba6899
|
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
|
dae37e2749
|
Drill mash penalty fix
|
2018-08-30 09:09:19 -04:00 |
|
mazmazz
|
a44be49535
|
Merge remote-tracking branch 'origin/master' into nights-inufixes
|
2018-08-30 08:13:34 -04:00 |
|
Monster Iestyn
|
ceb0abb081
|
Fix compiler complaints, remove a slipup of mine from when I was dealing with merge conflicts
|
2018-08-29 22:07:38 +01:00 |
|
Monster Iestyn
|
7db7a739d4
|
Use INFLIVES macro in place of 0x7f for infinite lives check
|
2018-08-29 21:31:15 +01:00 |
|
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
|
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 |
|
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 |
|
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 |
|
mazmazz
|
48b6255e93
|
Case-insensitive music_name comparison
|
2018-08-25 21:42:39 -04:00 |
|
mazmazz
|
083de09f88
|
Load mapmus vars post-boss even if another tune is playing, like a jingle
|
2018-08-25 17:42:46 -04:00 |
|
Monster Iestyn
|
d5ab3e75a5
|
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
|
ed5bed4d2c
|
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
|
0b8c231989
|
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
|
7d882c482f
|
UINT32 muspostbosspos fix
|
2018-08-25 16:28:56 -04:00 |
|
mazmazz
|
4dd6b733d6
|
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
|
493bc86b08
|
MUSICPOSITION -> MUSICPOS
* Added muspos level header var to lua
|
2018-08-25 16:21:34 -04:00 |
|
mazmazz
|
ed8288a028
|
MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS
|
2018-08-25 16:18:09 -04:00 |
|
toaster
|
85474e33dd
|
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
|
21d08b39bf
|
Merge branch 'musicplus-core' into musicplus-feature-postboss
# Conflicts:
# src/dehacked.c
# src/p_setup.c
|
2018-08-25 16:11:29 -04:00 |
|