Commit graph

2155 commits

Author SHA1 Message Date
TehRealSalt
c0ed28e828 why didn't this merge before?? 2017-11-05 02:17:13 -05:00
TehRealSalt
d3e888cc44 Merge remote-tracking branch 'refs/remotes/origin/master' into battle
# Conflicts:
#	src/d_player.h
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_playerlib.c
2017-11-05 02:16:39 -05:00
TehRealSalt
7b01a6c46e Less strict item respawn requirement 2017-11-05 01:49:31 -05:00
TehRealSalt
a9c1b3e747 Everything.
- Player arrows now show if a player is in the item roulette
- Boo has been improved, and added back to Battle's item roulette
- The CHECK HUD item is now more accurate, and should appear more often
- Early comeback mechanic. Functional, but really unpolished
- Attempted (again) to make the first player to join in a netgame spawn
with balloons
- No longer shows respawn text on death
2017-11-05 01:43:47 -05:00
Sryder13
bb35f222c9 1 tid duration on drifting too 2017-11-04 21:58:21 +00:00
Sryder13
51af54d0ff Voices for when you hit someone else
Not totally sure on them, but it's worth a try, would make it more obvious when you hit someone with a trap item in battle anyway
2017-11-04 20:42:01 +00:00
Sryder13
33beff0d5f Slow and Fast states use 1 tic duration animation
Disable adjusting of frame speed (can be re-enabled through MAINCFG if people want it for whatever reason)
2017-11-04 17:49:14 +00:00
Sryder13
c9ddb7a4b5 Re-add lost player vibration frames
Separate sprites for fast moving frames
Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
Sryder13
81a077b9af New player frameangle used instead of mobj angle for players
Set to mobj angle except when spinning where it's set to spin
Only 1 spin frame needed now
2017-11-04 14:07:53 +00:00
Sryder13
28ec48c02c Make the bump and item throw graphics fullbright. 2017-11-04 13:33:38 +00:00
TehRealSalt
1dcdaf0c44 I actually didn't do any of this right!! Whoops!!
Also made red shells dumb in battle mode
2017-11-02 21:40:06 -04:00
TehRealSalt
2cbef008c8 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
# Conflicts:
#	src/k_kart.c
2017-11-02 21:03:14 -04:00
Sryder13
e5a32eb699 New collision mechanics, player's transfer their speed along movement when they collide, then bounce off at a set speed away depending on weight from each other 2017-11-03 00:43:51 +00:00
TehRealSalt
9a822fae80 Balloon stealing! Mushroom is back! 2017-11-02 20:43:03 -04:00
TehRealSalt
d0a455c7dd More tinkering with the item list
Increased item variety (triple reds added with same chances as star &
megashroom, triple bananas are back), and the deadliest items should be
less likely due to more weight on the weak items. Doesn't add up to 20
anymore, though; will likely be fixed when balloon-based items get
implemented.
2017-11-02 01:18:16 -04:00
TehRealSalt
b7432cd154 Change draw order
Lakitu is a bottom
2017-11-02 00:41:04 -04:00
TehRealSalt
9522e1b95e CHECK indicator
Turn it off with the kartcheck console var
2017-11-02 00:35:10 -04:00
TehRealSalt
cc01d2c3f0 Balloon revamp
Supports arbitrary balloon counts now
2017-11-01 18:46:35 -04:00
TehRealSalt
4fce06d80e Dang it. 2017-11-01 16:24:40 -04:00
TehRealSalt
ec429ff425 k_poweritemtimer
Prevents you from getting stars or megashrooms too soon after one
another. Should only be set in Battle Mode only
2017-11-01 16:24:27 -04:00
Sryder13
e60b3e1b88 Move Player collision check into the regular collision checking 2017-11-01 18:40:32 +00:00
TehRealSalt
b4a1ad4ef2 Just bumped timer 2017-10-31 16:14:17 -04:00
Sryder13
48e0d64525 More changes to thrown items, higher gravity and fly faster 2017-10-28 02:44:25 +01:00
TehRealSalt
4a02e166a1 Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-26 19:39:02 -04:00
TehRealSalt
f271d1bd76 Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-26 19:37:23 -04:00
TehRealSalt
b127c02e2c Maybe message fix 2017-10-26 19:37:13 -04:00
Sryder13
bda85bea4a Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks 2017-10-27 00:02:05 +01:00
Sryder13
a00123e663 Item Throw distance/height experimentation 2017-10-27 00:01:59 +01:00
Sryder13
bd55a295bd Skin colours for MD2s
This isn't amazing, until I implement something better (probably not until 2.2) it will have to do
2017-10-26 20:57:36 +01:00
Sryder13
8742b3b2d9 Star power translation tables
Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 20:04:05 +01:00
Sryder13
4210885ad3 Merge branch 'master' into ric-flair 2017-10-26 15:03:09 +01:00
Sryder13
be376de48f Merge branch 'master' into ric-flair 2017-10-26 15:02:24 +01:00
Wolfy
a551ecc166 Reorganize the control setup menu, update controls to reflect kart 2017-10-26 01:43:02 -05:00
TehRealSalt
69d6d43fea Everything I did today; mainly player arrows
Also some minor tweaks and bug fixes all around
2017-10-26 02:31:01 -04:00
TehRealSalt
6d18059543 Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-25 20:08:25 -04:00
Sryder13
1f7caee344 Highres intro graphic 2017-10-25 23:05:19 +01:00
TehRealSalt
6c1269a6f4 Balloons message 2017-10-25 16:20:28 -04:00
Sryder13
e6ed15c066 Separate music from sound.kart so it can be added properly 2017-10-25 20:38:43 +01:00
Sryder13
f7b637663c Setup intro finally 2017-10-25 20:30:02 +01:00
Sryder13
2e2d4073b8 Bombs should check for teams in team match, not regular match 2017-10-25 15:04:08 +01:00
Sryder13
b9f6a91c37 Improve functionality of held items
Can check for falloff from ledges
place along the z properly
2017-10-25 03:37:13 +01:00
TehRealSalt
0bb3bc2b7e Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-24 22:15:20 -04:00
Sryder13
28297d9f58 Add separate boost sound for start boost
Allows us to set it to be singular, stopping really loud start boosts with many players
2017-10-25 02:47:24 +01:00
Sryder13
101a560d4e Adjust Trailing items to behave nicer
Added extra boolean for P_SlideMove forceslide, since kart's walls are almost all bouncy slidemove will almost always bounce things instead, even if we don't want it to.
2017-10-25 02:32:07 +01:00
TehRealSalt
ac55f0ea4d Okay, battle mode items respawn, for real now 2017-10-24 21:22:09 -04:00
Sryder13
e5e472edf1 Crash fix 2017-10-25 02:00:17 +01:00
TehRealSalt
0af023d8ca Merge master 2017-10-24 19:31:37 -04:00
Sryder13
65c5c94563 Maces have shadows
Maces have afterimages
2017-10-24 23:33:25 +01:00
TehRealSalt
fff4194d62 Silly little thing I just added 2017-10-24 18:01:00 -04:00
Sryder13
fe31394277 Do a quake effect when hit by non-spinout things or explosions 2017-10-24 22:58:59 +01:00