James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
Sally Cochenour
eddfc38d6e
Merge branch 'master' into map-features
2020-03-22 12:54:53 -04:00
Louis-Antoine
29294a53cc
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
MascaraSnake
62603ff226
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +01:00
James R
f6888ab004
Reset mapmusresume on level load etc.
...
This is probably important, right?
2020-03-21 22:28:55 -07:00
Sally Cochenour
c9cff6ccc2
P_MobjTouchingSectorSpecial checks polyobjects
...
This means polyobjects can have effects like offroad
2020-03-21 22:06:01 -04:00
James R
d46c6dc384
Kill trailing whitespace
2020-03-21 17:37:33 -07:00
Sally Cochenour
22702f88bc
"Delete items" sector type
2020-03-21 19:54:24 -04:00
Sally Cochenour
58df481cd3
Replace "Block Enemies" with "Block Players"
...
We don't need the ability to make invisible walls for enemies as often as we've needed invisible walls for players that don't block their thrown items.
2020-03-21 19:08:59 -04:00
MascaraSnake
9b76d3af6f
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
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
MascaraSnake
f92d5806b5
Add sector flag that protects the colormap from being changed
2020-03-20 12:19:02 +01:00
MascaraSnake
79852f0ec0
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Sally Cochenour
fa34e4eee4
Merge branch 'master' into sal-waypoints
2020-03-15 20:21:17 -04:00
Sally Cochenour
084901a8b1
Add warnings for old map setups
...
We probably don't want to keep these for release, but we need reminders to get rid of them ourselves :V
2020-03-15 19:21:06 -04:00
Nev3r
63fb8f846b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
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
