Commit Graph

2755 Commits

Author SHA1 Message Date
Monster Iestyn 6e839d30a2 Merge branch 'master' into next 2018-11-27 15:31:28 +00:00
Monster Iestyn 95e13d9ad3 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 1889c36dea 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 b0474084f8 Actually both libpng names are in the wild 2018-11-27 02:30:31 -05:00
mazmazz 0314469c7e Changelog version for main package 2018-11-27 02:14:47 -05:00
mazmazz 7c343d0f69 Fix debian desktop icon 2018-11-27 02:11:57 -05:00
mazmazz ce32413633 Smarter libgme ldflag detection 2018-11-27 01:51:22 -05:00
mazmazz e099d2aaf2 Tar-ignore options for main deb 2018-11-27 01:26:32 -05:00
mazmazz e4ce0ab9f1 Merge remote-tracking branch 'public-gitlab/master' into 21-deb 2018-11-27 01:18:00 -05:00
mazmazz 5599fe61a5 Main deb tweaks 2018-11-27 01:17:34 -05:00
mazmazz e7ae21a61c Separate asset files from clean step; No more hacky NOCLEAN file 2018-11-27 00:49:07 -05:00
mazmazz 349308ef01 Do not clean files before source building 2018-11-27 00:39:34 -05:00
mazmazz 77bf02f02e Don't clean files on Launchpad build 2018-11-26 23:02:02 -05:00
mazmazz f6bde1844e Keep the assets/ files; ignore the assets/debian/tmp files in source packaging 2018-11-26 22:39:22 -05:00
mazmazz 6a80cc60b6 Only package debian/tmp/[data]/file in asset source package; extra instructions 2018-11-26 22:23:44 -05:00
mazmazz 0062fded19 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 b7f7c2ecf7 PK3: fixup support for newer version of zlib 2018-11-26 20:08:26 -05:00
Alam Ed Arias 9a042cd5e2 Merge branch 'master' into next 2018-11-26 19:49:19 -05:00
Alam Ed Arias 776e920895 TravisCI: need WFLAGS for cmake builds 2018-11-26 19:39:36 -05:00
Alam Ed Arias 5ba788e089 Revert "TravisCi: remove WFLAGS"
This reverts commit fd12e85697.
2018-11-26 19:38:30 -05:00
Alam Ed Arias 78a1931bdf Makefile: disable implicit-fallthroug warnings 2018-11-26 19:38:14 -05:00
Alam Ed Arias 5a3f469593 Makefile: skip implicit-fallthroug warnings 2018-11-26 19:28:55 -05:00
Alam Ed Arias fd12e85697 TravisCi: remove WFLAGS 2018-11-26 19:20:12 -05:00
Alam Ed Arias ac2ec6c982 Makefile: disable some warnings for GCC 8.x 2018-11-26 19:01:40 -05:00
Alam Ed Arias 4e332b3848 Fix MSVC build 2018-11-26 18:27:07 -05:00
Digiku a2678dcb2e 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 fd891aa21d "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 4b0d45afd8 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 9940b53742
Merge pull request #348 from Nevur/PK3-BackportNext
Pk3 backport next
2018-11-26 20:14:45 +00:00
mazmazz b5000f1151 More debian 2.1.21 tweaks; update some copyright info to STJr 2018-11-26 14:40:59 -05:00
MonsterIestyn b53cd70201
Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00:00
mazmazz e615784248 Debian control syntax fix 2018-11-26 09:08:39 -05:00
mazmazz b3262bfd4e Debian package version to 2.1.21-beta~1 2018-11-26 09:07:21 -05:00
mazmazz ac2e93abbb LibGME debian rules hack 2018-11-26 09:06:53 -05:00
Monster Iestyn a71ca1d259 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 9e025cfd33 Debian packaging adjustments 2018-11-26 07:11:10 -05:00
Steel Titanium ba111d42ca Last minute changes. 2018-11-26 00:24:11 -05:00
Steel Titanium cf01e820c4 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 930835f1a2 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
Monster Iestyn 1c5bd554c2 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 1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
Steel Titanium 7d4c9dda91 Add newline to end of file 2018-11-25 14:24:50 -05:00
Steel Titanium 981a1192fb Save sound toggles to config 2018-11-25 14:22:52 -05:00
Monster Iestyn aaabf062b8 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 5069acb110 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 028236006b 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 8b4a64ac05 Merge branch 'last-min-cleanup' into 'master'
Last min cleanup

See merge request STJr/SRB2!342
2018-11-25 10:14:34 -05:00
Monster Iestyn 11cb2e05ba Merge branch 'cmake-use-internal-libs' into 'master'
CMake: Use internal libs.

See merge request STJr/SRB2!325
2018-11-25 09:33:50 -05:00
Monster Iestyn 85305791d8 Merge branch 'objectplace-skybox-fix' into 'next'
Objectplace skybox fix.

See merge request STJr/SRB2!319
2018-11-25 09:30:16 -05:00
mazmazz e4d7ba39a9 Whitespace 2018-11-25 08:17:57 -05:00