stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
2447 commits 174 branches 41 tags 300 MiB
Commit graph

2447 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
43e9524c24 Move unneeded binaries to an Old subfolder 2018-12-04 00:51:29 -05:00
mazmazz
4ec3eb9375 Update exchndl.dll to 0.9.0 
https://github.com/jrfonseca/drmingw/releases/tag/0.9.0
 2018-12-04 00:07:14 -05:00
Digiku
ba81e26f71 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
d507aa231e 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
ccf5c9d040 Merge branch 'installer-followup' into 'master' 
Forgot a gitignore

See merge request STJr/SRB2!362
 2018-12-03 22:17:06 -05:00
mazmazz
6b4f33397f Forgot a gitignore 2018-12-03 22:16:38 -05:00
Digiku
f9744bd2a5 Merge branch 'installer-followup' into 'master' 
Installer followup

See merge request STJr/SRB2!361
 2018-12-03 22:15:14 -05:00
mazmazz
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
Steel Titanium
fbb2cde800 Make this be consistent with non-CMake builds 2018-12-03 15:42:37 -05:00
Steel Titanium
a70b8bc348 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into controller-menu-touchup 2018-12-03 15:38:30 -05:00
Steel Titanium
168647275c One small change 2018-12-03 13:32:24 -05:00
Steel Titanium
8efc32b826 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
8851f39b84 Use static joyname instead of malloc 2018-12-03 12:35:12 -05:00
Digiku
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
mazmazz
d8e70c32e0 Remove console messages for joynames 2018-12-03 05:39:10 -05:00
mazmazz
19d19543b7 Copy string from SDL_JoystickNameForIndex before the subsystem is shut down 2018-12-03 05:37:07 -05:00
mazmazz
9186f259cb Adjustments 2018-12-03 04:55:25 -05:00
mazmazz
5687c3b0e6 A README line 2018-12-03 01:43:27 -05:00
mazmazz
6694b203e0 Finishing touches 2 2018-12-03 01:06:25 -05:00
mazmazz
d4718fa6d1 Add new Windows installer scripts 2018-12-03 00:53:29 -05:00
Steel Titanium
0f11116e7b Fix up controller menu support 2018-12-01 20:13:14 -05:00
Digiku
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
mazmazz
93b6503773 Add wget to assets deb depends 2018-11-27 18:16:20 -05:00
mazmazz
0d5d0b2f27 Fix i386 Launchpad build by commenting out pkg-config hacks 2018-11-27 16:47:00 -05:00
mazmazz
559cf93e4a Move binary routine to binary-arch for Launchpad 2018-11-27 11:05:34 -05: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
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
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
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
mazmazz
b5000f1151 More debian 2.1.21 tweaks; update some copyright info to STJr 2018-11-26 14:40:59 -05: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