Vinyl Darkscratch
b81474512c
Update Conanfile
2018-12-28 02:12:08 -08:00
Vinyl Darkscratch
0a4ab04161
Merge remote-tracking branch 'origin/linux'
2018-12-28 02:08:07 -08:00
KockaAdmiralac
6ebb92c6b9
Fix crash when XDG_CURRENT_DESKTOP isn't defined
2018-12-19 22:19:18 +01:00
Vinyl Darkscratch
125491e62a
Merge remote-tracking branch 'Ancurio-MKXP/master'
2018-12-16 10:07:25 -08:00
Vinyl Darkscratch
784f129391
Add logging for desktop background changes
2018-12-11 09:54:18 -08:00
Vinyl Darkscratch
6fa401aa2d
Bump version number
2018-12-11 09:54:06 -08:00
Vinyl Darkscratch
7c79883bc4
Fix linkage of libsteam_api.dylib on macOS
2018-12-11 09:53:58 -08:00
Vinyl Darkscratch
6d23c773aa
Merge branch 'master' into linux
2018-10-15 00:05:25 -07:00
Vinyl Darkscratch
b43dbceb7f
Merge remote-tracking branch 'elizagamedev/master'
2018-10-14 00:59:06 -07:00
Eliza Velasquez
c096f6f020
Fix October bug
2018-10-13 18:49:57 +00:00
Eliza Velasquez
bab22d87be
Fix font enumeration
...
Currently, the font enumeration callback erroneously stops searching if
it finds any files that aren't fonts. In the case that you have, say, a
desktop.ini or a .DS_Store or a license file, it may prevent all of the
fonts from being loaded. This commit resolves this.
2018-10-13 20:28:36 +02:00
Vinyl Darkscratch
95eec5e482
Temporarily revert to Makefile for macOS
2018-10-11 04:46:48 -07:00
Vinyl Darkscratch
9aacb5f136
Fix cleanup script and update Conan + CMakeLists to fix errors
2018-10-10 18:46:10 -07:00
Vinyl Darkscratch
755f7c3b15
Merge remote-tracking branch 'elizagamedev/master'
2018-10-10 18:45:06 -07:00
Eliza Velasquez
4a0cb0b453
Fix physfs & ruby bugs and build for steam
2018-10-11 00:24:41 +00:00
Vinyl Darkscratch
6554a6e43f
Fix choice crash when Action+Cancel pressed simultaneously
2018-10-07 14:27:07 -07:00
Vinyl Darkscratch
a7e40364e8
Prevent index from going past array size
2018-10-07 14:26:43 -07:00
Vinyl Darkscratch
5d101bd6f1
Merge remote-tracking branch 'elizagamedev/master'
2018-10-07 11:32:41 -07:00
Eliza Velasquez
d24677129e
Use bincrafters' sigc++
2018-10-07 18:25:53 +00:00
Eliza
0773b52aae
Merge pull request #19 from GooborgStudios/master
...
Re-add case-insensitive search for "fonts" folder, update steamshim's CMake instructions
2018-10-07 14:19:06 -04:00
Vinyl Darkscratch
65b9854d83
Style fix
2018-10-07 11:13:20 -07:00
Vinyl Darkscratch
6be62bc492
Merge branch 'qmake-to-cmake'
2018-10-07 11:12:53 -07:00
Vinyl Darkscratch
eb995df65a
Add case-insensitive search for fonts folder
2018-10-07 11:12:39 -07:00
Vinyl Darkscratch
a9b6d085c5
Merge branch 'master' into qmake-to-cmake
2018-10-07 10:54:37 -07:00
Vinyl Darkscratch
69f32df495
Merge remote-tracking branch 'elizagamedev/master'
2018-10-07 10:54:23 -07:00
Vinyl Darkscratch
0deb8e67c2
Only build Steamshim if building for Steam
2018-10-07 10:54:11 -07:00
Vinyl Darkscratch
8aa3f1dcfc
Look for Steamworks in local path
2018-10-07 10:53:34 -07:00
Eliza Velasquez
b0affd0b76
Miscellaneous fixes
2018-10-07 17:45:45 +00:00
Eliza
3c1db555d5
Merge pull request #18 from GooborgStudios/master
...
Submit all macOS & Linux updates, plus additional bug fixes
2018-10-07 13:39:18 -04:00
Vinyl Darkscratch
ea50467100
Merge branch 'master' into qmake-to-cmake
2018-10-07 10:33:33 -07:00
Vinyl Darkscratch
87d40559fd
Use normal Ruby
2018-10-07 10:09:58 -07:00
Vinyl Darkscratch
ba53c20972
Update CMakeLists for Steamshim
2018-10-07 10:09:50 -07:00
Vinyl Darkscratch
02c9c6f6e4
Disable redundant JPG support
2018-10-06 19:31:58 -07:00
Vinyl Darkscratch
01a244c040
Merge branch 'qmake-to-cmake'
2018-10-06 19:31:37 -07:00
Vinyl Darkscratch
43254b7df6
Update Cleanup script for Windows
2018-10-06 18:28:14 -07:00
Vinyl Darkscratch
86a9e1ece1
Remove Info.plist
2018-10-06 18:27:51 -07:00
Vinyl Darkscratch
ba8217b6b3
Merge branch 'master' into qmake-to-cmake
2018-10-06 18:25:01 -07:00
Vinyl Darkscratch
183e1e8ecc
Update .gitignore
2018-10-06 18:24:56 -07:00
Vinyl Darkscratch
bcb9b838f2
Temporarily disable CMake Steamshim on Windows
2018-10-06 18:23:56 -07:00
Vinyl Darkscratch
a86b1d8d29
Fix Steamshim path
2018-10-06 18:23:24 -07:00
Vinyl Darkscratch
a80aec9f61
Merge branch 'qmake-to-cmake'
2018-10-06 18:18:59 -07:00
Vinyl Darkscratch
8f473733e6
Ignore Steamworks folder
2018-10-06 18:18:27 -07:00
Vinyl Darkscratch
e599cc1c54
Merge Steamshim CMake into master CMake
2018-10-06 18:17:03 -07:00
Vinyl Darkscratch
03326cb96d
Cleanup XXD files
2018-10-05 18:38:46 -07:00
Vinyl Darkscratch
97b3bf4a46
Merge branch 'master' into linux
2018-10-05 18:27:49 -07:00
Vinyl Darkscratch
a13dead8cf
Add macOS desktop code
2018-10-05 18:27:34 -07:00
Vinyl Darkscratch
31dcb7f904
Add bundle fixup
2018-10-05 18:27:26 -07:00
Vinyl Darkscratch
734f634995
Update macOS deployment target
2018-10-05 18:18:33 -07:00
Vinyl Darkscratch
5ea165cb36
Convert Steamshim Makefile to CMake
2018-10-05 18:14:55 -07:00
Vinyl Darkscratch
804c52a83f
Merge branch 'macos-mojave-fixes'
2018-10-04 17:51:16 -07:00