ccf5c9d040
Merge branch 'installer-followup' into 'master'
...
Forgot a gitignore
See merge request STJr/SRB2!362
2018-12-03 22:17:06 -05:00
6b4f33397f
Forgot a gitignore
2018-12-03 22:16:38 -05:00
f9744bd2a5
Merge branch 'installer-followup' into 'master'
...
Installer followup
See merge request STJr/SRB2!361
2018-12-03 22:15:14 -05:00
15f584ecc6
Installer followup
...
* Check if administrator rights are required
* Add INSTALL INSTRUCTIONS text file to root install folder in case the installer fails
* Add failsafes to uninstaller file deletion: check if name is a folder, and check for illegal chars
* Fixed parentheses breaking the installer by instead making exclamation marks do the breaking. Thanks Windows!
2018-12-03 22:12:13 -05:00
1b6ec9fd33
Merge branch 'new-install' into 'master'
...
Add new Windows installer scripts
See merge request STJr/SRB2!356
2018-12-03 07:45:05 -05:00
9186f259cb
Adjustments
2018-12-03 04:55:25 -05:00
5687c3b0e6
A README line
2018-12-03 01:43:27 -05:00
6694b203e0
Finishing touches 2
2018-12-03 01:06:25 -05:00
d4718fa6d1
Add new Windows installer scripts
2018-12-03 00:53:29 -05:00
b1c41a193b
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
93b6503773
Add wget to assets deb depends
2018-11-27 18:16:20 -05:00
0d5d0b2f27
Fix i386 Launchpad build by commenting out pkg-config hacks
2018-11-27 16:47:00 -05:00
559cf93e4a
Move binary routine to binary-arch for Launchpad
2018-11-27 11:05:34 -05:00
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
b0474084f8
Actually both libpng names are in the wild
2018-11-27 02:30:31 -05:00
0314469c7e
Changelog version for main package
2018-11-27 02:14:47 -05:00
7c343d0f69
Fix debian desktop icon
2018-11-27 02:11:57 -05:00
ce32413633
Smarter libgme ldflag detection
2018-11-27 01:51:22 -05:00
e099d2aaf2
Tar-ignore options for main deb
2018-11-27 01:26:32 -05:00
e4ce0ab9f1
Merge remote-tracking branch 'public-gitlab/master' into 21-deb
2018-11-27 01:18:00 -05:00
5599fe61a5
Main deb tweaks
2018-11-27 01:17:34 -05:00
e7ae21a61c
Separate asset files from clean step; No more hacky NOCLEAN file
2018-11-27 00:49:07 -05:00
349308ef01
Do not clean files before source building
2018-11-27 00:39:34 -05:00
77bf02f02e
Don't clean files on Launchpad build
2018-11-26 23:02:02 -05:00
f6bde1844e
Keep the assets/ files; ignore the assets/debian/tmp files in source packaging
2018-11-26 22:39:22 -05:00
6a80cc60b6
Only package debian/tmp/[data]/file in asset source package; extra instructions
2018-11-26 22:23:44 -05:00
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
776e920895
TravisCI: need WFLAGS for cmake builds
2018-11-26 19:39:36 -05:00
5ba788e089
Revert "TravisCi: remove WFLAGS"
...
This reverts commit fd12e85697
2018-11-26 19:38:30 -05:00
78a1931bdf
Makefile: disable implicit-fallthroug warnings
2018-11-26 19:38:14 -05:00
5a3f469593
Makefile: skip implicit-fallthroug warnings
2018-11-26 19:28:55 -05:00
fd12e85697
TravisCi: remove WFLAGS
2018-11-26 19:20:12 -05:00
ac2ec6c982
Makefile: disable some warnings for GCC 8.x
2018-11-26 19:01:40 -05:00
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
b5000f1151
More debian 2.1.21 tweaks; update some copyright info to STJr
2018-11-26 14:40:59 -05:00
e615784248
Debian control syntax fix
2018-11-26 09:08:39 -05:00
b3262bfd4e
Debian package version to 2.1.21-beta~1
2018-11-26 09:07:21 -05:00
ac2e93abbb
LibGME debian rules hack
2018-11-26 09:06:53 -05:00
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
9e025cfd33
Debian packaging adjustments
2018-11-26 07:11:10 -05:00
ba111d42ca
Last minute changes.
2018-11-26 00:24:11 -05:00
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
930835f1a2
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
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
7d4c9dda91
Add newline to end of file
2018-11-25 14:24:50 -05:00
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
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
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
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
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
Digiku