Commit graph

2416 commits

Author SHA1 Message Date
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
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
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
mazmazz
e2a3bd18a1 More debian 2.1.21 tweaks; update some copyright info to STJr 2018-11-26 14:40:59 -05: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
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
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
Monster Iestyn
0897adcf98 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
mazmazz
91f2c4f8a7 Whitespace 2018-11-25 08:17:57 -05:00
mazmazz
564d736bb6 Add README and LICENSE to cmake install 2018-11-25 08:12:34 -05:00
mazmazz
22d0d8cb2e Print GPL license notice and SEGA disclaimer in console on start 2018-11-25 08:12:19 -05:00
Digiku
f79adecdef Merge branch '21-source-copyright' into 'master'
Update source copyrights to 2018

See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
mazmazz
951b78ee2d Update source copyrights to 2018, outdated targets 2018-11-25 07:35:53 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Digiku
bacdb3a392 Merge branch '21-credits-update' into 'master'
Extra credits update .21

See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
Steel Titanium
0023f8d7eb Update server name instantly on change 2018-11-24 21:24:05 -05:00
mazmazz
354037b251 Additional 2.1 credits update 2018-11-23 21:57:07 -05:00
Monster Iestyn
e34f2bf467 Kill CheckMissileImpact, it has been useless for probably a decade and a half 2018-11-23 23:14:49 +00:00
Monster Iestyn
24f14fc526 Merge branch 'master' into fof-slope-skew-backport
# Conflicts:
#	src/r_segs.c
2018-11-23 22:40:28 +00:00
Monster Iestyn
d6238ffbe9 Merge branch 'responsefile-fix' into 'master'
Fix M_FindResponseFile returning garbage data

See merge request STJr/SRB2!254
2018-11-23 15:59:40 -05:00
Steel Titanium
e5611eec7b Merge branch 'master' into responsefile-fix 2018-11-23 15:29:52 -05:00
Alam Arias
5fd6df3625 Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
Render the skies correctly on splitscreen in OpenGL mode
2018-11-23 14:48:05 -05:00
Alam Arias
004de4fb6d Merge pull request #325 from monster-psychic-cat/opengl_startup_screen
Render the startup screen on OpenGL mode
2018-11-23 14:47:56 -05:00
Alam Arias
7c02cfe486 Merge pull request #258 from light2yellow/master
m_fixed: asm: cc is not a register
2018-11-23 14:47:36 -05:00
Monster Iestyn
0bff44e22b Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't 2018-11-23 19:12:48 +00:00
Digiku
032d6a02fe Merge branch '21-credits-update' into 'master'
2.1.21 credits update

See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00