lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9992 commits 1 branch 29 tags 122 MiB
Commit graph

553 commits

Author SHA1 Message Date
Jaime Passos c7d0d7b1c2 Flats as walls textures support, WIP, doesn't support animations yet 2019-11-09 01:36:53 -03:00
Jaime Passos 249cf5c8ad fix invisible planes, fix flat animation 2019-11-08 23:42:15 -03:00
Jaime Passos ae838d4879 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-08 23:01:29 -03:00
lachwright 3734eab7b6 Add signpost camera (and fix a typo whoops) 2019-11-09 00:47:51 +08:00
toaster d8ad0b4eaa STOP THE CLOCK linedef exectutor! 
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.

Also, skip over calling P_DoPlayerExit if the player isn't in game.
 2019-11-08 15:47:12 +00:00
lachwright bd9878eb48 Merge branch 'master' into spinny-sign 2019-11-08 19:59:08 +08:00
James R b157c21a35 There's some whitespace... 2019-11-07 14:56:42 -08:00
lachwright cf39e181bb Display Eggman more frequently during skin roulette 2019-11-05 01:33:09 +08:00
lachwright 5e03d40b33 New end-of-level signpost logic 2019-11-04 16:28:44 +08:00
MascaraSnake 1c1fefe25f Merge branch 'linedef-153' into 'master' 
Dynamic Sinking Platform (for Red Volcano Zone)

See merge request STJr/SRB2Internal!401
 2019-10-25 16:56:19 -04:00
MascaraSnake 46d105dd53 Some basic code hygiene: Remove references to the air bob code being "old" or "outdated" 2019-10-25 22:55:10 +02:00
MascaraSnake 0ef50557c2 Merge branch 'spinbust' into 'master' 
Make spinbust behavior consistent with other bustable blocks

Closes #254

See merge request STJr/SRB2Internal!398
 2019-10-23 02:51:47 -04:00
Nev3r dbd8e563b4 Merge branch 'soundex_tweak' into 'master' 
Tweak Line Special 414's behavior

See merge request STJr/SRB2Internal!382
 2019-10-22 05:31:22 -04:00
James R e15ffd2bc8 Optimize texture/patch/png/flat flat caching 
SIGSEGV in the case where you have a TEXTURES entry, but no texture or flat,
has been fixed.

Missing flats for now yield a HOM instead of REDFLR as well.

OpenGL also doesn't work yet. And I'm too tired for now to bother with it.
 2019-10-20 20:24:03 -07:00
lachwright a2f0f61d75 Merge branch 'master' into linedef-153 2019-10-20 20:20:41 +08:00
MascaraSnake 1604e4d439 Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST 2019-10-19 22:20:48 +02:00
MascaraSnake 2f9a13d5e0 Make shatter blocks intangible to the player, but solid to everything else 2019-10-14 20:15:03 +02:00
Nev3r c935797a34 Encapsulate the second behavior branch into an else. 
When a tag is provided, the tagged sector-related branch is run exclusively now. This prevents playing the same sound again from the caller object's origin and other unwanted behaviors.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-10-14 16:30:20 +02:00
MascaraSnake ad4033ec9e Make shatter blocks solid 2019-10-13 23:08:54 +02:00
lachwright 2daeb81f36 Create new linedef special type 153: Dynamically Sinking Platform 2019-10-12 04:23:11 +08:00
toaster a5704238c7 Resolve #242 by adding SF_TRIGGERSPECIAL_HEADBUMP, enabled by ML_EFFECT2. 
Also, readd SF_INVERTPRECIP, which was done in a random branch last year and then lost because it was never merged. Enabled by ML_EFFECT1.
 2019-10-06 14:34:25 +01:00
Jaime Passos 6553d816ea Merge remote-tracking branch 'origin/master' into flats-png_port 2019-09-09 14:12:28 -03:00
toaster 0392cfc158 Merge branch 'spawnobject-linedef' into 'master' 
Linedef type 461 (Spawn Object)

See merge request STJr/SRB2Internal!304
 2019-09-08 18:58:50 -04:00
Steel Titanium 1bf78a2423
Move mobj_t declaration to top of the block 2019-09-08 17:14:47 -04:00
toaster d26ff197dc * Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) 
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
 2019-09-07 22:12:47 +01:00
Jaime Passos 0cc553be5f Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
Steel Titanium 10ea0f21ae
Fix spawning within random range 2019-08-29 23:56:15 -04:00
Steel Titanium 8655b8f1f1
Add spawn object linedef special. 
Note that spawning a object within a random range does not fully work yet and crashes the game
 2019-08-29 01:57:58 -04:00
Monster Iestyn eacc589ae1 Added quick validity checks for three linedef executor specials that require a player mobj to be the triggerer (432, 434 and 437) 2019-08-20 20:31:28 +01:00
Alam Ed Arias cebc1d46f0 All C files should a newline at the end 2019-08-07 12:39:51 -04:00
toaster 8a0f1e7ed4 Merge branch 'ending' into 'master' 
ENDINGS

