Commit graph

2806 commits

Author SHA1 Message Date
mazmazz
7e6ab56dde Unneeded input header in st_stuff 2018-12-03 12:36:42 -05:00
mazmazz
a7b12b3ce5 Use static joyname instead of malloc 2018-12-03 12:35:12 -05:00
mazmazz
736b5175da Missed (unused?) viewpoint strings 2018-12-03 12:20:19 -05:00
mazmazz
fd985d0d51 Forgot config strings for menu keys 2018-12-03 12:19:41 -05:00
mazmazz
235b80894c Make F12 spectator string constant because of wrapping issues 2018-12-03 12:13:36 -05:00
mazmazz
16c7c98ef9 Change spectator string for "Press F12 to watch" 2018-12-03 12:11:03 -05:00
mazmazz
8aa4575bc1 Add gc_viewpoint from Kart 2018-12-03 11:50:57 -05:00
mazmazz
ec361ee6ac Add gc_screenshot and gc_recordgif from Kart 2018-12-03 11:31:48 -05:00
mazmazz
0e52208384 Add gc_systemmenu from Kart 2018-12-03 11:21:25 -05:00
Digiku
d6db188768 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
8fd8fca5f7 Remove console messages for joynames 2018-12-03 05:39:10 -05:00
mazmazz
856f826afb Copy string from SDL_JoystickNameForIndex before the subsystem is shut down 2018-12-03 05:37:07 -05:00
mazmazz
2295a9853a Adjustments 2018-12-03 04:55:25 -05:00
mazmazz
42a35ee7f5 A README line 2018-12-03 01:43:27 -05:00
mazmazz
bddb9c10bd Finishing touches 2 2018-12-03 01:06:25 -05:00
mazmazz
ed84070241 Add new Windows installer scripts 2018-12-03 00:53:29 -05: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
94ad0b880f Merge branch 'next' into 21-version
# Conflicts:
#	src/d_netcmd.c
2018-12-02 15:45:07 +00:00
Monster Iestyn
e5b0dc9111 Merge branch 'multiadmin-backport' into '21-version'
Multi-Admin Backport

See merge request STJr/SRB2!351
2018-12-02 10:34:57 -05:00
wolfy852
fb8b5fe749 s 2018-12-02 09:08:05 -06:00
wolfy852
08d3587eac Fix a dumb mistake 2018-12-02 08:57:35 -06: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
Steel Titanium
058dedb2ab Fix up controller menu support 2018-12-01 20:13:14 -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
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
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
beb58c55ac I must be some kind of idiot. 2018-11-29 07:34:05 -06:00
wolfy852
66dde279b3 Fix a quick merge mistake. 2018-11-29 07:15:54 -06:00
TehRealSalt
a71644f230 IsPlayerAdmin support, since admin was removed
# Conflicts:
#	src/lua_baselib.c
2018-11-29 07:12:15 -06:00
Wolfy
42fc67a639 Remove hardcoded limit on admins
# Conflicts:
#	src/d_netcmd.c
2018-11-29 07:05:49 -06:00
Wolfy
cabe9871e3 Multiple admins
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
2018-11-29 06:46:59 -06:00
Digiku
aaa3d6c1cc Merge branch '21-deb' into 'master'
Update debian packaging to work with Launchpad PPA

See merge request STJr/SRB2!350
2018-11-29 04:20:30 -05:00
mazmazz
e09b1446f4 Add wget to assets deb depends 2018-11-27 18:16:20 -05:00
Monster Iestyn
d2c822c583 backport string len tweaks I made to LUA_LoadLump in internal 2018-11-27 23:06:31 +00:00
Monster Iestyn
b4838e3afa remove redundant wadfile loop within wadfile loop for ANIMDEFS code 2018-11-27 23:05:33 +00:00
mazmazz
d29f9dbbe3 Fix i386 Launchpad build by commenting out pkg-config hacks 2018-11-27 16:47:00 -05:00
Monster Iestyn
a6a4b74692 Merge branch '21-controls' into 'next'
Default control changes for 2.1.21

See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
mazmazz
f17ba0ad37 Move binary routine to binary-arch for Launchpad 2018-11-27 11:05:34 -05:00
Monster Iestyn
f526d99a27 use UINT8 * instead of void or Bytef * 2018-11-27 15:49:41 +00:00
Monster Iestyn
51d2f52dea Merge branch 'master' into next 2018-11-27 15:31:28 +00:00