Sryder
631b96883a
Merge branch 'flair' of git@git.magicalgirl.moe:KartKrew/Kart.git
2018-02-24 22:38:28 +00:00
Sryder
0454293bae
Hopefully a few more fixes and sanity changes for map voting
2018-02-23 01:53:30 +00:00
Sryder
387f6b904c
I don't see a reason for this to be in caps, but it stops me compiling DEVELOP on linux so fix
2018-02-23 01:11:31 +00:00
Sryder
dbc27e9c9e
It's SINT8 not INT8
2018-02-23 01:04:52 +00:00
TehRealSalt
d508137bb9
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-02-22 00:07:51 -05:00
TehRealSalt
cb593aa2b1
Battle Mode wins award (player count * 2) points now
2018-02-20 20:08:53 -05:00
TehRealSalt
6d3d098c3f
Fixed stereoreverse, and its effects are applied to mirror mode
...
How long has this cvar been broken?!
2018-02-20 20:04:33 -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
ccae121c26
Quick fix
2018-02-20 18:18:10 -05:00
TehRealSalt
275132da5f
Minor but important fixes
2018-02-17 01:53:44 -05:00
TehRealSalt
581e231a3e
sonicitems porting, Part 2
...
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
2018-02-13 18:13:27 -05:00
TehRealSalt
3e7fbad490
Porting over some things from sonicitems
2018-02-13 16:48:09 -05:00
TehRealSalt
889e547550
Updated player arrows
2018-02-11 21:47:19 -05:00
TehRealSalt
b93ec25c83
Fuck this weird tabbing
2018-02-11 12:50:42 -05:00
TehRealSalt
00d2038d61
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
0db99ff2c4
Merge remote-tracking branch 'refs/remotes/origin/democracy'
2018-02-10 20:00:20 -05:00
TehRealSalt
51029b2880
Remove comment
2018-02-10 19:56:05 -05:00
TehRealSalt
bfd7915a01
Random picking animation
2018-02-10 19:02:15 -05:00
TehRealSalt
2af4f0451a
One last thing: don't add whatever the game rolls for the random option
...
Makes it even more of a wild-card option, also makes sure that you
actually *see* all of the maps before it empties
2018-02-10 16:50:44 -05:00
TehRealSalt
bc99e0963e
Maybe fixed
2018-02-10 16:28:45 -05:00
TehRealSalt
dbc664d4e7
Minor fixes, mostly mobjscale and spectators
2018-02-10 16:19:22 -05:00
TehRealSalt
4348be7d80
Chaotix sound effects, new music names
2018-02-10 16:01:09 -05:00
TehRealSalt
2889687d1d
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
819d370fb3
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
2018-02-09 21:16:10 -05:00
TehRealSalt
8f74b1afcd
Faster
2018-02-09 21:14:14 -05:00
TehRealSalt
9088e3dbab
Slight adjustment
2018-02-09 16:04:52 -05:00
TehRealSalt
70f959815a
Merge remote-tracking branch 'refs/remotes/origin/master' into democracy
2018-02-08 21:24:56 -05:00
TehRealSalt
98fa8c1409
Added axis support
2018-02-08 21:24:44 -05:00
Sryder13
844b1dc2c0
Some warning fixes
2018-02-09 00:58:10 +00:00
TehRealSalt
ec84b46bb4
P != M
2018-02-08 18:14:56 -05: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
56f1263f34
Guess what.
...
A typo. :V
2018-02-08 00:53:25 -05:00
TehRealSalt
32ee651f43
/me tears away a piece of drywall
...
What's revealed is that democracy is actually made *entirely* out of
extremely minor 1 character long typos eating away at the structural
integrity of the building, and then the crack starts oozing green slime,
and then a creepy hand comes out and grabs you
2018-02-08 00:45:59 -05:00
TehRealSalt
2c09dd1df1
Minor fixes
2018-02-07 22:45:40 -05:00
TehRealSalt
e6c040b844
Merge remote-tracking branch 'refs/remotes/origin/master' into democracy
2018-02-07 22:34:33 -05:00
TehRealSalt
8c2bdfd006
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
00af56aa2a
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
6b63e44ff9
Forgotten
2018-02-05 20:23:09 -05:00
TehRealSalt
e516d09ae4
Colored boom
...
Not tested *yet*
2018-02-05 20:10:20 -05:00
TehRealSalt
0bdacde45e
Merge remote-tracking branch 'refs/remotes/origin/master' into flair
2018-02-05 19:56:49 -05:00
TehRealSalt
f7813d6fef
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
2018-02-05 19:43:32 -05:00
TehRealSalt
3749914588
Fix more conflicts that I forgot
2018-02-05 19:40:26 -05:00
Sryder13
29acd26846
Fix the explosion smoke ring (and warning)
2018-02-06 00:23:10 +00:00
TehRealSalt
d9c49d9527
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
cbff4bbf44
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
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