See merge request STJr/SRB2Internal!264
 2019-08-03 16:23:51 -04:00
toaster 9f34a7aa82 Merge branch 'bossenable' into 'master' 
Boss enable linedef (type 449)

See merge request STJr/SRB2Internal!272
 2019-08-03 16:23:22 -04:00
toaster 8f729c33d3 Merge branch 'linedef-award-rings' into 'master' 
New award rings linedef executor

See merge request STJr/SRB2Internal!263
 2019-08-03 16:21:58 -04:00
toaster f3baac8577 Fix the minor issues since steel's busy 2019-08-03 08:04:02 -04:00
toaster 105df2395d MI made a good argument for bossdisabled not being conditional on fromnetsave. 2019-08-03 12:09:18 +01:00
toaster 8d56133425 Fix old Special Stage failure sounds not always playing. 2019-08-02 20:02:55 +01:00
toaster 7cb02985f4 * Added boss enable linedef (type 449). 
- Frontside x offset = boss ID (determined via parameter for all bosses)
	- Noclimb flag = disable mode
	- Bosses don't do a fuckin' THING - no state updates, no player searches, no sounds, no lua, no nothin' - and it's all totally netsynced.
	- The only thing they WILL do is flash infinitely if you hurt them, but this is designed for stuff where you're not meant to be in the same room as the boss til it's activated.
	- All bosses of all IDs are automatically enabled on mapload, then if an enable mode version of this linedef is present in the map for a specific boss id, that boss id is automatically disabled.
* Add multi-boss support via parameter for:
	- All bosses' MT_BOSSFLYPOINT search
	- Boss 5's waypoint search
	- Oldbrak's waypoint search (this one's for you, jood)
 2019-07-31 23:17:17 +01:00
toaster 47554b57e4 * Made the evaluation screen even more attractive. 
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
 2019-07-29 14:55:36 +01:00
Steel Titanium 60ffef9830 More simplified code 
Also delay is in tics, per MS' request.
 2019-07-24 21:18:07 -04:00
Steel Titanium 6c2ef839c1 New award rings linedef executor 2019-07-18 22:42:46 -04:00
Jonas Sauer 166f1fac66 Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
 2019-07-13 01:42:03 +02:00
Monster Iestyn dc71e297bb Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well 2019-07-09 21:15:12 +01:00
Monster Iestyn c1bea02f03 Merge branch 'rainfixesmkII' into 'master' 
Accidentially broke rain in the rainfixes branch (oh, the irony!)

See merge request STJr/SRB2Internal!249
 2019-07-09 14:24:14 -04:00
MascaraSnake d3d24bc0bd Removed the "disable" linedef effect, since it's useless now that the character flags are gone 2019-07-08 22:58:31 +02:00
MascaraSnake 5b741d8232 Simplified checks for ML_NETONLY and ML_NONET 2019-07-08 22:56:00 +02:00
toaster a65925aeca Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. 
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
 2019-07-08 13:39:21 +01:00
MascaraSnake a5074a846b Implemented a skin-based linedef executor trigger 2019-07-03 09:19:29 +02:00
MascaraSnake 5cec737985 Remove character-specific flags, replace them with net-only/no-net flags 2019-07-03 00:10:22 +02:00
MascaraSnake e9978b2955 Merge branch 'master' into thinkerlists 
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
 2019-07-02 23:08:37 +02:00
Jaime Passos 28566008b4 Merge remote-tracking branch 'upstream/master' into flats-png 2019-06-25 16:02:35 -03:00
toaster 28a61f2f3c Correct some oversights where drawangle was incorrectly ignored. 2019-06-22 17:07:18 +01:00
Monster Iestyn 149a8bb760 Merge branch 'public_next' 2019-06-21 22:13:39 +01:00
Monster Iestyn 50e8f13c03 Fix FOF slopes briefly glitching on level load in software mode, by ensuring the FOFs' target sectors have hasslope set on creation 2019-06-17 18:46:51 +01:00
Monster Iestyn 0fd3668111 Revert "Merge branch '144-scrolltweaks' into 'master'" 
This reverts merge request !213
 2019-06-04 17:34:59 +00:00
Jaime Passos dbb1575a6d Animations, better flat management. 2019-05-21 15:24:26 -03:00
Jaime Passos 714c997aac Support for patches and textures to be used in place of sector flats 
Still a work in progress.
 2019-05-21 00:28:52 -03:00
mazmazz 89ab777c40 Merge remote-tracking branch 'origin/master' into menu-execs 2019-05-02 18:47:43 -04:00
Nev3r a9110c0645 Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks 
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 16:39:57 +02:00
Nev3r d264d06879 Merge branch 'slopethinkers' into thinkerlists 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 11:47:34 +02:00
Nev3r b60c66325c Added a mobj-only list entry for mobj thinkers 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 23:29:20 +02:00
Nev3r 39ba20be6b Basic multiple thinker list implementation 
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 22:39:22 +02:00
Nev3r 7c17ed0aa6 Things spawning over copied slopes now properly align on the new plane 
While I believe the opposite behavior was intentional at first, it has proven to be problematic and makes alignment a tedious task for copied planes.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 19:03:50 +02:00
Nev3r f7d1515888 Perform dynamic slope thinking before other thinkers. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-18 14:43:34 +02:00
Nev3r 1d401d8481 Merge branch '144-scrolltweaks' into 'master' 
Resolve "Let scrollers and wind/current affect front sector if untagged, and use texture offsets as parameters if different from 0"

