Commit graph

2643 commits

Author SHA1 Message Date
Digiku
d6dd0c8fef Merge branch 'joystick-juggling-two' into 'next'
Joystick additions for menu, axis defaults, and vertical look toggle

See merge request STJr/SRB2!359
2018-12-03 22:59:19 -05:00
Digiku
a6a1b12a44 Merge branch 'gc-menus' into 'next'
Make mappable buttons for System Menu, Screenshot, Movie, and Viewpoint

See merge request STJr/SRB2!358
2018-12-03 22:58:43 -05:00
mazmazz
22232847e2 Hardcode Screenshot, GIF, and Viewpoint to their F keys 2018-12-03 13:21:16 -05:00
mazmazz
3bdb738888 thisjoyaiming fix for chasefreelook 2018-12-03 13:13:01 -05:00
mazmazz
861b35dea4 Revert "Make pause key bring up the menu if it's a joy button"
This reverts commit 44bec22793.
2018-12-03 13:11:48 -05:00
mazmazz
4ad7cdc684 Menu for joy first/third person vertical look 2018-12-03 13:10:49 -05:00
mazmazz
0e25ec9309 Add Joy2 for network abort 2018-12-03 13:10:47 -05:00
mazmazz
44bec22793 Make pause key bring up the menu if it's a joy button
* Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames
2018-12-03 13:10:27 -05:00
mazmazz
098f02fc95 Reset vertical look when toggling joyaiming 2018-12-03 13:10:24 -05:00
mazmazz
24ff6bc279 Add alwaysfreelook to joystick menu 2018-12-03 13:10:20 -05:00
mazmazz
faeb2ff430 Add joyaiming qualifier for joystick look up/down 2018-12-03 13:10:19 -05:00
mazmazz
3a72325355 Preserve event ch for other responders 2018-12-03 13:10:18 -05:00
mazmazz
a6ce80e9f4 Make M_Responder respond to joy buttons only in-menu (multiplayer bug?) 2018-12-03 13:10:16 -05:00
mazmazz
ad9f7853f4 Change PC axis defaults to 360-friendly values 2018-12-03 13:10:15 -05:00
mazmazz
00fb8d4853 Remap menu actions to better joy keys 2018-12-03 13:10:12 -05:00
mazmazz
7e6ab56dde Unneeded input header in st_stuff 2018-12-03 12:36:42 -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
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
MonsterIestyn
c7362be232 Merge branch 'next' into lua_mapchange 2018-12-02 20:54:32 +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
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
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
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
Monster Iestyn
eefbb82cfb Merge branch 'save-soundmenu-toggles' into 'master'
Save sound toggles to config

See merge request STJr/SRB2!348
2018-11-27 10:07:06 -05:00
Monster Iestyn
0109382cb9 add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?) 2018-11-27 13:57:32 +00:00
mazmazz
e9130915cc Actually both libpng names are in the wild 2018-11-27 02:30:31 -05:00
mazmazz
321e17cc63 Changelog version for main package 2018-11-27 02:14:47 -05:00
mazmazz
9d99bf3e36 Fix debian desktop icon 2018-11-27 02:11:57 -05:00
mazmazz
93508c088a Smarter libgme ldflag detection 2018-11-27 01:51:22 -05:00
mazmazz
a41164ed4b Tar-ignore options for main deb 2018-11-27 01:26:32 -05:00
mazmazz
eeff6669c7 Merge remote-tracking branch 'public-gitlab/master' into 21-deb 2018-11-27 01:18:00 -05:00
mazmazz
5cd9eeff03 Main deb tweaks 2018-11-27 01:17:34 -05:00