Commit graph

974 commits

Author SHA1 Message Date
Sally Coolatta
4abb14a158 Check for null 2020-11-10 23:22:05 -05:00
Sally Coolatta
bd495c7f55 Increase hitlag for bananas from 2 to 5, use 10 for normal damage by default instead
Ballhogs & Lightning Shield get intense hitlag again
2020-11-10 23:13:32 -05:00
Sally Coolatta
c86d496fef Removed fixed length hit lag 2020-11-10 23:02:58 -05:00
Sally Coolatta
8b5a78114e Hitlag occurs on registered damage instead of being before damage calls 2020-11-09 21:35:08 -05:00
Sally Coolatta
0e28470228 Merge master 2020-11-08 02:34:24 -05:00
Sally Coolatta
0f492f4300 Merge branch 'battle-rethink' of https://git.do.srb2.org/KartKrew/Kart into battle-rethink 2020-11-02 02:04:02 -05:00
Sally Coolatta
7304dff3e5 Don't let karma players pick anything up 2020-11-02 02:03:50 -05:00
James R
896b29f002 Replace special handling for picking up items from below with MF_PICKUPFROMBELOW 2020-11-01 22:33:42 -08:00
Sally Coolatta
961ff69241 You can drop Chaos Emeralds 2020-11-02 00:41:41 -05:00
Sally Coolatta
91ed67bece Start on Chaos Emeralds
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
James R
cb941050e2 Paper item hitbox extends just as far below 2020-10-28 23:48:16 -07:00
Sally Coolatta
48d8bb242a Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-25 09:58:25 -04:00
Sally Coolatta
f121ed210a Fix flashing tics 2020-10-25 09:57:51 -04:00
Sally Coolatta
0969ca1af9 Karma bombs rework
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
2020-10-24 11:27:42 -04:00
Sally Coolatta
cc1268cdf3 Lost bit of the commit 2020-10-24 09:18:43 -04:00
Sally Coolatta
81a3a1c108 Steal bumpers from other players on any hit 2020-10-24 09:18:28 -04:00
Sally Coolatta
9ad88cdfa9 Add center point mobj, polish the visual a bit more, reduce the speed that the barrier shrinks 2020-10-22 17:38:06 -04:00
Sally Coolatta
7430df5f4f Fix time limit, make overtime kill you instantly and close in faster, remove minimum radius
Radius SHOULD be doubled to 8192 to be reasonable... but something gets severely messed up, makes me MAD
2020-10-22 05:36:36 -04:00
Sally Coolatta
7ce53ac104 Add blue spheres
Doesn't have animations, and doesn't have stat-specific buffs. But it's already a massive improvement
2020-10-22 02:52:33 -04:00
Sally Coolatta
062ea7e430 Use scale 1 instead of 0 for player oblivion shrink 2020-09-27 10:36:44 -04:00
Sally Coolatta
d6389637ca Prevent steal damage first 2020-09-27 10:28:14 -04:00
Sally Coolatta
17b8a5d603 Shrink when dying post-finish
I started this in another commit and forgot to fully finish it. Also allows attacking bot-controlled players who won
2020-09-26 05:40:01 -04:00
Sally Coolatta
2f6962c103 Correct player angle when respawning from crushing 2020-09-26 03:12:22 -04:00
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
953afddd03 Fix camera not updating when F12ing, fixed camera not taking aiming into account, and minor cleanup 2020-09-25 09:28:19 -04:00
SteelT
d8bcc13fec Merge branch 'master' into trick-panels
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/k_kart.c
#	src/p_user.c
2020-09-18 00:54:45 -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
8fd64ca607 Fix ring usage & gravity 2020-08-16 02:12:17 -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
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
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
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
0cd5d2e903 Merge p_inter.c 2020-08-10 14:27:26 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
0de25ce771 Merge p_inter.c 2020-08-09 15:15:52 -04:00
Sally Coolatta
ef2579f2b3 Merge branch 'master' into draw-flags 2020-07-20 13:38:48 -04:00
Snu
b03a0ee735 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul
Updated to 2.2.5
2020-07-10 17:08:53 +01:00
Snu
5f7175204f Changed Bubble Shield functionality 2020-07-10 05:59:10 +01:00
LJ Sonic
b558c523a2 Merge branch 'fix-oldbrak-missiles2' into 'next'
Take 2: Fix Old Brak missiles + add pw_ignorelatch

See merge request STJr/SRB2!1006
2020-07-04 16:28:48 -04:00
James R
34eeb98cc4 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
kaysrishaq
248cd81ee9 brak missile fix, pw_ignorelatch, small Recycler fix 2020-06-18 17:09:29 -04:00
Sally Coolatta
59add5abd4 Merge branch 'master' into trick-panels 2020-06-14 20:46:01 -04:00
Sal
58dbdc2378 Merge branch 'grand-pricks' into 'master'
Grand pricks

See merge request KartKrew/Kart!258
2020-06-07 01:28:35 -04:00
Sally Coolatta
136bb1d252 Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player 2020-06-06 19:45:13 -04:00
Sally Coolatta
b7a8c1f128 Merge branch 'master' into trick-panels 2020-06-05 18:41:21 -04:00