Closes #144

See merge request STJr/SRB2Internal!213
 2019-04-05 06:41:11 -04:00
Nev3r fec991dedb Implement displacement-based polyobject rotation. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-05 11:50:59 +02:00
Nev3r aa43f8b3bf Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks 2019-03-16 08:14:29 +01:00
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
Nev3r ae9f8856ac Override vectorial magnitude with front X offset, if provided; takes the line's lengths into account otherwise, as usual. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-03-13 12:24:47 +01:00
Nev3r cd3ea897c3 Dealt with no-tag business: 
* Wind/current pushers affect front sector if left untagged.
* Plane scrollers affect front sector if left untagged.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-03-13 11:13:54 +01: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 dcac157ccd Merge remote-tracking branch 'origin/master' into menu-execs 2018-11-20 18:31:30 -05:00
mazmazz f3be97a95a Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too 2018-11-18 02:41:35 -05: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
mazmazz 1321ab9d92 453: Extra parameter for Add_ColormapFader 2018-09-15 20:40:17 -04:00
mazmazz 809646e7fe 453: Try ResetFakeFloorFader if condition again 2018-09-15 02:24:44 -04:00
mazmazz a85953a903 453: P_ResetFakeFloorFader stray & address if condition 2018-09-15 02:16:54 -04:00
mazmazz 5585edf459 453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor 2018-09-15 01:05:21 -04:00
mazmazz ca4a94eca5 492: Mixed D+C fix 2018-09-15 00:56:46 -04:00
mazmazz 1db8aee539 455: Mixed D+C fix 2018-09-15 00:53:21 -04:00
mazmazz e8a5735f75 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-14 08:42:02 -04:00
mazmazz 761150b12d 455: Fog flag fix for fading 2018-09-13 12:18:10 -04:00
mazmazz 3fc8ed5a9f 455: Set timing by either Back Y or Front Y, but not line length 2018-09-13 10:53:03 -04:00
mazmazz 94939f6613 455: Don't override fadergba on default/no colormap init (~BOUNCY) 2018-09-13 10:43:41 -04:00
mazmazz 5aa66f8872 455: Add speed increment timing (~EFFECT4) to FadeColormap 2018-09-13 10:43:32 -04:00
mazmazz 539092bec5 491, 492: Allow BLOCKMONSTERS raw translucency value in floorheight 2018-09-13 00:26:49 -04:00
mazmazz 4ab3a986f3 492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes 
* 490: Set proper render flags according to spawnflags
* 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* 492:
    * Tic-based (EFFECT4) and speed timing
    * Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
    * Set proper render flags according to spawnflags
    * Fix OpenGL >= NUMTRANSMAPS render bug
 2018-09-13 00:06:11 -04:00
mazmazz 2f9e014aab 490 PolyVisible: Set proper spawn render flags instead of RENDERALL 2018-09-13 00:06:06 -04:00
mazmazz 63a3125df2 420: A parenthesis 2018-09-12 21:49:03 -04:00
mazmazz 46067f0579 Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased 2018-09-12 21:35:46 -04:00
mazmazz 41fe080a68 420: Allow Back Y Offset for timing parameter 2018-09-12 21:32:12 -04:00
mazmazz 05c91f1f81 455: Change to side->colormap_data 2018-09-12 20:52:05 -04:00
mazmazz 17a78ba674 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-12 20:47:00 -04:00
mazmazz 1fcfa7fcf1 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 20:46:02 -04:00
mazmazz f7ff440250 Add colormap_data to side_t and store colormaps there on setup 2018-09-12 20:43:48 -04:00
mazmazz ad9ef5d593 Merge errors 2018-09-12 17:39:30 -04:00
mazmazz c58e9b0bae Merge remote-tracking branch 'origin/master' into colormap-overhaul 2018-09-12 17:28:22 -04:00
mazmazz 9fb9b44383 Fade FOF colormap support 2018-09-12 16:59:35 -04:00
mazmazz 42f1f0acdb P_ResetFakeFloorFader: Argument order error with dolighting 2018-09-12 12:40:56 -04:00
mazmazz d2f636d5a2 T_FadeColormap: Fade subtraction error 2018-09-12 11:33:44 -04:00
mazmazz 51a2982226 455: TFERLINE - Set target sector's colormap first to control backsector's colormap 2018-09-12 11:21:49 -04:00
mazmazz d85019b4e4 More NULL failsafes 2018-09-12 11:11:22 -04:00
mazmazz 8190433b71 456: Missing break 2018-09-12 09:42:51 -04:00
mazmazz 4d9925e8cf 447: ResetColormapFader when changing colormap explicitly 2018-09-12 09:09:10 -04:00