stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 12:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
4571 commits 60 branches 11 tags 94 MiB
Commit graph

4571 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
e2f5c99217 Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge] 2018-12-30 15:41:58 -05:00
TehRealSalt
e009ab94d1 Merge remote-tracking branch 'kartinternal/master' into next 2018-12-03 17:32:20 -05:00
TehRealSalt
188c0164b6 Buff item hitbox size 
I was gonna hold off for v2 to do this, but frankly... this is too good to have. Honestly I think this is a big buff for karma items... people unable to hit as bombs will have a LOT less trouble as item.
 2018-12-03 17:30:27 -05:00
TehRealSalt
5658f69ba7 Merge branch 'master' into next 2018-12-03 01:00:17 -05:00
TehRealSalt
919667ed39 Just do MapChange hook on G_InitNew 
Everything that's supposed to call it also calls this...
 2018-12-03 00:33:35 -05:00
TehRealSalt
aa16edec1d Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-03 00:31:23 -05:00
TehRealSalt
9659369ae1 Update the patch.kart hash. Again. 2018-12-03 00:21:11 -05:00
Sal
652d82fd15 Merge branch 'unfuck-gamepads' into 'master' 
Fix spectators floating when right analog is held

See merge request KartKrew/Kart!118
 2018-12-02 23:35:58 -05:00
wolfy852
3ec0afc09d AXISBRAKE, take out GameController stuff for now 2018-12-02 19:33:09 -06:00
Alam Arias
6c0e0b9d08
Merge pull request #353 from monster-psychic-cat/lua_mapchange 
Change MapChange so Lua returns the map number you change
 2018-12-02 17:27:07 -05:00
MonsterIestyn
10832db244
Merge branch 'next' into lua_mapchange 2018-12-02 20:54:32 +00:00
Monster Iestyn
26a8f51c8e Merge branch 'searchblockmap-backport' into 'next' 
Lua: Blockmap search library backport

See merge request STJr/SRB2!353
 2018-12-02 09:49:42 -05:00
wolfy852
d1a0df09a5 Merge remote-tracking branch 'remotes/origin/master' into unfuck-gamepads 2018-12-02 02:01:51 -06:00
wolfy852
aba7711c39 Potentially fix spectators floating when inputting right on the analog stick. 2018-12-02 02:01:06 -06:00
TehRealSalt
d9fa45d850 Back to numstarposts/2 2018-12-02 02:29:47 -05:00
TehRealSalt
d125f7cc2d Wrong color for UFO fireworks 2018-12-01 23:08:42 -05:00
TehRealSalt
15b05f6e75 Fireworks carry momentum, UFOs spawn fireworks 2018-12-01 20:48:19 -05:00
TehRealSalt
ac64290cc7 Forgotten include 2018-11-30 17:07:30 -05:00
Monster Iestyn
068e947292 Merge branch 'master' into next 2018-11-30 21:09:32 +00:00
Monster Iestyn
11cb163435 Backport the Blockmap library I made two years ago 2018-11-30 17:11:11 +00:00
Jimita
6d7689c1a7
Merge branch 'next' into lua_mapchange 2018-11-30 15:10:59 -02:00
MPC
54cae84849 Change MapChange so Lua returns the map number you change 2018-11-30 14:01:40 -03:00
Monster Iestyn
e0a1c43813 Free lump names *before* either lumpinfo or the WAD itself! 2018-11-30 14:19:47 +00:00
TehRealSalt
5d8a63da64 Add TC_ to dehacked 2018-11-30 03:43:16 -05:00
TehRealSalt
d3ecdeb364 Do 800 instead 2018-11-30 03:36:44 -05:00
TehRealSalt
9598995150 Un-nerf Mines on activation tic 2018-11-30 03:09:49 -05:00
TehRealSalt
b7ff6d56d2 Colormap crash fix 2018-11-30 03:09:01 -05:00
TehRealSalt
f2a87356d0 Update GPL notice 2018-11-30 00:15:14 -05:00
TehRealSalt
aa9b36ac04 Fix this memory freeing 2018-11-29 22:31:20 -05:00
Sryder
ce2c39293e Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2018-11-29 22:26:26 +00:00
Sryder
969d606c6b Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git 2018-11-29 22:19:54 +00:00
Sryder
6350e6c00b Merge branch 'cmake-patch-fix' into 'master' 
Update CMakeLists.txt

See merge request KartKrew/Kart-Public!1
 2018-11-29 17:17:11 -05:00
Sal
ce14755156 Merge branch 'rename-cmds' into 'master' 
Rename "giveadmin" and "removeadmin" to "promote" and "demote"

See merge request KartKrew/Kart!117
 2018-11-29 11:18:57 -05:00
TehRealSalt
4cfaf746bb Reimplement png warning 2018-11-29 11:16:40 -05:00
TehRealSalt
d9654bcc1a Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 10:26:38 -05:00
TehRealSalt
6bdbc45ffe Enable pk3 in addons menu 2018-11-29 10:07:53 -05:00
TehRealSalt
46571fbda2 Fixes to merge process 2018-11-29 10:07:35 -05:00
TehRealSalt
936bd43266 Merge branch 'master' into merge-next 2018-11-29 09:46:46 -05:00
Monster Iestyn
305ad4f73e backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading 2018-11-29 14:16:02 +00:00
wolfy852
f2072b973b Rename "giveadmin" and "removeadmin" to "promote" and "demote" 2018-11-29 07:58:26 -06:00
TehRealSalt
5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Sal
aa56911b2e Merge branch 'version-prep' into 'master' 
Update version to v1.0.2

See merge request KartKrew/Kart!111
 2018-11-29 08:05:24 -05:00
TehRealSalt
7ed6fb8483 Update patch.kart hash 2018-11-29 08:04:41 -05:00
Sal
594fae05ff Merge branch 'floating-item-fixes' into 'master' 
Floating item fixes

See merge request KartKrew/Kart!116
 2018-11-29 08:00:56 -05:00
TehRealSalt
a32b3bf07b Remove in death pits 2018-11-29 07:50:58 -05:00
TehRealSalt
be4fb2bcfb Set indirectitemcooldown for SPB/Shrink drops 2018-11-29 07:49:34 -05:00
Sal
e88dbedbc4 Merge branch 'mobjdamage-hook' into 'master' 
Lua "damage" hooks

See merge request KartKrew/Kart!115
 2018-11-29 07:16:22 -05:00
TehRealSalt
5f3abae81b Merge branch 'possibly-better-turn' 2018-11-29 07:13:24 -05:00
TehRealSalt
1a4648b6e9 Update credits for bonuschars 2018-11-29 06:54:36 -05:00
TehRealSalt
97f0dc3875 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-29 05:36:45 -05:00