Commit graph

363 commits

Author SHA1 Message Date
TehRealSalt
1b1f29bd2b Unsuck start boosts 2018-03-29 21:43:02 -04:00
TehRealSalt
8561d14727 A quick credits draft
Please give me corrections and people to add. I've not been here as long
as some people, so there is 100% probably people I missed
2018-03-28 16:17:04 -04:00
TehRealSalt
ab0fc15b81 Actually, this makes more sense :U 2018-03-28 15:28:50 -04:00
TehRealSalt
a4ae9a6fe6 Idea: Make Boo make you invisible instead of flash in splitscreen
There's no way atm to make you flash on your screen but not on everyone else's, so I think just making you invisible on all of them keeps the original SMK intent of "you have to pay extra close attention to their screen to know where they are at all" better
2018-03-27 18:30:02 -04:00
TehRealSalt
fb135aede6 HUD improvements
Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 18:22:33 -04:00
TehRealSalt
7264c284cf WIP karma item stuff 2018-03-26 20:36:16 -04:00
TehRealSalt
eb1b84ce5c Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/info.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_mobj.c
2018-03-14 16:12:15 -04:00
TehRealSalt
036029bbd7 Rename fake item to eggman monitor 2018-03-13 21:07:08 -04:00
Sryder
78e2021f4b Make sure it's a waypoint before doing distance calculations 2018-03-13 05:25:04 +00:00
Sryder
201392d34b Fix the item box related crashes
Removed Magnet item box pulling code. It's a mess, hacky, doesn't really help in races, and breaks things. We will implement something new for it soon.
2018-03-13 05:20:47 +00:00
TehRealSalt
638d2fce41 whoops 2018-03-12 01:23:42 -04:00
TehRealSalt
79ba08ac7d Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_user.c
#	src/sounds.c
#	src/sounds.h
#	src/y_inter.c
2018-03-12 00:58:13 -04:00
TehRealSalt
20f0cdc0f6 Restored bounce pad strafe 2018-03-06 01:31:49 -05:00
TehRealSalt
18ece8db5e 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
3385df84ce 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
3d84c3fe2e Hopefully this fixes item throwing & distribution in mobjscale maps 2018-03-01 17:20:13 -05:00
TehRealSalt
1667c84378 Restore battle wait fade 2018-02-27 22:07:20 -05:00
TehRealSalt
4b0815f2dc Taunt sound simplification 2018-02-27 21:18:42 -05:00
Sryder
2b048bf77e Merge branch 'flair' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-02-24 22:38:28 +00:00
TehRealSalt
c6ca5e6920 Battle Mode wins award (player count * 2) points now 2018-02-20 20:08:53 -05:00
TehRealSalt
c550bc3df1 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
11e2d9c6cf 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
af10a43fc7 Minor but important fixes 2018-02-17 01:53:44 -05:00
TehRealSalt
1a424ba756 Porting over some things from sonicitems 2018-02-13 16:48:09 -05:00
TehRealSalt
62b45ff4b0 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/k_kart.c

(Also I added some extra music for voting, because I forgot I didn't
commit the merge :V)
2018-02-11 12:18:25 -05:00
TehRealSalt
e4b1bd3365 Minor fixes, mostly mobjscale and spectators 2018-02-10 16:19:22 -05:00
TehRealSalt
495ee25f18 Chaotix sound effects, new music names 2018-02-10 16:01:09 -05:00
TehRealSalt
eab1120950 New invincibility effect, grow/shrink stuff
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
2018-02-10 01:19:33 -05:00
TehRealSalt
b83dd75a99 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-02-09 21:16:10 -05:00
TehRealSalt
74ccda156b Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-08 21:24:56 -05:00
Sryder13
864f55b57b Some warning fixes 2018-02-09 00:58:10 +00:00
TehRealSalt
496eac9705 Minor adjustments in hopes that I fixed the resynch bomb on gametype switch? 2018-02-08 17:13:06 -05:00
Sryder13
2a8d91c79f The main explosion particles bounce off the floor too 2018-02-08 15:46:07 +00:00
TehRealSalt
782a5d7fd9 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-07 22:34:33 -05:00
TehRealSalt
acc4b0bb76 Belp
- Minimap heads that aren't yours are transparent
- Minimap has a visibility slider
- Bomb stuff renamed to Mine
2018-02-07 22:33:27 -05:00
TehRealSalt
d6d0a38a23 Merge remote-tracking branch 'refs/remotes/origin/flair' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/p_enemy.c
2018-02-05 21:08:01 -05:00
TehRealSalt
648c7e6af6 Colored boom
Not tested *yet*
2018-02-05 20:10:20 -05:00
TehRealSalt
3e6761c3a1 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-02-05 19:43:32 -05:00
TehRealSalt
48f7a894c1 Fix more conflicts that I forgot 2018-02-05 19:40:26 -05:00
Sryder13
ba07bb7a54 Fix the explosion smoke ring (and warning) 2018-02-06 00:23:10 +00:00
TehRealSalt
bfe58a819a Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/dehacked.c
#	src/hardware/hw_main.c
#	src/info.c
#	src/info.h
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_user.c
#	src/r_things.c
2018-02-05 19:08:49 -05:00
TehRealSalt
806dba97ae So much
- Renamed fucking everything
- Threw out all of the item code because it looks at me funny
2018-02-05 18:55:52 -05:00
Sryder13
b1b3cf52cc New bomb explosion effect 2018-02-05 22:53:31 +00:00
Sryder13
fb87601d52 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
ea384ce4a2 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
64bebe246d Merge branch 'minimapfix' into flair 2018-02-05 03:28:09 +00:00
Sryder13
303ea2dbbc Pure white and pure black shouldn't change on star colormap 2018-02-05 02:53:55 +00:00
Sryder13
fe89ce941b 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
2d89e62822 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:44:41 -05:00
TehRealSalt
9cda1d8d7b Quick fix :V 2018-01-29 19:43:22 -05:00