incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16230 commits 1 branch 0 tags 204 MiB
Commit graph

1660 commits

Author SHA1 Message Date
Sally Coolatta
285ec3e08c Player death uses damage types 
- Fixed last place elimination not working (again)
- Replaces squishing from level geometry with good old fashioned crush death
 2020-09-25 16:31:10 -04:00
Sally Coolatta
f31923d2d6 Fix MFE_JUSTBOUNCEDWALL not getting removed 2020-09-25 13:30:03 -04:00
Sally Coolatta
91d4d19bda Fix a few instances of rainbow things going through invalid skincolors 2020-09-25 12:54:35 -04:00
Sally Coolatta
d960ae5599 Merge branch 'the-scary-22-merge' of https://git.do.srb2.org/KartKrew/Kart into the-scary-22-merge 2020-09-25 12:00:56 -04:00
Sally Coolatta
b5fcd74ef9 Merge master 
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
 2020-09-25 12:00:50 -04:00
toaster
e36da645d9 Revert a bruh moment from 2.2's development where, in order to fix statues and spikes from being visible on the death pit in CEZ, I made any object that comes into contact with a death pit and isn't on a whitelist delete itself. 
(Now the Chao at the start of Sonic Speedway don't die immediately.)
 2020-09-25 15:15:30 +01:00
Sally Coolatta
58d9ac899d Fixed friction being applied incorrectly 
Kart's manual player friction adjustments were being called after movefactor was reset, meaning friction changed but movefactor was default, essentially creating old 2.1 friction again
 2020-09-25 04:33:20 -04:00
Sally Coolatta
861cb8e144 Fix springs giving you way too many 
(Also removed a bunch of instances of PF_SPINNING since we haven't used it)
 2020-09-25 02:24:19 -04:00
toaster
f6158b7cf4 Fixed a crash I recieved while playtesting bots on Petref which was caused by an invalid subsector reference. This can only happen when the mobj was removed. I have no idea how or why this wasn't caught earlier, but I suspect we inherited this issue from upstream in the merger. 2020-09-23 12:49:42 +01:00
toaster
1ec6240001 Fix vwoops not properly clipping through stuff 2020-09-22 15:07:12 +01:00
toaster
a052501b01 Fix signpost front plate being fucked up (was broken by custom skincolours) 2020-09-22 13:41:48 +01:00
Sally Coolatta
99a1bacb81 Turning code overhaul 
Packet drops are still broken, but at least netgames are playable now.
 2020-09-22 00:35:44 -04:00
James R
0cddfdee74 Ignore slope anchors in P_SpawnMapThing 2020-09-21 19:35:49 -07:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
Sally Coolatta
8e62efb79c Merge branch 'master' into next 2020-08-23 04:44:27 -04:00
FlykeSpice
2d9ec1687c Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
FlykeSpice
2424418390 Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
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
8ec67e1ff9 Fix mobjscale 2020-08-18 06:36:43 -04:00
Sally Coolatta
9863171879 Remove MF_BOUNCE, use MF_SLIDEME to enable P_SlideMove for an object 2020-08-16 03:03:04 -04:00
Sally Coolatta
e0e506ec55 Ran through a different compiler, fixing the minor warnings it had 2020-08-15 09:32:10 -04:00
Sally Coolatta
631f698432 Cleanup 
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.

I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
 2020-08-15 08:32:56 -04:00
Sally Coolatta
9efdc98de6 Makes it through all kart files 
All that's left is SDL, OGL, maybe also Lua
 2020-08-15 04:42:56 -04:00
Sally Coolatta
5a98c00405 NOW we make it past p_mobj 2020-08-14 22:28:49 -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
5a6263c36b Make it past p_mobj 2020-08-14 20:48:06 -04:00
Sally Coolatta
c09e54d073 m_menu compiles 2020-08-14 06:28:35 -04:00
Sally Coolatta
6ef0af4ba5 g_game and g_input now compile 2020-08-13 00:05:44 -04:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
f8d1e75025 Merge remote-tracking branch 'public/next' 2020-08-12 18:50:41 -04:00
Sally Coolatta
135e9b9797 f_finale now compiles 2020-08-11 23:13:25 -04:00
Sally Coolatta
b9436ee015 More fixing up 
Got tired again, but now it makes it to f_finale
 2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up 
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
 2020-08-11 16:13:17 -04:00
Sally Coolatta
a50a9a1843 Lots of splitscreen fixes 
LOTS of stuff I changed to use arrays instead of constantly duplicated code
 2020-08-10 23:38:32 -04:00
Sally Coolatta
c96bd5f64a Many removals 
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
 2020-08-10 21:45:51 -04:00
Sally Coolatta
ecec1e8a8f OK the compiler still didn't like it, so just properly remove it entirely. 2020-08-10 17:22:55 -04:00
Sally Coolatta
0c06da879e Merge p_mobj.c 2020-08-10 14:37:15 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
7accb3f8d2 Merge p_mobj.c/h 2020-08-08 15:22:29 -04:00
Sal
21dfe49bf8 Merge branch 'antigrav-respawn' into 'master' 
Antigravity fixes, round 2

See merge request KartKrew/Kart!305
 2020-07-31 21:55:38 -04:00
Nev3r
0bd31d8862 Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now. 2020-07-30 09:45:58 +02:00
Nev3r
3d90a6aebe Merge branch 'udmf-next' into 'next' 
Merge udmf-next into next

See merge request STJr/SRB2!1075
 2020-07-28 14:03:59 -04:00
Sally Coolatta
69b6ba2f18 I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1 
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
 2020-07-28 03:34:39 -04:00
Latapostrophe
b62ef5a51d Kill flipcam again but nothing else associated with it. 2020-07-26 21:15:32 +02:00
Latapostrophe
90cde7379c Revert "Push flipcam down the nearest staircase" 
This reverts commit 06d70c1f8e.
 2020-07-26 20:27:22 +02:00
Sally Coolatta
f61f9a010c Merge branch 'master' into spindash 2020-07-24 21:26:17 -04:00
Sally Coolatta
1a61810f16 Make ring respawn faster 2020-07-24 20:19:14 -04:00
Latapostrophe
06d70c1f8e Push flipcam down the nearest staircase 2020-07-24 16:17:07 +02:00
Sally Coolatta
25e9c72bab Merge branch 'master' into spindash 2020-07-23 19:12:00 -04:00
James R
34a7c2ee88 Hammer cocks on rainbow sparks; hella bullet clips on rainbow boost + new sfx 2020-07-22 19:09:14 -07:00