Gavin Bisesi
2d400e55c7
Add OSX build flag to travis yml
2014-06-25 11:33:40 -04:00
Gavin Bisesi
0e7a5e582c
Merge pull request #129 from VanNostrand/doc
...
Recompiled usermanual.
2014-06-25 10:12:12 -04:00
Mark Morschhäuser
312acb3402
Recompiled usermanual.
2014-06-25 09:16:00 +02:00
Daenyth
aee86ce45a
Mark QGraphicsItem for AbstractGraphicsItem
2014-06-25 01:53:19 -04:00
Daenyth
1c9540befa
Set cmake module path to local for findqtmobility
2014-06-25 01:48:30 -04:00
Daenyth
0eb00fe39c
Add build-essential to travis cfg
...
This can't be causing the failure can it? It can't find QtMultimedia..
2014-06-25 01:31:43 -04:00
Daenyth
5ea59908a8
Cache apt for travis
2014-06-25 01:29:06 -04:00
Daenyth
8a331e30c6
Don't install qtmultimedia - not needed
2014-06-25 01:24:14 -04:00
Daenyth
44445704e7
Install qt-multimedia-dev for travis
2014-06-25 01:21:24 -04:00
Daenyth
ba1fc86f29
Install qt dep for travis
2014-06-25 01:18:52 -04:00
Daenyth
478c7f234f
Set up dependencies for travis
2014-06-25 01:17:12 -04:00
Daenyth
0dd4661b7c
Add travis build icon to README
2014-06-25 01:14:43 -04:00
Daenyth
0b87821497
Add rough draft for .travis.yml
2014-06-25 01:08:41 -04:00
Daenyth
d811fee2f3
Include missing qdebug
...
Dunno how I missed that.
Fix #128
2014-06-25 00:11:55 -04:00
Gavin Bisesi
65f59747c9
Merge pull request #116 from ctrlaltca/feature-cpack
...
Use cpack to create osx's dmg
2014-06-24 21:08:57 -04:00
Daenyth
e5d9692d78
Fall back to plain text load when xml load fails
2014-06-24 00:14:59 -04:00
Daenyth
0420f4f7af
Log download failures
2014-06-23 23:44:13 -04:00
Daenyth
632e7f487c
Add debugging to file for windows
2014-06-23 23:15:53 -04:00
Daenyth
e925403bc5
Log cardname when downloading
2014-06-23 22:18:40 -04:00
ctrlaltca
36e4b84ba7
Merge pull request #2 from Daenyth/feature-cpack
...
Check for path creation failure
2014-06-23 08:43:07 +02:00
Daenyth
ea08fe168c
Fix Q_INTERFACES warnings
...
Fix #88
2014-06-22 22:32:53 -04:00
Daenyth
4574df0a2e
Remove testclient cmake option.
...
This has been obsolete a long time
2014-06-22 21:25:57 -04:00
Daenyth
e5d15e8dbc
Notify deck editor when price feature setting is changed
...
Ref #112
2014-06-22 21:20:14 -04:00
Daenyth
951f08dd11
Update CentOS doc in user manual
...
Ref #109
2014-06-22 20:50:49 -04:00
Daenyth
c54f7b9245
Log on failed path copy
2014-06-22 20:14:22 -04:00
Daenyth
3e43429f13
Merge branch 'feature-cpack' of github.com:Daenyth/Cockatrice into feature-cpack
2014-06-22 20:08:30 -04:00
Fabio Bas
2ca145f908
Merge branch 'feature-cpack' of https://github.com/ctrlaltca/Cockatrice into feature-cpack
2014-06-22 23:44:04 +02:00
Fabio Bas
66c87a1ee6
OSX: Handle sounds for first time installations
...
If the sounds path is unset in the settings and a “sounds” directory
doesn’t exists in the user’s data directory, install the sounds files
and set the settings value accordingly
2014-06-22 23:42:12 +02:00
Fabio Bas
d06d64537e
Zonebg: avoid installing the CMakeLists.txt file
2014-06-22 23:42:12 +02:00
Fabio Bas
0b4701c42f
OSX: Handle zonebg for first time installations
...
If none of the gameboard images is set and and the user’s data
directory doesn’t contain a “zonebg” directory, create the directory,
copy contents from cockatrice’s app bundle and sets the config
accordingly.
2014-06-22 23:42:12 +02:00
Fabio Bas
55c4c464e4
OSX: get translation path from qt.conf instead of hardcoding it
2014-06-22 23:41:15 +02:00
Fabio Bas
2eebddea9a
Port "make package" fix to oracle and servatrice
2014-06-22 23:41:15 +02:00
Fabio Bas
2a5f6181aa
Osx: removed plugins path detection and fixed translation path detection
2014-06-22 23:41:15 +02:00
Fabio Bas
b44365b73c
This finally fixes both make install and make package
2014-06-22 23:41:15 +02:00
Fabio Bas
6d1de0c617
Partially revert previous commits; ensure the bundle is fixed up correctly
2014-06-22 23:41:15 +02:00
Fabio Bas
1b2c839ff0
osx: install sounds and zonebg as cockatrice's resources
2014-06-22 23:41:15 +02:00
Fabio Bas
41c7ce8022
Fix qt.conf file creation for "make package"
2014-06-22 23:41:15 +02:00
Fabio Bas
99f3519da5
Workaround permission problem in ixup_bundle
...
Without this change, make install and make package would require “sudo”
under osx
2014-06-22 23:41:15 +02:00
Fabio Bas
377433b5cc
CPack generator; removed old prepareMacRelease.sh
...
By now tested on OSX only
2014-06-22 23:41:15 +02:00
Fabio Bas
fef005d042
OSX: Handle sounds for first time installations
...
If the sounds path is unset in the settings and a “sounds” directory
doesn’t exists in the user’s data directory, install the sounds files
and set the settings value accordingly
2014-06-22 23:29:42 +02:00
Fabio Bas
d396b3dfac
Zonebg: avoid installing the CMakeLists.txt file
2014-06-22 23:24:44 +02:00
Fabio Bas
45c71c09cd
OSX: Handle zonebg for first time installations
...
If none of the gameboard images is set and and the user’s data
directory doesn’t contain a “zonebg” directory, create the directory,
copy contents from cockatrice’s app bundle and sets the config
accordingly.
2014-06-22 23:21:29 +02:00
Gavin Bisesi
1260ccc531
Merge pull request #111 from Daenyth/better-invalid-db-ux
...
Don't be a jerk when card database isn't usable.
2014-06-22 15:28:45 -04:00
Fabio Bas
2b371fd96b
OSX: get translation path from qt.conf instead of hardcoding it
2014-06-22 21:19:10 +02:00
Fabio Bas
8305927fa2
Port "make package" fix to oracle and servatrice
2014-06-22 21:11:39 +02:00
Fabio Bas
77d41160b8
Merge remote-tracking branch 'upstream/master' into feature-cpack
2014-06-22 20:01:24 +02:00
Daenyth
68c0932a2f
Don't have decklist sort behavior rely on column order
2014-06-22 08:36:35 -04:00
Daenyth
e99c1bbe6d
Merge remote-tracking branch 'origin/master' into editor-sorting-v5
2014-06-22 08:10:22 -04:00
Gavin Bisesi
ab3b3f3bae
Merge pull request #106 from VanNostrand/doc
...
Added Mac OS X build instructions.
2014-06-22 07:53:58 -04:00
Daenyth
27847e1551
Don't be a jerk when card database isn't usable.
...
Better error message and allow the user to still connect
Ref: #102
2014-06-21 15:53:13 -04:00
