mazmazz
a283d229b4
Handle Kart-specific changes; add PK3 to exttable
2018-12-15 20:50:33 -05:00
mazmazz
ede6b183b1
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
Digiku
6888db044b
Merge branch 'installer-followup' into 'master'
...
Make uninstaller a self-extractable
See merge request STJr/SRB2!367
2018-12-04 11:18:09 -05:00
mazmazz
5dba5210a6
Make uninstaller a self-extractable
2018-12-04 11:17:08 -05:00
Monster Iestyn
ca01834d2e
Merge branch 'tiny-makefile-fix' into 'master'
...
Tiny Makefile Fix
See merge request STJr/SRB2!289
2018-12-04 08:09:27 -05:00
Digiku
bf35a5a72c
Merge branch 'installer-followup' into 'master'
...
Add old-install-list.txt to explicitly define which old install files need to be moved
See merge request STJr/SRB2!366
2018-12-04 01:12:21 -05:00
mazmazz
c0aed5a7dc
Add old-install-list.txt to explicitly define which old install files need to be moved
...
Replaces MoveOldExeDlls routine in installer staging
2018-12-04 01:11:30 -05:00
Digiku
83ef924996
Merge branch 'mac-icon-update' into 'master'
...
Update OSX icon
See merge request STJr/SRB2!363
2018-12-03 23:10:28 -05:00
mazmazz
95fff25a7f
Update OSX icon
2018-12-03 23:09:54 -05:00
Digiku
ffd1f400e1
Merge branch 'controller-menu-touchup' into 'master'
...
Controller select menu improvements.
See merge request STJr/SRB2!354
2018-12-03 23:00:36 -05:00
Digiku
5c13b2fb71
Merge branch 'cmake-strings' into 'master'
...
CMake:Use commit hash and branch name.
Closes #37
See merge request STJr/SRB2!360
2018-12-03 22:58:23 -05:00
Digiku
19a63e19d6
Merge branch 'installer-followup' into 'master'
...
Forgot a gitignore
See merge request STJr/SRB2!362
2018-12-03 22:17:06 -05:00
mazmazz
c3b0e961f8
Forgot a gitignore
2018-12-03 22:16:38 -05:00
Digiku
dae1c1d6b1
Merge branch 'installer-followup' into 'master'
...
Installer followup
See merge request STJr/SRB2!361
2018-12-03 22:15:14 -05:00
mazmazz
fce935da2d
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
Steel Titanium
2797b1e428
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
Steel Titanium
b4a9c48011
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into controller-menu-touchup
2018-12-03 15:38:30 -05:00
Steel Titanium
c31c80d216
One small change
2018-12-03 13:32:24 -05:00
Steel Titanium
6d412950ec
Merge branch 'controller-names' into 'controller-menu-touchup'
...
Controller name fix
See merge request SteelTitanium/SRB2!2
2018-12-03 12:41:55 -05:00
mazmazz
a7b12b3ce5
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
Digiku
d6db188768
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
mazmazz
8fd8fca5f7
Remove console messages for joynames
2018-12-03 05:39:10 -05:00
mazmazz
856f826afb
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
mazmazz
2295a9853a
Adjustments
2018-12-03 04:55:25 -05:00
mazmazz
42a35ee7f5
A README line
2018-12-03 01:43:27 -05:00
mazmazz
bddb9c10bd
Finishing touches 2
2018-12-03 01:06:25 -05:00
mazmazz
ed84070241
Add new Windows installer scripts
2018-12-03 00:53:29 -05:00
Steel Titanium
058dedb2ab
Fix up controller menu support
2018-12-01 20:13:14 -05: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
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
mazmazz
d29f9dbbe3
Fix i386 Launchpad build by commenting out pkg-config hacks
2018-11-27 16:47:00 -05:00
mazmazz
f17ba0ad37
Move binary routine to binary-arch for Launchpad
2018-11-27 11:05:34 -05: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
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
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
