68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
f4cb6e1f5e
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
26e367eb9b
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
7d77600e71
Make exitmove friendly, don't start empty intermission screens
2020-02-29 01:51:45 -03:00
4e7b47440f
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
d3ed5ad44f
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
80edefa56e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
2893803c68
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
cae99654be
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
512c6f24a9
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
5a524f21da
Merge branch 'starpost-config-additions' into 'next'
...
Starpost config additions
See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
332b22a87a
Move spawnsnap to Special/ignore on sector trigger
...
Also includes splitting the starpost logic into its own function.
2020-01-24 23:54:54 -06:00
97c58957ee
Merge branch 'next' into udmf-next
2020-01-24 22:38:26 +01:00
f209721ded
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2020-01-22 03:57:22 +01:00
2527b6c389
Teleport disconnected players to starpost if they fall in a pit
2020-01-22 03:20:27 +01:00
f4a976f3be
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-20 16:53:41 -03:00
7adc108a2a
typoe
2020-01-17 00:34:31 -03:00
7b3cc02ddc
Range check
2020-01-11 21:38:10 -03:00
5d33ca42cf
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
b163316cbf
Merge branch 'udmf-next' into stringargs
2020-01-11 16:17:53 +01:00
bac379a7a3
Merge branch 'udmf-next' into stringargs
2020-01-11 16:03:38 +01:00
661c44b260
Merge branch 'udmf-vslopes' into 'next'
...
Add textmap vertex slope support
See merge request STJr/SRB2!633
2020-01-11 10:02:51 -05:00
f0d663ea90
Adapt setup of linedef type 443 (Call Lua function) to UDMF
2020-01-11 15:38:50 +01:00
ba7a1c0375
Some minor cleanup
2020-01-10 19:56:29 +01:00
c1acdfe52e
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-10 04:11:26 -03:00
004cfb45aa
Allow Rollout Rocks that are being ridden to:
...
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.
This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).
Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
2020-01-08 22:36:29 +00:00
c133e645f7
Merge remote-tracking branch 'upstream/next' into next-newcontrols
2020-01-07 23:43:43 -06:00
5a2ad5c2f3
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-07 16:10:25 -03:00
f85476c723
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
91222f7527
Adapt P_ClosestPointOnLine3D() to be much like FV3_ClosestPointOnLine() and use vector3_t's as args, save for the hypotenuse calculation, which remains the same; the output should be the same as before.
...
Adapt the rope hang snapping to the new function's form.
2020-01-04 18:28:25 +01:00
f8a3e3b898
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
4f26a8e73a
Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it
2020-01-01 16:01:07 +01:00
b22de48c03
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
c3d14064e2
Convert simple movement to directionchar+analog
...
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
2019-12-30 15:05:24 -06:00
c43a83dc04
Remove virtres_t pointer in P_SpawnSpecials that's no longer needed
2019-12-29 12:26:02 +01:00
abdfe60aa7
Store custom FOF flags directly in back toptexture field at map load instead of re-reading the sidedefs data later on
2019-12-29 12:01:41 +01:00
e9376a8353
Cleaned up some more stuff in P_LoadLevel()
2019-12-28 12:48:32 +01:00
89b4a558a8
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
61b72203a8
Merge remote-tracking branch 'origin/master' into gametype-clownery
2019-12-23 18:21:13 -03:00
bb54597552
Remove redundant netarchive-related sector vars as they're not used anymore.
...
Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 12:42:38 +01:00
64af7badfb
Merge remote-tracking branch 'origin/master' into next
2019-12-22 20:47:15 -08:00
e3584e8230
GTR_ALLOWEXIT
2019-12-18 16:52:05 -03:00
299f2bd8cd
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
ea5e0d28ed
More gametype rules yay!!
2019-12-18 01:54:45 -03:00
0652ffd67f
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-12-11 21:53:47 -03:00
222336ac0b
Oversight, do not free the data yet vres_Free() does it already at the end.
2019-12-11 15:16:56 +01:00
14ad3b938e
Use virtres in P_SpawnSpecials(). Whether accessing the lump again here is right or not is also a different question.
2019-12-11 14:04:09 +01:00
a3549cc8f2
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
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
Nev3r