Commit graph

239 commits

Author SHA1 Message Date
TehRealSalt
f97ec30493 Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype
Should make it a lot easier to add more gametypes later.
Also some minor fixes:
- Changed up how shell speed scales in mobjscale juuuust slightly, so
it's less messy
- Fixed CHECK showing spectators
2018-03-04 15:27:52 -05:00
TehRealSalt
1e1867fe42 General fixes
- Flame trails don't spawn if you're not on the ground
- Mobjscale: Shells are now the correct speed
- Mobjscale: Explosion's wipeout hit height scales
2018-03-04 14:28:29 -05:00
TehRealSalt
b0be1c7bbf Hopefully this fixes item throwing & distribution in mobjscale maps 2018-03-01 17:20:13 -05:00
TehRealSalt
f0067d4719 Restore battle wait fade 2018-02-27 22:07:20 -05:00
TehRealSalt
a144a04abb Taunt sound simplification 2018-02-27 21:18:42 -05:00
Sryder
631b96883a Merge branch 'flair' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-02-24 22:38:28 +00:00
TehRealSalt
cb593aa2b1 Battle Mode wins award (player count * 2) points now 2018-02-20 20:08:53 -05:00
TehRealSalt
da32f9a4ed Fixed fourth taunt sound not playing
% 4 would output 0 to 3, not 1 to 4 guys :V
2018-02-20 19:33:50 -05:00
TehRealSalt
2a23549d63 Winning positions scale with number of players
Anyone in the top 50% gets winning music & blue position, everyone below
gets the losing music & red position. For odd numbers, it rounds up.
2p: 1st wins, 2nd loses
3p: 1-2 win, 3rd loses
4p:  1-2 win, 3-4 lose
5p: 1-3 win, 4-5 lose
6p: 1-3 win, 4-6 lose
7p: 1-4 win, 5-7 lose
8p: 1-4 win, 5-8 lose (SMK)
12p: 1-6 win, 7-12 lose (modern MK)
16p: 1-8 win, 9-16 lose (max player count)
In big netgames you won't just hear the losing music all of the time now
:V
2018-02-20 19:11:09 -05:00
TehRealSalt
275132da5f Minor but important fixes 2018-02-17 01:53:44 -05:00
TehRealSalt
3e7fbad490 Porting over some things from sonicitems 2018-02-13 16:48:09 -05:00
TehRealSalt
70f959815a Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-08 21:24:56 -05:00
Sryder13
844b1dc2c0 Some warning fixes 2018-02-09 00:58:10 +00:00
TehRealSalt
85a81ed087 Minor adjustments in hopes that I fixed the resynch bomb on gametype switch? 2018-02-08 17:13:06 -05:00
Sryder13
858a7adcb3 The main explosion particles bounce off the floor too 2018-02-08 15:46:07 +00:00
TehRealSalt
e6c040b844 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-07 22:34:33 -05:00
TehRealSalt
e516d09ae4 Colored boom
Not tested *yet*
2018-02-05 20:10:20 -05:00
Sryder13
29acd26846 Fix the explosion smoke ring (and warning) 2018-02-06 00:23:10 +00:00
Sryder13
c52475a630 New bomb explosion effect 2018-02-05 22:53:31 +00:00
Sryder13
d41d5800eb Some explosion stuff
Sphere spawns at centre and quickly grows before stopping
While sphere grows players get flung up
Fix some issues with battle mode stuff stopping bobombs from working
2018-02-05 19:24:54 +00:00
Sryder13
68338f560b Draw Minimap at regular size
Also positioned the minimap completely at the side of the screen as they're 5% scaled anyway
2018-02-05 03:59:36 +00:00
Sryder13
ae55938646 Merge branch 'minimapfix' into flair 2018-02-05 03:28:09 +00:00
Sryder13
ac481ed185 Pure white and pure black shouldn't change on star colormap 2018-02-05 02:53:55 +00:00
Sryder13
4b06594dd0 Star colormap is decided to be used per mobj with mobj->colorize
Star creates afterimages that are colorized and fullbright
Star makes the player fullbright
2018-02-05 00:00:36 +00:00
TehRealSalt
aa7fab06fc Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:44:41 -05:00
TehRealSalt
32b2818ab6 Quick fix :V 2018-01-29 19:43:22 -05:00
TehRealSalt
202ad11b43 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:20:23 -05:00
TehRealSalt
1e01e65a8b Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle 2018-01-29 19:15:25 -05:00
TehRealSalt
41f09816ce Functional, ready for netgame! 2018-01-27 23:52:01 -05:00
TehRealSalt
403e14e971 Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks
# Conflicts:
#	src/g_game.c
#	src/m_cheat.c
#	src/p_user.c
2018-01-24 16:24:36 -05:00
TehRealSalt
f6cfcd4f89 Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu
No more weapon number buttons, button constants reordered, and BT_JUMP
renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff
we didn't need. Spectator-only support for looking up/down soon.
Keyboard defaults are just what I use, plan on adjusting it further
after more feedback
2018-01-24 02:45:06 -05:00
TehRealSalt
8b88a2ebd8 Spectating is properly implemented now
- Spectate button works
- Spectating & objectplace controls are usable now
- New spectator HUD
2018-01-22 22:18:57 -05:00
TehRealSalt
b600fae9ba fut 2018-01-16 18:02:16 -05:00
TehRealSalt
db09f7b3d6 Lots of changes
- Menus now have all of the Kart cvars
- Removed any cvars that aren't useful for Kart from the menu (they
still exist in the console, though)
- Removed SP and NiGHTS Mode options from the main menu
- "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples
of 50, or the terms "Relaxed", "Standard", and "Turbo"
- Many gametype options (game speed, frantic, mirror, & karma comeback)
are now changed on map load instead of instantly
- New cvar, "kartminimap", for disabling the minimap
- The maxplayers cvar now actually matches up with our 16 player limit
- Game now keeps track of matches played. Has a condition type
associated with it, as well.
- Game checks for unlocks and saves gamedata when finishing a match,
even in MP
- Removed most of the normal emblems, added a single emblem for Green
Hills. Didn't know what to do with extra emblems and such so I just left
them (FOR NOW c:<)
2018-01-15 22:31:14 -05:00
TehRealSalt
61a4ea6962 Mobj scale fixes
- MAXSTEPMOVE is affected by mobjscale
- Minimum bump speeds (both wall & object) are affected by mobjscale
- Minimum speed required for drifting is affected by player scale
- Speedometer speeds are proportional to mobjscale
- Camera no longer scales with player scale, to make the fact that
you're either Lightning'd or Mega'd more obvious :V
- Sevvvvvv go work on Dimension Heist
2018-01-15 16:14:45 -05:00
Sryder13
a7ba7cf276 Fix minimaps for any maps that are larger than half of the mappable area, in either direction. 2018-01-13 21:07:44 +00:00
TehRealSalt
3f1b312c77 Title screen 2018-01-13 14:24:02 -05:00
TehRealSalt
6b1b715502 Switched Gold 'shroom and Star's chances
Doesn't really belong in this branch, but it's also an experimental
change that needs a decent-sized netgame to test to make sure it doesn't
hurt anything. Done because Gold 'shroom is a lot harder to use as a
catch-up item now that it reduces timer whenever you use it
2018-01-08 16:51:38 -05:00
TehRealSalt
9908339989 A bunch of little things
- Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT
- Solid objects now bump players instead of stop them
- Bounce pad strength scales with object scale
- Fixed Boo stealing being inconsistent and sometimes not stealing
anything
2018-01-08 15:48:19 -05:00
TehRealSalt
c70a2f51aa Tweeeeeaks
- MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples
- Made some Battle-related messages only happen in netgames
- Messed with the timing on the intro
2017-12-28 18:37:25 -05:00
TehRealSalt
6d263a0dff Lots more little adjustin's 2017-12-26 21:36:03 -05:00
TehRealSalt
ab010f91b0 Last few finishing touches for the HUD
Battle Mode cards & Race countdown timers display properly
2017-12-25 10:05:36 -05:00
TehRealSalt
189d2f7a34 Fixed joysticks 3 & 4
fun typos
2017-12-24 15:02:41 -05:00
TehRealSalt
9c7aad2929 Okay lets ACTUALLY fix it now :V 2017-12-24 09:19:59 -05:00
TehRealSalt
ae1fc244c5 agggh more minor 2017-12-24 09:02:40 -05:00
TehRealSalt
df03c27ba4 minor 2p/4p fix 2017-12-24 08:58:04 -05:00
TehRealSalt
c2db0ddca2 Battle hud stuff?! 2017-12-23 20:55:23 -05:00
TehRealSalt
7a5bd7c597 Closer to done HUD tweaking?
Splitscreen in Battle is left
2017-12-23 19:14:06 -05:00
TehRealSalt
508df2e269 thing 2017-12-22 16:24:20 -05:00
TehRealSalt
94a42d1bf6 Unfinished V_HORZSCREEN revamp 2017-12-22 10:16:41 -05:00