Commit graph

2810 commits

Author SHA1 Message Date
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
Digiku
e2e0069259 Merge branch 'public-nights-invertloopfix' into 'next'
NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2!300
2018-11-26 16:08:24 -05:00
Digiku
dcba8ab654 "Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk 2018-11-26 15:48:08 -05:00
Monster Iestyn
a9b813cef2 Merge branch 'opengl-noloading' into 'master'
Hide OpenGL loading screen

See merge request STJr/SRB2!349
2018-11-26 15:30:45 -05:00
MonsterIestyn
18a10861e0 Merge pull request #348 from Nevur/PK3-BackportNext
Pk3 backport next
2018-11-26 20:14:45 +00:00
mazmazz
e2a3bd18a1 More debian 2.1.21 tweaks; update some copyright info to STJr 2018-11-26 14:40:59 -05:00
MonsterIestyn
d158d7e011 Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00:00
mazmazz
3dc435bea4 Debian control syntax fix 2018-11-26 09:08:39 -05:00
mazmazz
844e44f6e2 Debian package version to 2.1.21-beta~1 2018-11-26 09:07:21 -05:00
mazmazz
bbae5738a6 LibGME debian rules hack 2018-11-26 09:06:53 -05:00
Monster Iestyn
3750e41347 Merge branch 'fof-slope-skew-backport' into 'master'
FOF wall slope skewing backport

See merge request STJr/SRB2!341
2018-11-26 08:54:29 -05:00
mazmazz
b63a17a9ca Debian packaging adjustments 2018-11-26 07:11:10 -05:00
Steel Titanium
c971171cd2 Last minute changes. 2018-11-26 00:24:11 -05:00
Steel Titanium
77d12473ae Take the command line params into account
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
mazmazz
e6be735a08 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
Monster Iestyn
a47ba390cc Merge branch 'ms-sqlexample' into 'master'
Add example SQL file.

See merge request STJr/SRB2!330
2018-11-25 15:59:17 -05:00
Monster Iestyn
d824e05a6f Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
Steel Titanium
c031801daa Add newline to end of file 2018-11-25 14:24:50 -05:00
Steel Titanium
157502310f Save sound toggles to config 2018-11-25 14:22:52 -05:00
Monster Iestyn
72fc63eb8a Merge branch 'ms-cvars-fix' into 'master'
Update server name insantly

See merge request STJr/SRB2!344
2018-11-25 14:04:12 -05:00
Monster Iestyn
358e84f56d Merge branch 'mpc-software-yslope-fix' into 'master'
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)

See merge request STJr/SRB2!282
2018-11-25 11:51:54 -05:00
Monster Iestyn
235c23ded8 Merge branch '21-copyright-followup' into 'master'
Print copyright notice in stdout console on program start

See merge request STJr/SRB2!347
2018-11-25 11:07:34 -05:00
Monster Iestyn
1983f3bfde Merge branch 'last-min-cleanup' into 'master'
Last min cleanup

See merge request STJr/SRB2!342
2018-11-25 10:14:34 -05:00