TehRealSalt
ff1462898a
Fuck this weird tabbing
2018-02-11 12:50:42 -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
c94df11be1
Merge remote-tracking branch 'refs/remotes/origin/democracy'
2018-02-10 20:00:20 -05:00
TehRealSalt
df600ba780
Remove comment
2018-02-10 19:56:05 -05:00
TehRealSalt
ed55d21682
Random picking animation
2018-02-10 19:02:15 -05:00
TehRealSalt
3db2ff37a2
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
a1be15134e
Maybe fixed
2018-02-10 16:28:45 -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
2a563d6f25
Faster
2018-02-09 21:14:14 -05:00
TehRealSalt
c542e0453c
Slight adjustment
2018-02-09 16:04:52 -05:00
TehRealSalt
74ccda156b
Merge remote-tracking branch 'refs/remotes/origin/master' into democracy
2018-02-08 21:24:56 -05:00
TehRealSalt
184ec0340b
Added axis support
2018-02-08 21:24:44 -05:00
Sryder13
864f55b57b
Some warning fixes
2018-02-09 00:58:10 +00:00
TehRealSalt
80ba8792bd
P != M
2018-02-08 18:14:56 -05:00
TehRealSalt
496eac9705
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 17:13:06 -05:00
TehRealSalt
a299222db7
Guess what.
...
A typo. :V
2018-02-08 00:53:25 -05:00
TehRealSalt
ef0770edda
/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
c32591e767
Minor fixes
2018-02-07 22:45:40 -05: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
c1dab359e0
Forgotten
2018-02-05 20:23:09 -05:00
TehRealSalt
648c7e6af6
Colored boom
...
Not tested *yet*
2018-02-05 20:10:20 -05:00
TehRealSalt
fdf70ebbc5
Merge remote-tracking branch 'refs/remotes/origin/master' into flair
2018-02-05 19:56:49 -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
58a6d59a5c
Star colour support for MD2s
2018-02-05 02:11:17 +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
Sryder13
be079b2fe6
Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks
...
# Conflicts:
# src/g_game.c
2018-02-04 20:39:53 +00:00
TehRealSalt
62192316ba
Everything
...
Been a while since I synced :V
2018-02-03 23:47:47 -05:00
TehRealSalt
2a015a85b8
Setup vote is a XCMD now
...
But now the rest of voting can get desynced easily now... this is
increasingly getting more and more fucked.
2018-01-30 16:42:44 -05:00
TehRealSalt
921222ba95
welp
2018-01-29 21:39:13 -05: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
TehRealSalt
b2db0f8750
Adjust for taller thinstring
2018-01-29 19:22:08 -05:00
TehRealSalt
912cf14781
Merge remote-tracking branch 'refs/remotes/origin/master' into democracy
2018-01-29 19:20:23 -05:00
TehRealSalt
ffe8a9199f
Merge remote-tracking branch 'refs/remotes/origin/menus-cvars-unlocks'
2018-01-29 19:17:25 -05:00
TehRealSalt
bd87988aba
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-29 19:15:25 -05:00
TehRealSalt
2c160df998
Minor adjustments for a taller thin font
2018-01-28 20:37:53 -05:00
