Commit graph

4673 commits

Author SHA1 Message Date
TehRealSalt
bd85b2d550 Update the patch.kart hash. Again. 2018-12-03 00:21:11 -05:00
Sal
c9dc935a5c 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
4c14e26f94 AXISBRAKE, take out GameController stuff for now 2018-12-02 19:33:09 -06:00
Alam Arias
3a23d9c4a8 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
Monster Iestyn
bc35851417 add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus 2018-12-02 21:52:30 +00:00
Monster Iestyn
6cdcd8ea0f make menu respond to joystick axis events without joyscale having to be 0 2018-12-02 21:18:28 +00:00
MonsterIestyn
c7362be232 Merge branch 'next' into lua_mapchange 2018-12-02 20:54:32 +00:00
Monster Iestyn
dadaf83e41 Disable the axis parts of I_GetJoystickEvents and its player2 counterpart.
(This is what I should have done in the first place)
2018-12-02 17:42:51 +00:00
Monster Iestyn
2d2088fd85 Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet 2018-12-02 17:12:05 +00:00
Monster Iestyn
bff7fceb27 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
10523216e0 Merge remote-tracking branch 'remotes/origin/master' into unfuck-gamepads 2018-12-02 02:01:51 -06:00
wolfy852
969164cfd1 Potentially fix spectators floating when inputting right on the analog stick. 2018-12-02 02:01:06 -06:00
TehRealSalt
6a8913e192 Back to numstarposts/2 2018-12-02 02:29:47 -05:00
TehRealSalt
f9f37e246a Wrong color for UFO fireworks 2018-12-01 23:08:42 -05:00
TehRealSalt
9d5a3f50c8 Fireworks carry momentum, UFOs spawn fireworks 2018-12-01 20:48:19 -05:00
Steel Titanium
058dedb2ab Fix up controller menu support 2018-12-01 20:13:14 -05:00
TehRealSalt
b5468447b7 Forgotten include 2018-11-30 17:07:30 -05:00
Monster Iestyn
2ebbefa735 Merge branch 'master' into next 2018-11-30 21:09:32 +00:00
Monster Iestyn
2e12cf411d Backport the Blockmap library I made two years ago 2018-11-30 17:11:11 +00:00
Jimita
a32fb94e09 Merge branch 'next' into lua_mapchange 2018-11-30 15:10:59 -02:00
MPC
e745cb60fc Change MapChange so Lua returns the map number you change 2018-11-30 14:01:40 -03:00
Monster Iestyn
5f946f0f85 Free lump names *before* either lumpinfo or the WAD itself! 2018-11-30 14:19:47 +00:00
TehRealSalt
938fa3c583 Add TC_ to dehacked 2018-11-30 03:43:16 -05:00
TehRealSalt
2b3c17af62 Do 800 instead 2018-11-30 03:36:44 -05:00
TehRealSalt
9a96ca84f9 Un-nerf Mines on activation tic 2018-11-30 03:09:49 -05:00
TehRealSalt
33946b7879 Colormap crash fix 2018-11-30 03:09:01 -05:00
TehRealSalt
6d6b6a1e6b Update GPL notice 2018-11-30 00:15:14 -05:00
TehRealSalt
e9575f3d28 Fix this memory freeing 2018-11-29 22:31:20 -05:00
Sryder
4deb9950ca Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2018-11-29 22:26:26 +00:00
Sryder
7836dce57d Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git 2018-11-29 22:19:54 +00:00
Sryder
696ab280d0 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
Sryder
0847d7e29d Fix 2 of the Unsuffixed Float Constant warnings
The other one is related to M_PI for me, which I'm still not sure about where it's getting it from
2018-11-29 22:12:14 +00:00
Sryder
ac8b4ce598 Merge branch 'master' into tiny-makefile-fix 2018-11-29 21:57:47 +00:00
Sal
1337624f89 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
561c8a3d79 Reimplement png warning 2018-11-29 11:16:40 -05:00
TehRealSalt
2a1a572d39 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 10:26:38 -05:00
TehRealSalt
cf866c706f Enable pk3 in addons menu 2018-11-29 10:07:53 -05:00
TehRealSalt
e1c71f652d Fixes to merge process 2018-11-29 10:07:35 -05:00
TehRealSalt
3a915c857e Merge branch 'master' into merge-next 2018-11-29 09:46:46 -05:00
Monster Iestyn
4f7daecf65 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
c5d1950002 Rename "giveadmin" and "removeadmin" to "promote" and "demote" 2018-11-29 07:58:26 -06:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Sal
b40e666f6f 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
dbacaaaf5e Update patch.kart hash 2018-11-29 08:04:41 -05:00
Sal
c3dd0de911 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
68f465f7a6 Remove in death pits 2018-11-29 07:50:58 -05:00
TehRealSalt
ef19830c31 Set indirectitemcooldown for SPB/Shrink drops 2018-11-29 07:49:34 -05:00
Sal
171e54d251 Merge branch 'mobjdamage-hook' into 'master'
Lua "damage" hooks

See merge request KartKrew/Kart!115
2018-11-29 07:16:22 -05:00
TehRealSalt
c42089a025 Merge branch 'possibly-better-turn' 2018-11-29 07:13:24 -05:00
TehRealSalt
d5abeafc91 Update credits for bonuschars 2018-11-29 06:54:36 -05:00