Commit graph

2730 commits

Author SHA1 Message Date
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
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
mazmazz
949bc3694a Separate asset files from clean step; No more hacky NOCLEAN file 2018-11-27 00:49:07 -05:00
mazmazz
1ca83f728a Do not clean files before source building 2018-11-27 00:39:34 -05:00
mazmazz
70615ca21b Don't clean files on Launchpad build 2018-11-26 23:02:02 -05:00
mazmazz
6a87d4dd87 Keep the assets/ files; ignore the assets/debian/tmp files in source packaging 2018-11-26 22:39:22 -05:00
mazmazz
84be3913d0 Only package debian/tmp/[data]/file in asset source package; extra instructions 2018-11-26 22:23:44 -05:00
mazmazz
efbe1c4ebd Fixed broken date strings in debian package files; skip asset download if that file already exists 2018-11-26 21:49:25 -05:00
Alam Ed Arias
62cae40426 PK3: fixup support for newer version of zlib 2018-11-26 20:08:26 -05:00
Alam Ed Arias
fc5e97dba9 Merge branch 'master' into next 2018-11-26 19:49:19 -05:00
Alam Ed Arias
30a3780ecd TravisCI: need WFLAGS for cmake builds 2018-11-26 19:39:36 -05:00
Alam Ed Arias
6373aec1b1 Revert "TravisCi: remove WFLAGS"
This reverts commit 3859d48033.
2018-11-26 19:38:30 -05:00
Alam Ed Arias
96ef08cd8f Makefile: disable implicit-fallthroug warnings 2018-11-26 19:38:14 -05:00
Alam Ed Arias
b608dd9d05 Makefile: skip implicit-fallthroug warnings 2018-11-26 19:28:55 -05:00
Alam Ed Arias
3859d48033 TravisCi: remove WFLAGS 2018-11-26 19:20:12 -05:00
Alam Ed Arias
6759240861 Makefile: disable some warnings for GCC 8.x 2018-11-26 19:01:40 -05:00
Alam Ed Arias
6dbe534c8e Fix MSVC build 2018-11-26 18:27:07 -05:00