Digiku
|
a8a0549bf4
|
Merge branch 'nights-keeppoints' into 'master'
NiGHTS: Deduct marescore when player hits ground, not immediately on timeout
See merge request STJr/SRB2Internal!161
|
2018-09-19 11:03:24 -04:00 |
|
Digiku
|
a5a8282a77
|
Merge branch 'nights-score-lap' into 'master'
NiGHTS: Intermission Bonuses
See merge request STJr/SRB2Internal!159
|
2018-09-19 11:03:14 -04:00 |
|
Digiku
|
96f61d8ae6
|
Nights intermission bonus y_inter.c: A comment
|
2018-09-19 10:53:11 -04:00 |
|
Digiku
|
eb307a4066
|
Nights intermission dehacked: a comment
|
2018-09-19 10:45:51 -04:00 |
|
Digiku
|
94730a921e
|
Merge branch 'le-fadefof' into 'master'
Linedef Exec Action: Fade FOF
See merge request STJr/SRB2Internal!168
|
2018-09-18 17:14:48 -04:00 |
|
mazmazz
|
7dfe25d1b5
|
Merge branch 'master' into le-fadefof
|
2018-09-18 17:11:33 -04:00 |
|
Digiku
|
ba0b15a715
|
Merge branch 'fof-fixes-movingplatexists' into 'master'
Moving platform fix: Player snaps to floor when setting ~FF_EXISTS
See merge request STJr/SRB2Internal!188
|
2018-09-18 11:29:11 -04:00 |
|
mazmazz
|
c213c23af3
|
420: Don't interrupt existing light fade on duration timing except EFFECT5
(cherry picked from commit 3b957c32517a8f5148940c0067af7e88a51d1fee)
|
2018-09-18 11:08:33 -04:00 |
|
Digiku
|
be6bae4ccb
|
Merge branch 'colormap-overhaul-fade' into 'master'
Linedef Exec 455 Fade Colormap, 456 Stop Fading Colormap
See merge request STJr/SRB2Internal!191
|
2018-09-18 11:06:09 -04:00 |
|
mazmazz
|
65aeea28bc
|
Merge branch 'colormap-overhaul-fade' into le-fadefof
|
2018-09-18 11:05:30 -04:00 |
|
mazmazz
|
83cfc7d0e4
|
Merge remote-tracking branch 'origin/master' into le-fadefof
|
2018-09-18 10:52:03 -04:00 |
|
Digiku
|
7e8fdcae54
|
Merge branch 'colormap-overhaul-change-ldef' into 'master'
Linedef Exec 447: Change Colormap relative value calc
See merge request STJr/SRB2Internal!190
|
2018-09-18 10:49:54 -04:00 |
|
Digiku
|
31ea145fb2
|
Merge branch 'polyobj-fade' into 'master'
Linedef Exec 492: Fade PolyObject
See merge request STJr/SRB2Internal!192
|
2018-09-18 10:48:46 -04:00 |
|
Digiku
|
34a340340d
|
Merge branch 'no-effect5-fudging' into 'master'
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
See merge request STJr/SRB2Internal!193
|
2018-09-18 10:48:29 -04:00 |
|
mazmazz
|
7b94368549
|
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
|
2018-09-18 07:37:29 -04:00 |
|
mazmazz
|
f3f8575dfc
|
492: Remove pre-existing thinker when setting up new fade
|
2018-09-18 07:31:19 -04:00 |
|
mazmazz
|
ae5b02bccd
|
492: Don't interrupt existing polyobj fader unless EFFECT5
|
2018-09-18 07:31:17 -04:00 |
|
mazmazz
|
5daf21de9b
|
455: A line break
|
2018-09-18 07:30:37 -04:00 |
|
mazmazz
|
71e7a15425
|
455: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
|
2018-09-18 07:30:35 -04:00 |
|
mazmazz
|
a48b9d9e3f
|
455: Don't interrupt current color fading
|
2018-09-18 07:29:21 -04:00 |
|
mazmazz
|
aa9da189a6
|
453: A line break
|
2018-09-18 07:28:30 -04:00 |
|
mazmazz
|
dfaf0b00d4
|
453: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
|
2018-09-18 07:28:28 -04:00 |
|
mazmazz
|
2fac7c36ad
|
453: Don't interrupt current FOF fade unless EFFECT5
|
2018-09-18 07:27:47 -04:00 |
|
Monster Iestyn
|
c088d55547
|
Merge branch 'public_next'
|
2018-09-17 21:50:19 +01:00 |
|
Monster Iestyn
|
e48e3e15c4
|
Merge branch 'public-var2s-fix' into 'next'
Level spec thinker: Netsync var2s
See merge request STJr/SRB2!280
|
2018-09-17 14:43:44 -04:00 |
|
mazmazz
|
f307c6d1b6
|
Line exec trigger netsync: Save var2s in addition to vars
|
2018-09-17 14:13:31 -04:00 |
|
Digiku
|
a35a4e052c
|
Merge branch 'colormap-overhaul' into 'master'
Colormap code overhaul
See merge request STJr/SRB2Internal!189
|
2018-09-17 11:24:14 -04:00 |
|
mazmazz
|
f57e7c7fc5
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-17 10:57:02 -04:00 |
|
mazmazz
|
7b1856e32a
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-17 10:56:56 -04:00 |
|
mazmazz
|
e57bd5206c
|
Colormap netsync: Count ffloors for colormap loading upper limit
|
2018-09-17 10:38:17 -04:00 |
|
mazmazz
|
5f176f5525
|
Colormap netsync: Handle unaccounted dummy colormaps properly
|
2018-09-17 10:30:21 -04:00 |
|
mazmazz
|
30b57e22cd
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-17 08:06:17 -04:00 |
|
mazmazz
|
67d3b713a2
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-17 08:06:10 -04:00 |
|
mazmazz
|
02ed2d247e
|
Colormap netsync: String format numsectors to UINT32 (thanks buildbot)
|
2018-09-17 08:05:51 -04:00 |
|
mazmazz
|
70a672229c
|
453: Use new colormap netsync for fade FOF thinker
|
2018-09-17 00:34:03 -04:00 |
|
mazmazz
|
02c33bcac8
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-17 00:28:16 -04:00 |
|
mazmazz
|
db35c7cd45
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-17 00:27:11 -04:00 |
|
mazmazz
|
0cba69e75a
|
Colormap netsync: Mixed D+C fixes
|
2018-09-17 00:26:58 -04:00 |
|
mazmazz
|
c36f189da3
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-16 22:42:57 -04:00 |
|
mazmazz
|
e5d533edc2
|
New colormap netsync fixes
|
2018-09-16 22:42:36 -04:00 |
|
mazmazz
|
3bfdcad4cc
|
New colormap netsync fixes
|
2018-09-16 22:41:08 -04:00 |
|
mazmazz
|
82ebf0c64a
|
455: Fade colormap netsync use new colormap saving
|
2018-09-16 20:27:24 -04:00 |
|
mazmazz
|
1103503dee
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-16 20:25:59 -04:00 |
|
mazmazz
|
5923e85c5a
|
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
|
2018-09-16 20:25:46 -04:00 |
|
Digiku
|
7b65f36d43
|
Merge branch 'lightfade-ticbased' into 'master'
Linedef Exec 420: Fade Lighting add duration timing
See merge request STJr/SRB2Internal!186
|
2018-09-16 08:24:09 -04:00 |
|
mazmazz
|
20537f1310
|
Merge branch 'lightfade-ticbased' into le-fadefof
|
2018-09-16 08:20:57 -04:00 |
|
mazmazz
|
33bc560f15
|
420: Strip test comments
|
2018-09-16 08:20:14 -04:00 |
|
mazmazz
|
3ce5362a1d
|
453: Extra parameter for Add_ColormapFader
|
2018-09-15 20:40:17 -04:00 |
|
mazmazz
|
d8b57f32e7
|
492: Merge speed and duration logic for fade polyobject
|
2018-09-15 20:00:37 -04:00 |
|
Monster Iestyn
|
94b02c8e44
|
Merge branch 'mario-block-sync' into 'next'
Fix for Mario block FOF texture synchronisation in netgames
See merge request STJr/SRB2!279
|
2018-09-15 10:15:47 -04:00 |
|