mazmazz
|
b37a2016c7
|
Merge remote-tracking branch 'origin/master' into menu-execs
|
2018-11-20 18:31:30 -05:00 |
|
mazmazz
|
02fe8dc178
|
Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too
|
2018-11-18 02:41:35 -05:00 |
|
mazmazz
|
368b12d6d9
|
Line 457: Calculate input angle tolerance correctly
|
2018-11-14 10:13:39 -05:00 |
|
mazmazz
|
7b0ec6479f
|
Merge branch 'master' into text-prompts
|
2018-11-13 11:12:44 -05:00 |
|
mazmazz
|
422692ed03
|
NextTag implementation
* Adjust named tag implementation to be more portable
* Next page adjustments
|
2018-11-13 00:13:36 -05:00 |
|
mazmazz
|
8b434072a9
|
Stub netgame support; ignore bots on linedef special
|
2018-11-10 15:34:56 -05:00 |
|
mazmazz
|
3174969755
|
Added page tags and find page by tag
* Added tutorial mode defines to this branch
|
2018-11-10 09:32:53 -05:00 |
|
mazmazz
|
3d86cbc729
|
Close text prompt upon level load
|
2018-11-04 22:32:47 -05:00 |
|
mazmazz
|
f8d64c93d7
|
Move Line 449 to Line 459; allow post exec tag by either Back X offset or line tag
|
2018-11-04 22:32:47 -05:00 |
|
mazmazz
|
7246b6e9a6
|
Changed Line 449 post exec tag to line tag
|
2018-11-04 22:32:46 -05:00 |
|
mazmazz
|
30dbb6a644
|
TextPrompt: Implement player blocked controls and post-close run line
|
2018-11-04 22:32:46 -05:00 |
|
mazmazz
|
c914be07ab
|
Line 449 param rearranging
|
2018-11-04 22:32:46 -05:00 |
|
mazmazz
|
2b36943bf0
|
Basic TextPrompt line action implemented
|
2018-11-04 22:32:45 -05:00 |
|
mazmazz
|
0865497e66
|
Linedef Exec 449 Control Text Prompt - beginnings
|
2018-11-04 22:32:45 -05:00 |
|
mazmazz
|
6e058dc212
|
Line 458: Only do disable operation if MFE_TRACERANGLE is set
|
2018-11-04 16:48:18 -05:00 |
|
mazmazz
|
8f5f32a1b8
|
Trigger line exec by whether mobj is facing its tracer
* MFE_TRACERANGLE
* Thing 758 MT_ANGLEMAN
* mobj thinker behavior
* Line Exec 457/458 Enable/Disable
|
2018-11-04 16:28:25 -05:00 |
|
Monster Iestyn
|
89d7c55878
|
Merge branch 'public_next'
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
|
2018-10-10 14:51:34 +01:00 |
|
Monster Iestyn
|
afd62ec071
|
Merge branch 'master' into next
|
2018-10-09 22:55:55 +01:00 |
|
toaster
|
2ad2cbcc0a
|
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
|
2018-10-07 15:00:58 +01:00 |
|
mazmazz
|
64d3aaef14
|
foundrover ffloor_t -> boolean
|
2018-09-19 20:11:30 -04:00 |
|
mazmazz
|
9042f1a23b
|
Initialize foundrover to NULL (for debug checking)
|
2018-09-19 17:50:05 -04:00 |
|
mazmazz
|
052f1aede6
|
Linedef exec FOF specials: Move logic into for (rover =...) block so procedure happens on every FOF match
|
2018-09-19 17:49:03 -04:00 |
|
mazmazz
|
7dfe25d1b5
|
Merge branch 'master' into le-fadefof
|
2018-09-18 17:11:33 -04:00 |
|
mazmazz
|
4fa7a4ca37
|
musicplus-le-changemusic 2.2 -> 2.1 backport
|
2018-09-18 15:28:57 -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 |
|
mazmazz
|
32c48af258
|
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
|
2018-09-18 10:22:17 -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 |
|
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
|
3ce5362a1d
|
453: Extra parameter for Add_ColormapFader
|
2018-09-15 20:40:17 -04:00 |
|
mazmazz
|
e01fd1f3a3
|
453: Try ResetFakeFloorFader if condition again
|
2018-09-15 02:24:44 -04:00 |
|
mazmazz
|
a19c44d21f
|
453: P_ResetFakeFloorFader stray & address if condition
|
2018-09-15 02:16:54 -04:00 |
|
mazmazz
|
95aeb78550
|
453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor
|
2018-09-15 01:05:21 -04:00 |
|
mazmazz
|
413f25f323
|
492: Mixed D+C fix
|
2018-09-15 00:56:46 -04:00 |
|
mazmazz
|
73a907f52f
|
455: Mixed D+C fix
|
2018-09-15 00:53:21 -04:00 |
|
mazmazz
|
5515fba00e
|
Merge branch 'lightfade-ticbased' into le-fadefof
|
2018-09-14 08:42:02 -04:00 |
|
mazmazz
|
065638d029
|
455: Fog flag fix for fading
|
2018-09-13 12:18:10 -04:00 |
|
mazmazz
|
b58f765254
|
455: Set timing by either Back Y or Front Y, but not line length
|
2018-09-13 10:53:03 -04:00 |
|
mazmazz
|
8464a5ec8a
|
455: Don't override fadergba on default/no colormap init (~BOUNCY)
|
2018-09-13 10:43:41 -04:00 |
|
mazmazz
|
99c67decc1
|
455: Add speed increment timing (~EFFECT4) to FadeColormap
|
2018-09-13 10:43:32 -04:00 |
|