Sally Coolatta
3e446a167c
Restructure how damage works in kart COMPLETELY
...
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
Sally Coolatta
30144d5d06
Things to get it to run
...
Build is still MASSIVELY broken, you can't even get into a level, still investigating
2020-08-15 20:09:36 -04:00
Sally Coolatta
c665393bd0
actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V
2020-08-14 21:21:17 -04:00
Sally Coolatta
372eb72d5b
Merge p_floor.c
2020-08-06 11:07:33 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Monster Iestyn
dbe7b57c74
T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result)
2020-05-24 21:15:31 +01:00
Louis-Antoine
74fa35221d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
Louis-Antoine
6af2871fa5
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
MascaraSnake
238513ffd6
Merge branch 'find-sector-from-tag' into 'next'
...
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag
See merge request STJr/SRB2!901
2020-05-01 05:49:52 -04:00
MascaraSnake
e967c32a10
Merge branch 'more-thinker-refactor' into 'next'
...
More thinker refactoring
See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake
c2cf8d57d0
Remove P_FindSectorFromLineTag
2020-04-27 14:31:37 +02:00
MascaraSnake
40d0fb714d
Store tag instead of sourceline in raise thinker
2020-04-27 12:54:08 +02:00
MascaraSnake
38a3be00d0
T_StartCrumble refactoring, part 1
2020-04-26 16:51:14 +02:00
MascaraSnake
62ab099b6f
Make T_StartCrumble use its own thinker data structure
2020-04-26 11:55:10 +02:00
MascaraSnake
0d21e4ad87
Eradicate levelspecthink_t
2020-04-18 11:05:58 +02:00
MascaraSnake
09f369846e
Remove return values from a few elevator functions that don't use them
2020-04-18 10:52:58 +02:00
MascaraSnake
1d35442e16
Make T_BounceCheese use its own thinker struct
2020-04-18 10:45:21 +02:00
MascaraSnake
54de7584d1
Refactor T_ThwompSector
2020-04-18 10:26:03 +02:00
MascaraSnake
71f9fe167b
Refactor T_NoEnemiesSector
2020-04-18 09:21:04 +02:00
MascaraSnake
a90735fdf0
Make T_MarioBlock use its own thinker data structure
2020-04-18 02:05:23 +02:00
MascaraSnake
e6193297d8
Refactor T_ContinuousFalling
2020-04-18 01:42:13 +02:00
MascaraSnake
06ce2b3b2c
Refactor T_MovePlane a little bit
2020-04-18 01:08:01 +02:00
MascaraSnake
272a8e532b
Refactor T_FloatSector
2020-04-18 00:26:49 +02:00
MascaraSnake
93eb0ee1c8
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
MascaraSnake
7e617fa938
Refactoring in T_BounceCheese
2020-04-17 23:32:39 +02:00
MascaraSnake
3add9943a8
Remove the spike thinker, which hasn't been necessary for a while now
2020-04-17 22:54:35 +02:00
MascaraSnake
e971a26d1d
Refactor T_EachTimeThinker
2020-04-17 21:19:21 +02:00
MascaraSnake
21b92b63e9
Make T_EachTimeThinker use its own struct
2020-04-17 14:00:48 +02:00
MascaraSnake
1f038e827a
-Remove superfluous variables from raise_t
...
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
2020-04-17 11:11:36 +02:00
MascaraSnake
dc41ed93cd
Get rid of code duplication in T_RaiseSector
2020-04-17 10:19:02 +02:00
MascaraSnake
cd036b57fd
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 09:58:53 +02:00
Nev3r
1ea15aa643
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
Nev3r
d05ad892be
Remove the bridge thinker code.
2020-04-14 10:31:07 +02:00
Nev3r
608f4b6e54
Remove now unused P_MobjReadyToMove().
2020-04-13 16:00:58 +02:00
Nev3r
44426fd453
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
Nev3r
8bbbd437c5
Refactor an unholy piece of code.
2020-04-13 14:31:19 +02:00
Sal
8d763afae6
Merge branch 'map-features' into 'master'
...
Minor but handy new mapping features
See merge request KartKrew/Kart!218
2020-03-23 00:44:18 -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
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01: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
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
James R
4f40edaf01
Maybe localdisplayplayers is a bad idea
2020-02-23 23:21:20 -08: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
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
TehRealSalt
80bb59031c
Blizzard weather option + much more sane workflow for adding new precipitation options
...
"precipprops" lets you create a new precipitation type by picking a mobj type to use, how many random states it has, and flags for effects such as thunder/lightning. Seesound on the mobj type sets an ambient sound (like rain drops) and mass sets the sound's frequency in tics. This could open up the possibility for SOC/Lua Weather options later.
2019-11-14 04:26:41 -05:00
James R
7c0d5b3bcf
There's some whitespace...
2019-11-07 14:56:42 -08:00
James
f9ea683312
P_PlayerTouchingSectorSpecial turned into P_MobjTouchingSectorSpecial
2019-10-22 08:45:38 -04:00
toaster
0f3101ce40
Modify initial platform sink to be more natural, while still toeing the line between "forgiving" and "punishing".
2019-10-20 19:13:46 +01:00