vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2803 commits 50 branches 7 tags 75 MiB
Commit graph

2803 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Arias 4cbe2e1622
Merge pull request #231 from LJSonik/net-command-leak-fix 
Fix net commands not always being freed
 2018-02-14 10:28:32 -05:00
Louis-Antoine c7320f9f82 Don't allocate memory for net commands already executed, as it would cause them to be never freed 2018-02-14 15:09:52 +01: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
Monster Iestyn fe2fd432e8 Merge branch 'stopleakingnames' into 'master' 
Stop leaking names via metadata.

See merge request STJr/SRB2!223
 2018-02-08 16:14:15 -05:00
Monster Iestyn c42c70cb34 Merge branch 'playdemo-custom-home-fix' into 'next' 
Fix for "playdemo" not working with custom home paths

See merge request STJr/SRB2!221
 2018-02-08 15:29:39 -05:00
Monster Iestyn b898dc397d Merge branch 'lua-archive-crash-hotfixes' into 'next' 
Hotfix for "LUA PANIC" crash when joining a netgame

See merge request STJr/SRB2!222
 2018-02-08 15:29:20 -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
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 b4db82336b Star colour support for MD2s 2018-02-05 02:11:17 +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
Sryder13 483921f1fa 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 b20e2d55eb Everything 
Been a while since I synced :V
 2018-02-03 23:47:47 -05:00