Commit graph

4684 commits

Author SHA1 Message Date
mazmazz
8e190932e7 Add gc_systemmenu from Kart 2018-12-03 11:21:25 -05:00
Digiku
1b6ec9fd33 Merge branch 'new-install' into 'master'
Add new Windows installer scripts

See merge request STJr/SRB2!356
2018-12-03 07:45:05 -05:00
mazmazz
d8e70c32e0 Remove console messages for joynames 2018-12-03 05:39:10 -05:00
mazmazz
19d19543b7 Copy string from SDL_JoystickNameForIndex before the subsystem is shut down 2018-12-03 05:37:07 -05:00
mazmazz
9186f259cb Adjustments 2018-12-03 04:55:25 -05:00
mazmazz
5687c3b0e6 A README line 2018-12-03 01:43:27 -05:00
mazmazz
6694b203e0 Finishing touches 2 2018-12-03 01:06:25 -05:00
TehRealSalt
5658f69ba7 Merge branch 'master' into next 2018-12-03 01:00:17 -05:00
mazmazz
d4718fa6d1 Add new Windows installer scripts 2018-12-03 00:53:29 -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
Monster Iestyn
978a28004d 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
13b0e9c3c5 make menu respond to joystick axis events without joyscale having to be 0 2018-12-02 21:18:28 +00:00
MonsterIestyn
10832db244
Merge branch 'next' into lua_mapchange 2018-12-02 20:54:32 +00:00
Monster Iestyn
a63ba7084a 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
ce4e63a366 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
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
Steel Titanium
0f11116e7b Fix up controller menu support 2018-12-01 20:13:14 -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
Sryder
bc1f08f89d 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
c5e8e0badb Merge branch 'master' into tiny-makefile-fix 2018-11-29 21:57:47 +00: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