d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
8ddfdf2d0f
Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode
2019-12-05 12:36:25 +08:00
92f8c002f3
Prevent exit sectors having any effect whatsoever outside of platform gametypes ( resolve #396 ).
2019-11-29 19:11:17 +00:00
ccbb122143
Holy shit
2019-11-28 12:10:57 -08:00
1b360d2cd8
Fix the "play from nowhere as long as you're in the tagged areas" behavior in the Play Sound line executor.
2019-11-25 20:30:06 +01:00
abf0c5e632
resolve #315
2019-11-20 14:34:19 +00:00
cde56dbe6c
WIP fix signpost issues with exitmove
2019-11-20 21:02:34 +08:00
86f343b84b
Make the All Players linedef exectutor activator sector type more reliable for FOFs that span multiple sectors ( resolves #301 ).
2019-11-19 14:09:24 +00:00
29501a992b
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
ff62a0732a
Let players move after completing the level
...
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
14477748be
Merge branch 'stopclock' into 'master'
...
Stop the clock!
See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
408288255f
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-11-11 14:10:37 -03:00
4e6513b583
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-11 14:05:03 -03:00
615547ddd1
Fix animated flats yet again
2019-11-09 19:32:06 -03:00
78a0048ee4
Support animations
2019-11-09 13:23:38 -03:00
773f2efdd9
minor fixes
2019-11-09 01:45:00 -03:00
c7d0d7b1c2
Flats as walls textures support, WIP, doesn't support animations yet
2019-11-09 01:36:53 -03:00
249cf5c8ad
fix invisible planes, fix flat animation
2019-11-08 23:42:15 -03:00
ae838d4879
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-08 23:01:29 -03:00
3734eab7b6
Add signpost camera (and fix a typo whoops)
2019-11-09 00:47:51 +08:00
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
bd9878eb48
Merge branch 'master' into spinny-sign
2019-11-08 19:59:08 +08:00
b157c21a35
There's some whitespace...
2019-11-07 14:56:42 -08:00
cf39e181bb
Display Eggman more frequently during skin roulette
2019-11-05 01:33:09 +08:00
5e03d40b33
New end-of-level signpost logic
2019-11-04 16:28:44 +08:00
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
46d105dd53
Some basic code hygiene: Remove references to the air bob code being "old" or "outdated"
2019-10-25 22:55:10 +02:00
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
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
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
a2f0f61d75
Merge branch 'master' into linedef-153
2019-10-20 20:20:41 +08:00
1604e4d439
Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST
2019-10-19 22:20:48 +02:00
2f9a13d5e0
Make shatter blocks intangible to the player, but solid to everything else
2019-10-14 20:15:03 +02:00
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
ad4033ec9e
Make shatter blocks solid
2019-10-13 23:08:54 +02:00
2daeb81f36
Create new linedef special type 153: Dynamically Sinking Platform
2019-10-12 04:23:11 +08:00
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
6553d816ea
Merge remote-tracking branch 'origin/master' into flats-png_port
2019-09-09 14:12:28 -03:00
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
1bf78a2423
Move mobj_t declaration to top of the block
2019-09-08 17:14:47 -04:00
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
0cc553be5f
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
10ea0f21ae
Fix spawning within random range
2019-08-29 23:56:15 -04:00
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
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
cebc1d46f0
All C files should a newline at the end
2019-08-07 12:39:51 -04:00
8a0f1e7ed4
Merge branch 'ending' into 'master'
...
ENDINGS
See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
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
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
f3baac8577
Fix the minor issues since steel's busy
2019-08-03 08:04:02 -04:00
105df2395d
MI made a good argument for bossdisabled not being conditional on fromnetsave.
2019-08-03 12:09:18 +01:00
8d56133425
Fix old Special Stage failure sounds not always playing.
2019-08-02 20:02:55 +01:00
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
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
60ffef9830
More simplified code
...
Also delay is in tics, per MS' request.
2019-07-24 21:18:07 -04:00
6c2ef839c1
New award rings linedef executor
2019-07-18 22:42:46 -04:00
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
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
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
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
5b741d8232
Simplified checks for ML_NETONLY and ML_NONET
2019-07-08 22:56:00 +02:00
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
a5074a846b
Implemented a skin-based linedef executor trigger
2019-07-03 09:19:29 +02:00
5cec737985
Remove character-specific flags, replace them with net-only/no-net flags
2019-07-03 00:10:22 +02:00
e9978b2955
Merge branch 'master' into thinkerlists
...
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
2019-07-02 23:08:37 +02:00
28566008b4
Merge remote-tracking branch 'upstream/master' into flats-png
2019-06-25 16:02:35 -03:00
28a61f2f3c
Correct some oversights where drawangle was incorrectly ignored.
2019-06-22 17:07:18 +01:00
149a8bb760
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
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
0fd3668111
Revert "Merge branch '144-scrolltweaks' into 'master'"
...
This reverts merge request !213
2019-06-04 17:34:59 +00:00
dbb1575a6d
Animations, better flat management.
2019-05-21 15:24:26 -03:00
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
89ab777c40
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
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
d264d06879
Merge branch 'slopethinkers' into thinkerlists
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 11:47:34 +02:00
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
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
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
f7d1515888
Perform dynamic slope thinking before other thinkers.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-18 14:43:34 +02:00
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
fec991dedb
Implement displacement-based polyobject rotation.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 11:50:59 +02:00
aa43f8b3bf
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks
2019-03-16 08:14:29 +01:00
9ec98c588f
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
2c75d4da69
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
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
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
9effa134d2
resolve the conflict in p_spec.c
2019-01-07 17:02:05 +00:00
1aacfee80c
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
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
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
cb53bc8afe
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
2018-11-27 23:05:33 +00:00
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
6f5e3d42ff
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
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
0487558a98
Add missing tweaks
...
Also remove a test printf.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 17:58:45 +01:00
dcac157ccd
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -05:00
f3be97a95a
Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too
2018-11-18 02:41:35 -05:00
cf834f3503
Line 457: Calculate input angle tolerance correctly
2018-11-14 10:13:39 -05:00
6c69dd1f78
Merge branch 'master' into text-prompts
2018-11-13 11:12:44 -05:00
75c4a96e69
NextTag implementation
...
* Adjust named tag implementation to be more portable
* Next page adjustments
2018-11-13 00:13:36 -05:00
7deeb8bac4
Stub netgame support; ignore bots on linedef special
2018-11-10 15:34:56 -05:00
e1e94c3af2
Added page tags and find page by tag
...
* Added tutorial mode defines to this branch
2018-11-10 09:32:53 -05:00
311cb27818
Close text prompt upon level load
2018-11-04 22:32:47 -05:00
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
1ca8fca602
Changed Line 449 post exec tag to line tag
2018-11-04 22:32:46 -05:00
57d9e0aef6
TextPrompt: Implement player blocked controls and post-close run line
2018-11-04 22:32:46 -05:00
5f1052729c
Line 449 param rearranging
2018-11-04 22:32:46 -05:00
7778507a70
Basic TextPrompt line action implemented
2018-11-04 22:32:45 -05:00
63e5cfecff
Linedef Exec 449 Control Text Prompt - beginnings
2018-11-04 22:32:45 -05:00
4fc335a26b
Line 458: Only do disable operation if MFE_TRACERANGLE is set
2018-11-04 16:48:18 -05:00
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
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
8196c59557
Merge branch 'master' into next
2018-10-09 22:55:55 +01:00
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
31343be41b
foundrover ffloor_t -> boolean
2018-09-19 20:11:30 -04:00
5e1b4272c1
Initialize foundrover to NULL (for debug checking)
2018-09-19 17:50:05 -04:00
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
81ad8f0681
Merge branch 'master' into le-fadefof
2018-09-18 17:11:33 -04:00
2e0e0a3856
musicplus-le-changemusic 2.2 -> 2.1 backport
2018-09-18 15:28:57 -04:00
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
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
3cdd904fbc
Merge branch 'colormap-overhaul-fade' into le-fadefof
2018-09-18 11:05:30 -04:00
899e8ef2a0
Merge remote-tracking branch 'origin/master' into le-fadefof
2018-09-18 10:52:03 -04:00
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
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
c5ea6b5efe
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
6567872229
492: Don't interrupt existing polyobj fader unless EFFECT5
2018-09-18 07:31:17 -04:00
9778cc2ad5
455: A line break
2018-09-18 07:30:37 -04:00
56ee711f33
455: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
2018-09-18 07:30:35 -04:00
64b96c7192
455: Don't interrupt current color fading
2018-09-18 07:29:21 -04:00
27aa357053
453: A line break
2018-09-18 07:28:30 -04:00
f5b25c91f5
453: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
2018-09-18 07:28:28 -04:00
5b16590ba2
453: Don't interrupt current FOF fade unless EFFECT5
2018-09-18 07:27:47 -04:00
6f1a44432b
Merge branch 'colormap-overhaul' into 'master'
...
Colormap code overhaul
See merge request STJr/SRB2Internal!189
2018-09-17 11:24:14 -04:00
1321ab9d92
453: Extra parameter for Add_ColormapFader
2018-09-15 20:40:17 -04:00
809646e7fe
453: Try ResetFakeFloorFader if condition again
2018-09-15 02:24:44 -04:00
a85953a903
453: P_ResetFakeFloorFader stray & address if condition
2018-09-15 02:16:54 -04:00
5585edf459
453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor
2018-09-15 01:05:21 -04:00
ca4a94eca5
492: Mixed D+C fix
2018-09-15 00:56:46 -04:00
1db8aee539
455: Mixed D+C fix
2018-09-15 00:53:21 -04:00
e8a5735f75
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-14 08:42:02 -04:00
761150b12d
455: Fog flag fix for fading
2018-09-13 12:18:10 -04:00
3fc8ed5a9f
455: Set timing by either Back Y or Front Y, but not line length
2018-09-13 10:53:03 -04:00
94939f6613
455: Don't override fadergba on default/no colormap init (~BOUNCY)
2018-09-13 10:43:41 -04:00
5aa66f8872
455: Add speed increment timing (~EFFECT4) to FadeColormap
2018-09-13 10:43:32 -04:00
539092bec5
491, 492: Allow BLOCKMONSTERS raw translucency value in floorheight
2018-09-13 00:26:49 -04:00
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
2f9e014aab
490 PolyVisible: Set proper spawn render flags instead of RENDERALL
2018-09-13 00:06:06 -04:00
63a3125df2
420: A parenthesis
2018-09-12 21:49:03 -04:00
46067f0579
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
2018-09-12 21:35:46 -04:00
41fe080a68
420: Allow Back Y Offset for timing parameter
2018-09-12 21:32:12 -04:00
05c91f1f81
455: Change to side->colormap_data
2018-09-12 20:52:05 -04:00
17a78ba674
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 20:47:00 -04:00
1fcfa7fcf1
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 20:46:02 -04:00
f7ff440250
Add colormap_data to side_t and store colormaps there on setup
2018-09-12 20:43:48 -04:00
ad9ef5d593
Merge errors
2018-09-12 17:39:30 -04:00
c58e9b0bae
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
9fb9b44383
Fade FOF colormap support
2018-09-12 16:59:35 -04:00
42f1f0acdb
P_ResetFakeFloorFader: Argument order error with dolighting
2018-09-12 12:40:56 -04:00
d2f636d5a2
T_FadeColormap: Fade subtraction error
2018-09-12 11:33:44 -04:00
51a2982226
455: TFERLINE - Set target sector's colormap first to control backsector's colormap
2018-09-12 11:21:49 -04:00
d85019b4e4
More NULL failsafes
2018-09-12 11:11:22 -04:00
8190433b71
456: Missing break
2018-09-12 09:42:51 -04:00
4d9925e8cf
447: ResetColormapFader when changing colormap explicitly
2018-09-12 09:09:10 -04:00
c4079dfca9
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 09:07:55 -04:00
14b71bdbc5
Fade colormap special 455! And stop fade colormap 456
...
* Added T_FadeColormap thinker and netsync
* Added sector_t fadecolormapdata property
2018-09-12 09:06:38 -04:00
cb2ac9b4d3
Formatting
2018-09-12 08:06:44 -04:00
4d26cf6330
447: Allow relative calc from backside colormap (ML_TFERLINE)
2018-09-12 07:55:47 -04:00
6f0b28c48f
447: Allow alternate alpha without relative calc
2018-09-12 07:38:51 -04:00
9a388af8ec
447: AddColormap no longer returns chained colormap, so chain it ourselves
2018-09-12 07:31:10 -04:00
6059b8edc9
447: Extra params for R_AddColormaps
2018-09-12 07:06:58 -04:00
54669a6cc8
Use R_AddColormaps method in 447 relative calc
2018-09-11 21:03:13 -04:00
a1a05c9972
Add relative color change to 447
2018-09-11 19:11:50 -04:00
b9e4cd40ca
Use RGB/RGBA macros in 447 code
2018-09-11 17:32:43 -04:00
5523fc3a8d
Account for NULL colormaps in alpha-only code 447
2018-09-11 17:07:50 -04:00
bb6cf6a807
Added alpha-only, relative calc, and offset params to 447 Change Colormap
2018-09-11 16:50:35 -04:00
9a52816cb4
Use percentage calc instead of interval decrement for tic-based fading
2018-09-11 10:28:24 -04:00
c468451a63
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-11 10:08:13 -04:00
75267dfa2c
Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef
2018-09-10 21:06:28 -04:00
7e9297d06e
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 16:50:27 -04:00
e0d8a6eec0
Get rid of bottommap, midmap, topmap
2018-09-10 16:16:04 -04:00
88d9da79e6
Move tic-based to EFFECT4
2018-09-10 12:00:44 -04:00
acea0bfd68
Move tic-based to EFFECT4, relative calc to EFFECT3
2018-09-10 12:00:15 -04:00
148e3ff538
Use ML_NOCLIMB for FF_TRANSLUCENT handling in type 452
2018-09-10 10:17:39 -04:00
8e75fe50db
Default to using back offset params if back linedef exists; else fallback to distance-based params
2018-09-10 10:11:27 -04:00
da5a7a013d
Add type 452 Set FOF Alpha
...
* Fade FOF moved to type 453
* Stop Fade FOF moved to type 454
2018-09-10 10:09:02 -04:00
02a94dc941
Add distance-based params and make default (ML_DONTPEGBOTTOM to use back offsets)
2018-09-10 09:49:52 -04:00
b8da218b61
Add relative destvalue calc (ML_EFFECT4)
...
* rover->alpha init fixes with invisible FOFs
2018-09-10 09:49:00 -04:00
002f1bad8f
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 09:01:09 -04:00
5136293f62
Store sectornum/ffloornum as UINT32, not INT32
2018-09-09 23:52:36 -04:00
9cc186441b
Fix fog visual glitch with fading
2018-09-09 22:14:24 -04:00
573e1d0017
Replace firsttic with timer increment
2018-09-09 21:01:00 -04:00
0202bbcfd3
Replace firsttic with timer increment
2018-09-09 20:45:12 -04:00
ea2276eb07
Fix tic-based bug returning early
2018-09-09 19:57:41 -04:00
43ae628adc
Cap lightlevel fading at spawn_lightlevel (don't make darker)
2018-09-09 19:44:35 -04:00
c3c4a251f1
Added tic-based logic to FOF fade (ML_EFFECT5)
2018-09-09 19:31:32 -04:00
80a4a03f8e
Finalize light level on fade finish (not forced stop)
...
* Added destlightlevel property to fade_t
* Fixed dotranslucent, dolighting, docollision order weirdness in function calls
2018-09-09 17:20:35 -04:00
368f96e605
Fade FOF lighting fixes; properly calculate destlightvalue
2018-09-09 15:41:30 -04:00
ca58fba24a
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-09 13:44:30 -04:00
aeb45132c5
Revert "Snap light level to software values (32 levels)"
...
This reverts commit cc26d03c93
2018-09-09 13:43:00 -04:00
675f69afea
Flag re-organization
...
* Change alternate param flag from BLOCKMONSTERS to DONTPEGBOTTOM
* Change tic-based flag from NOCLIMB to EFFECT5
2018-09-09 09:34:36 -04:00
032f95803d
Merge branch 'master' into change-colormap-ldef
2018-09-09 08:40:38 -04:00
5032f783d7
Don't add a thinker if alpha is already equal
2018-09-09 08:10:45 -04:00
3f4656e57e
Polyobject Fade logic
2018-09-09 08:08:48 -04:00
0049f904c0
Add light fading to FadeFakeFloor
...
* Declare P_RemoveLighting in header for p_spec.c use
2018-09-08 23:44:29 -04:00
4ca38dc8a1
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-08 23:03:18 -04:00
cc26d03c93
Snap light level to software values (32 levels)
...
* New properties `exactlightlevel` and `lightlevel` in `lightlevel_t`
2018-09-08 23:01:35 -04:00
1e1b01c157
Implemented tic-based light fading
...
* ML_BLOCKMONSTERS specifies destvalue and speed by texture offsets
* ML_NOCLIMB toggles tic-based logic
* Added props `duration`, `interval`, and `firsttic` to `lightlevel_t`
2018-09-08 22:10:51 -04:00
81acf82e99
Re-render lighting when setting FF_EXISTS
2018-09-08 20:49:32 -04:00
069cc480c1
Add dolighting flag to FadeFakeFloor thinker
2018-09-08 20:41:45 -04:00
3eb7c3931e
When detecting invisible FOFs, don't include light blocks
2018-09-08 20:08:48 -04:00
3858a93cfa
Initialize invisible FOF alpha to 1 on first fade
2018-09-08 09:31:23 -04:00
fa0918c2f1
Handle rendering flags for invisible FOFs
2018-09-08 09:08:32 -04:00
fcc7180d5c
Enable FF_CUTSOLIDS handling and updating by sector->moved
2018-09-08 08:59:17 -04:00
47c9bf2ebc
Disable FadeFakeFloor for laser block
2018-09-08 01:33:12 -04:00
dc964738eb
Never handle FF_EXISTS if FF_BUSTUP
2018-09-08 01:23:15 -04:00
66dc84509a
Fix Mario block triggering during ghost fade
2018-09-08 01:12:34 -04:00
0b365d0d08
Initial polyobj fade skeleton
2018-09-07 15:27:18 -04:00
4147773d0c
Merge branch 'master' into le-fadefof
2018-09-06 18:12:24 -04:00
2b0ce807c7
Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround
2018-09-04 17:04:24 +01:00
6d97a10273
Merge remote-tracking branch 'origin/master' into nightsplus-le
2018-08-29 11:06:00 -04:00
4b07246565
Add "finalize" flag to Type 453 Stop Fade
2018-08-18 06:04:11 -04:00
773d8bdb8d
P_ResetFakeFloorFader: Unclamp rover->alpha from software levels
2018-08-18 05:31:41 -04:00
d94608fa10
Add alpha clamping so OpenGL conforms to Software's translucent levels
2018-08-17 17:07:07 -04:00
bf5efe6457
Cleanup fade fake floor code
2018-08-17 15:59:34 -04:00
45ae6efbad
Refactor function and variable names; change defaults for fake floor fader line flags
2018-08-17 15:25:25 -04:00
020b18b84b
Revised and re-organized P_DoFakeFloorAlpha fading procedure
...
* dosolid routine now refers to spawnflags
2018-08-17 14:49:33 -04:00
677f19ede6
Move fading thinker to ffloor_t.fadingdata
2018-08-17 02:28:52 -04:00
2e252cb905
Move fadingdata (fade_t thinker) to line_t
2018-08-17 01:11:04 -04:00
931297e2d7
Rename dofadeinonly to doghostfade
...
* Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished
2018-08-16 22:27:26 -04:00
61c84be704
Fix bonus time quirk where lines are run if player->marebonuslap is 0
...
* Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.
2018-08-14 16:08:21 -04:00
c3703cfc24
Comments
2018-08-14 14:57:58 -04:00
3f312ce114
Make Bonus Time Start executor into a general Egg Capsule Touch executor
...
* Entrance/exit flags
* Enough/not-enough-rings flags (with "doesn't matter" line option)
2018-08-14 12:00:37 -04:00
1cb68a615e
Make LE Ring triggers accept spheres for NiGHTS levels
2018-08-14 11:10:10 -04:00
62a6fe845d
Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres
2018-08-14 10:48:50 -04:00
004cbe6a3d
Whitespace
2018-08-13 22:10:16 -04:00
8d0a44899a
Merge branch 'master' into change-colormap-ldef
2018-08-10 20:05:04 +01:00
b8eb282367
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof-remove-storedthinker
2018-08-10 15:03:07 -04:00
d97c25f6dd
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le
...
# Conflicts:
# src/p_setup.c
# src/p_user.c
2018-08-10 13:44:47 -04:00
89478a7ba4
Added linedef 447 as the change colormap linedef exec special.
...
IMPORTANT NOTE: UNTESTED
2018-06-14 21:51:21 +01:00
1242180667
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again
2018-06-09 19:36:48 +01:00
14d49b8bf1
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/d_netfil.c
# src/p_setup.c
2018-06-09 19:35:36 +01:00
3725203bcd
Bit of a random one today, but the branch approaches completion...
...
* Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL.
* Blueberry bushes, both normal and Xmas, from patch.dta.
* BSZ tulips, also from patch.dta!
* Frozen Hillside badniks - Penguinator and Pophat.
* Frozen Hillside ice decoration!
* Fixed some big bugs with the DSZ light beams.
* Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c
* Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels.
* State optimisation.
* Serious cruft-removal of the NiGHTS drone thinker.
* Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs.
* Tweak NiGHTS player flashing.
* Add text colour support to the titlecard font.
* Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability.
* Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time.
* Fix that thing where flying mid-spin didn't enact autobrake.
* Modify graymap a little on Sryder's suggestion.
* [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 17:22:28 +01:00
6e07631cc9
MONSTER COMMIT.
...
OLD SPECIAL STAGES:
* Spheres in old special stages instead of rings!
* Individual timers in old special stages instead of a global one!
* Old special stages use a variant of the NiGHTS HUD now!
* Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres!
* All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore.
* Made emerald gaining function be based on special stage number rather than gained emeralds!
* Consistency with...
NiGHTS SPECIAL STAGES:
* Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif
* Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.)
SPECIAL STAGES IN GENERAL:
* useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS.
* CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif
* SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif
NiGHTS NON-SPECIAL STAGES:
* Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages.
* Colour Chips turn yellow in bonus time.
* Ideya!
* Its own "drowning" music!
* All of the object types for Dream Hill.
* GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif
RANDOM BS:
* Turn super with the spin button instead of the jump button!
* Followmobj now correctly set with P_SetTarget instead of pointer assignment.
* Emerald hunt uses new sprites!
* Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 22:41:54 +01:00
f061ffa00e
Stop Each Time trigger linedefs and object-carrying scrollers from doing anything with FOFs without FF_EXISTS
2018-05-21 20:02:30 +01:00
2e8cb9582a
Consistency: Pointer declarations next to the variable name instead of the type
2018-05-15 09:39:52 +02:00
975a318460
Change to linedef type 7 (flat alignment): If no tag is given, affect front sector.
2018-05-14 19:34:22 +02:00
f903d01bc1
Add ML_DONPTEGTOP flag to Nights LE
...
* Nightserize: Run only if player is already NiGHTS
* DeNightserize: Run only if >0 players are NiGHTS
2018-04-07 07:33:07 -04:00
Steel Titanium
