cbe181c66d
Merge branch 'angle-for-spawn-object' into 'next'
...
Make the Spawn Object linedef executor able to set the object's angle.
See merge request STJr/SRB2!877
2020-04-18 20:16:07 -04:00
09506112d7
Add enums to encapsulate the textmap colormap settings
2020-04-18 17:15:25 +02:00
c031008eab
Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage
2020-04-18 15:17:25 +02:00
ffc161e2aa
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/p_spec.c
2020-04-18 14:04:15 +02:00
2b2a18fdf1
Merge branch 'udmf-colormaps' into 'udmf-next'
...
UDMF colormaps
See merge request STJr/SRB2!855
2020-04-18 07:42:24 -04:00
54cbd66999
Eradicate levelspecthink_t
2020-04-18 11:05:58 +02:00
08f1e03e79
Refactor T_ThwompSector
2020-04-18 10:26:03 +02:00
29d33f0a93
Refactor T_NoEnemiesSector
2020-04-18 09:21:04 +02:00
cc0f686c95
Refactor T_FloatSector
2020-04-18 00:26:49 +02:00
aa0d76f8fa
Delete tags.
2020-04-18 00:23:24 +02:00
e87ad0fb38
Delete old taglists.
2020-04-18 00:05:55 +02:00
fd598f315e
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
9eb17e4104
Remove P_ChangeSectorTag().
2020-04-17 23:30:07 +02:00
9b27d004e3
Remove the spike thinker, which hasn't been necessary for a while now
2020-04-17 22:54:35 +02:00
7904856e8e
Remove presumably the remaining old tag references in the gamelogic.
2020-04-17 22:28:41 +02:00
099ad6cf20
Remove sec assignments that have become superfluous
2020-04-17 21:39:38 +02:00
b5eaad42fc
Carry over a considerable case regarding accessing the old tag vars.
2020-04-17 18:15:25 +02:00
89539512f6
Make T_EachTimeThinker use its own struct
2020-04-17 14:00:48 +02:00
b690d35a99
Move the global taglist init functionality to the taglist files.
2020-04-17 12:52:44 +02:00
3e0a9c8718
Forgot to clean up some stuff
2020-04-17 11:13:13 +02:00
63a901b714
-Remove superfluous variables from raise_t
...
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
2020-04-17 11:11:36 +02:00
a5bc3fb507
P_SpawnSpecials() line special spawn sequence now uses the taglist, until we move on to using args[0].
2020-04-17 10:52:12 +02:00
d0c473c9ae
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 09:58:53 +02:00
95c7690a40
Remove P_FindSpecialLineFromTag()
2020-04-15 10:16:49 +02:00
439fde3434
Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result.
2020-04-14 23:59:22 +02:00
d518703334
Replaces P_FindSectorFromTag() occurrences with its corresponding macro and vanishes it from existence.
2020-04-14 23:33:56 +02:00
25102ab4af
Remove P_FindSectorFromLineTag()
2020-04-14 22:22:48 +02:00
35f539e398
Merge branch 'udmf-next' into udmf-multitag
2020-04-14 22:21:32 +02:00
d40713d08b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-04-14 22:20:54 +02:00
24baf5bea0
Replace P_FindSectorFromLineTag() with its corresponding macro for most cases.
2020-04-14 22:19:18 +02:00
464ecc01a4
Merge branch 't_moveplane-refactor' into 'next'
...
Remove faulty code from T_MovePlane()
See merge request STJr/SRB2!876
2020-04-14 05:53:59 -04:00
778ef86fee
Remove the bridge thinker code.
2020-04-14 10:31:07 +02:00
01b28b66a6
Make linedef type 461 able to set object angle, using the line's angle.
2020-04-13 17:10:25 +02:00
74bd23c275
Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose.
2020-04-13 15:17:53 +02:00
909268d175
Replace P_FindLineFromLineTag() instances with macros and remove its code.
2020-04-13 13:10:38 +02:00
de07c04f5c
Make the macros and their usage relatively cleaner.
2020-04-13 13:09:58 +02:00
0d1f898869
Added disabled test code in P_FindSectorFromTag().
2020-04-13 13:09:04 +02:00
499c884501
Add multitag support to FOF spawners.
2020-04-12 18:52:47 +02:00
07b4d0ee3d
Add lookup tag tables construction.
2020-04-12 15:16:04 +02:00
ab2619d538
Wrap P_FindSectorFromLineTag() is now a wrapper for P_FindSectorFromTag().
2020-04-12 13:04:15 +02:00
4128f826b7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
b8d40a5783
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
92c74814cf
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
2020-03-25 08:34:52 +01:00
6f9422d380
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
2133bc89e6
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +01:00
1580e14cbc
Merge branch 'next' into udmf-next
...
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
2020-03-21 20:04:31 +01:00
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
0ecf8616ba
Add sector flag that protects the colormap from being changed
2020-03-20 12:19:02 +01:00
7cf9ad2f2b
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
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
James R