MascaraSnake
f8c51ccde3
Implement FOF types 220-222
2020-04-14 10:13:38 +02:00
MascaraSnake
9fc2b5b1b9
Implement FOF type 258
2020-04-14 09:51:48 +02:00
MascaraSnake
32a1131c68
Implement FOF type 251
2020-04-14 09:43:49 +02:00
MascaraSnake
916f831edb
Implement linedef type 250
2020-04-14 09:14:10 +02:00
MascaraSnake
60e589e92a
Implement FOF types 200-201
2020-04-14 09:03:00 +02:00
MascaraSnake
61d903cb5b
Revise setup of solid FOFs
2020-04-14 01:34:11 +02:00
MascaraSnake
77936f6c12
Merge branch 'udmf-colormaps' into udmf-fofs-mkii
2020-03-22 08:06:03 +01:00
MascaraSnake
2133bc89e6
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +01:00
MascaraSnake
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
Louis-Antoine
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
MascaraSnake
6e8760524c
Implement water FOF types
2020-03-20 16:15:39 +01:00
MascaraSnake
1e306dc7b4
Implement linedef type 100-146
2020-03-20 16:08:48 +01:00
MascaraSnake
a9866f84ad
Implemented FOF types 100-105
2020-03-20 16:03:48 +01:00
MascaraSnake
0ecf8616ba
Add sector flag that protects the colormap from being changed
2020-03-20 12:19:02 +01:00
MascaraSnake
7cf9ad2f2b
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
Louis-Antoine
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Nev3r
68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Monster Iestyn
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
Steel Titanium
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
MascaraSnake
cae99654be
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
MascaraSnake
512c6f24a9
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
James R
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
fickleheart
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
MascaraSnake
97c58957ee
Merge branch 'next' into udmf-next
2020-01-24 22:38:26 +01:00
Louis-Antoine
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
Louis-Antoine
2527b6c389
Teleport disconnected players to starpost if they fall in a pit
2020-01-22 03:20:27 +01:00
Jaime Passos
7adc108a2a
typoe
2020-01-17 00:34:31 -03:00
MascaraSnake
b163316cbf
Merge branch 'udmf-next' into stringargs
2020-01-11 16:17:53 +01:00
MascaraSnake
bac379a7a3
Merge branch 'udmf-next' into stringargs
2020-01-11 16:03:38 +01:00
MascaraSnake
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
MascaraSnake
f0d663ea90
Adapt setup of linedef type 443 (Call Lua function) to UDMF
2020-01-11 15:38:50 +01:00
MascaraSnake
ba7a1c0375
Some minor cleanup
2020-01-10 19:56:29 +01:00
toaster
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
fickleheart
c133e645f7
Merge remote-tracking branch 'upstream/next' into next-newcontrols
2020-01-07 23:43:43 -06:00
Nev3r
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
fickleheart
f8a3e3b898
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
MascaraSnake
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
fickleheart
b22de48c03
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart
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
MascaraSnake
c43a83dc04
Remove virtres_t pointer in P_SpawnSpecials that's no longer needed
2019-12-29 12:26:02 +01:00
MascaraSnake
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
MascaraSnake
e9376a8353
Cleaned up some more stuff in P_LoadLevel()
2019-12-28 12:48:32 +01:00
Jaime Passos
89b4a558a8
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
Jaime Passos
61b72203a8
Merge remote-tracking branch 'origin/master' into gametype-clownery
2019-12-23 18:21:13 -03:00
Nev3r
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
James R
64af7badfb
Merge remote-tracking branch 'origin/master' into next
2019-12-22 20:47:15 -08:00
Jaime Passos
e3584e8230
GTR_ALLOWEXIT
2019-12-18 16:52:05 -03:00
Jaime Passos
299f2bd8cd
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
Jaime Passos
ea5e0d28ed
More gametype rules yay!!
2019-12-18 01:54:45 -03:00
