Monster Iestyn
f186def0bf
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
Jaime Passos
81a57d5fac
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
James R
18aa2972e5
Merge remote-tracking branch 'origin/master' into parties-only
2020-03-05 21:41:23 -08:00
Sal
b13ebd6d15
Merge branch 'special-sector-tweak' into 'master'
...
Fix step-up on stairs for other objects (Orbinaut VS Toxic Palace Stairs)
See merge request KartKrew/Kart!201
2020-03-06 00:10:35 -05:00
Sal
10fe9434f6
Merge branch 'blizzard' into 'master'
...
Weather system refactor, Blizzard weather type
See merge request KartKrew/Kart!200
2020-03-06 00:09:43 -05:00
Sally Cochenour
ff190b7a88
Fix unsigned/signed comparison
2020-03-03 17:05:04 -05:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05:00
Sally Cochenour
76e75d9756
Fix offroad collision
...
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
2020-03-01 14:36:13 -05:00
Sally Cochenour
6956e1d24e
Store random states in mobjinfo instead of precipprops
...
My reasoning is that it wouldn't make much sense to have a weather type that has snow, but doesn't randomize the sprite it uses, so we don't need to copy-paste the same "randomstates" for each weather type.
2020-03-01 13:13:59 -05:00
Jaime Passos
ea756fd557
Make exitmove friendly, don't start empty intermission screens
2020-02-29 01:51:45 -03:00
Jaime Passos
9d0e3465f9
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
d5f6e5fcc6
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
Sally Cochenour
a63157b937
Flip facing direction
2020-02-25 00:04:39 -05:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Tatsuru
1463d8ba20
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
Jaime Passos
b0ce2e088f
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
MascaraSnake
c2311dca45
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
MascaraSnake
4c4596a45f
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
James R
4f41da1d16
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
7bcb2ec0f6
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
588a76efe4
Merge branch 'next' into udmf-next
2020-01-24 22:38:26 +01:00
Louis-Antoine
a997683d1c
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
8dbd4794c1
Teleport disconnected players to starpost if they fall in a pit
2020-01-22 03:20:27 +01:00
Jaime Passos
41840f6375
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-20 16:53:41 -03:00
Jaime Passos
7ec8c607ce
typoe
2020-01-17 00:34:31 -03:00
Tatsuru
a1fb309392
Range check
2020-01-11 21:38:10 -03:00
Tatsuru
445269ce14
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
MascaraSnake
d0a3447f5c
Merge branch 'udmf-next' into stringargs
2020-01-11 16:17:53 +01:00
MascaraSnake
ebe467a664
Merge branch 'udmf-next' into stringargs
2020-01-11 16:03:38 +01:00
MascaraSnake
331fe7201c
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
897f6ee067
Adapt setup of linedef type 443 (Call Lua function) to UDMF
2020-01-11 15:38:50 +01:00
MascaraSnake
fac733331d
Some minor cleanup
2020-01-10 19:56:29 +01:00
Jaime Passos
a6472c2ffb
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-10 04:11:26 -03:00
toaster
4f77e1e99b
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
084a8db5a9
Merge remote-tracking branch 'upstream/next' into next-newcontrols
2020-01-07 23:43:43 -06:00
Jaime Passos
3b29ec3fbc
Merge remote-tracking branch 'origin/next' into pictureformats
2020-01-07 16:10:25 -03:00
Jaime Passos
96340ac80c
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
Nev3r
ab63d3e33f
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
067b132eb1
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
MascaraSnake
4a5c550488
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
77ba835f4f
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart
e0d09a457e
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
1e3a06f420
Remove virtres_t pointer in P_SpawnSpecials that's no longer needed
2019-12-29 12:26:02 +01:00
MascaraSnake
2cf9408a7d
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
d00a9a42a1
Cleaned up some more stuff in P_LoadLevel()
2019-12-28 12:48:32 +01:00
Jaime Passos
8405dc4c07
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
Jaime Passos
100144d4db
Merge remote-tracking branch 'origin/master' into gametype-clownery
2019-12-23 18:21:13 -03:00
Nev3r
befe33e239
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
