mazmazz
|
9ec98c588f
|
Merge branch 'public_next'
|
2019-03-14 22:15:34 -04:00 |
|
mazmazz
|
2c75d4da69
|
Fix custom fade source bug for Change Music linedef
|
2019-03-13 19:53:16 -04:00 |
|
Monster Iestyn
|
9effa134d2
|
resolve the conflict in p_spec.c
|
2019-01-07 17:02:05 +00:00 |
|
mazmazz
|
1aacfee80c
|
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
|
2019-01-02 03:47:51 -05:00 |
|
mazmazz
|
075f28b7c8
|
WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
|
2019-01-02 01:09:15 -05:00 |
|
mazmazz
|
b7bb570f97
|
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
|
2019-01-01 10:41:40 -05:00 |
|
Monster Iestyn
|
cb53bc8afe
|
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
|
2018-11-27 23:05:33 +00:00 |
|
MonsterIestyn
|
b53cd70201
|
Merge branch 'next' into PK3-BackportNext
|
2018-11-26 18:56:51 +00:00 |
|
Monster Iestyn
|
1b2aea81dc
|
Merge branch 'master' into next
|
2018-11-25 20:39:17 +00:00 |
|
mazmazz
|
ea7162a76a
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
Nev3r
|
6f5e3d42ff
|
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
Pk3 backport
See merge request Nev3r/SRB2!1
|
2018-11-24 06:02:19 -05:00 |
|
Nev3r
|
cb0c31fa9a
|
Final touches
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.
Signed-off-by: Nev3r <apophycens@gmail.com>
|
2018-11-24 09:26:52 +01:00 |
|
Nev3r
|
0487558a98
|
Add missing tweaks
Also remove a test printf.
Signed-off-by: Nev3r <apophycens@gmail.com>
|
2018-11-23 17:58:45 +01:00 |
|
mazmazz
|
cf834f3503
|
Line 457: Calculate input angle tolerance correctly
|
2018-11-14 10:13:39 -05:00 |
|
mazmazz
|
6c69dd1f78
|
Merge branch 'master' into text-prompts
|
2018-11-13 11:12:44 -05:00 |
|
mazmazz
|
75c4a96e69
|
NextTag implementation
* Adjust named tag implementation to be more portable
* Next page adjustments
|
2018-11-13 00:13:36 -05:00 |
|
mazmazz
|
7deeb8bac4
|
Stub netgame support; ignore bots on linedef special
|
2018-11-10 15:34:56 -05:00 |
|
mazmazz
|
e1e94c3af2
|
Added page tags and find page by tag
* Added tutorial mode defines to this branch
|
2018-11-10 09:32:53 -05:00 |
|
mazmazz
|
311cb27818
|
Close text prompt upon level load
|
2018-11-04 22:32:47 -05:00 |
|
mazmazz
|
722da815ea
|
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
|
1ca8fca602
|
Changed Line 449 post exec tag to line tag
|
2018-11-04 22:32:46 -05:00 |
|
mazmazz
|
57d9e0aef6
|
TextPrompt: Implement player blocked controls and post-close run line
|
2018-11-04 22:32:46 -05:00 |
|
mazmazz
|
5f1052729c
|
Line 449 param rearranging
|
2018-11-04 22:32:46 -05:00 |
|
mazmazz
|
7778507a70
|
Basic TextPrompt line action implemented
|
2018-11-04 22:32:45 -05:00 |
|
mazmazz
|
63e5cfecff
|
Linedef Exec 449 Control Text Prompt - beginnings
|
2018-11-04 22:32:45 -05:00 |
|
mazmazz
|
4fc335a26b
|
Line 458: Only do disable operation if MFE_TRACERANGLE is set
|
2018-11-04 16:48:18 -05:00 |
|
mazmazz
|
cf6a6991cb
|
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
|
291ebf302c
|
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
|
8196c59557
|
Merge branch 'master' into next
|
2018-10-09 22:55:55 +01:00 |
|
toaster
|
b1e02467bf
|
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
|
31343be41b
|
foundrover ffloor_t -> boolean
|
2018-09-19 20:11:30 -04:00 |
|
mazmazz
|
5e1b4272c1
|
Initialize foundrover to NULL (for debug checking)
|
2018-09-19 17:50:05 -04:00 |
|
mazmazz
|
24938473a5
|
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
|
81ad8f0681
|
Merge branch 'master' into le-fadefof
|
2018-09-18 17:11:33 -04:00 |
|
mazmazz
|
2e0e0a3856
|
musicplus-le-changemusic 2.2 -> 2.1 backport
|
2018-09-18 15:28:57 -04:00 |
|
mazmazz
|
c45d523e8f
|
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
|
a036c42973
|
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
|
3cdd904fbc
|
Merge branch 'colormap-overhaul-fade' into le-fadefof
|
2018-09-18 11:05:30 -04:00 |
|
mazmazz
|
899e8ef2a0
|
Merge remote-tracking branch 'origin/master' into le-fadefof
|
2018-09-18 10:52:03 -04:00 |
|
Digiku
|
a32304c9d5
|
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
|
843ed289a6
|
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
|
c5ea6b5efe
|
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
|
2018-09-18 10:22:17 -04:00 |
|
mazmazz
|
6567872229
|
492: Don't interrupt existing polyobj fader unless EFFECT5
|
2018-09-18 07:31:17 -04:00 |
|
mazmazz
|
9778cc2ad5
|
455: A line break
|
2018-09-18 07:30:37 -04:00 |
|
mazmazz
|
56ee711f33
|
455: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
|
2018-09-18 07:30:35 -04:00 |
|
mazmazz
|
64b96c7192
|
455: Don't interrupt current color fading
|
2018-09-18 07:29:21 -04:00 |
|
mazmazz
|
27aa357053
|
453: A line break
|
2018-09-18 07:28:30 -04:00 |
|
mazmazz
|
f5b25c91f5
|
453: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
|
2018-09-18 07:28:28 -04:00 |
|
mazmazz
|
5b16590ba2
|
453: Don't interrupt current FOF fade unless EFFECT5
|
2018-09-18 07:27:47 -04:00 |
|
Digiku
|
6f1a44432b
|
Merge branch 'colormap-overhaul' into 'master'
Colormap code overhaul
See merge request STJr/SRB2Internal!189
|
2018-09-17 11:24:14 -04:00 |
|