aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1494 commits 1 branch 0 tags 51 MiB
Commit graph

1494 commits

This branch
This branch
All branches
Author SHA1 Message Date
ctrlaltca
36e4b84ba7 Merge pull request #2 from Daenyth/feature-cpack 
Check for path creation failure
 2014-06-23 08:43:07 +02:00
woogerboy21
236e0a4197 added loglevel variable 
added log filtering variable
 2014-06-23 00:09:21 -04:00
woogerboy21
5592346979 added server log filtering 
added log filtering based on configuration file setting
0 = log everything
1 = log nothing
2 = chat logging only
 2014-06-23 00:07:12 -04: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
Mark Morschhäuser
3a82669b61 Added Mac OS X build instructions. 2014-06-21 19:24:13 +02:00
Fabio Bas
e39cfb7968 Osx: removed plugins path detection and fixed translation path detection 2014-06-21 19:09:41 +02:00
Fabio Bas
f9554267d4 This finally fixes both make install and make package 2014-06-21 19:04:42 +02:00
Daenyth
38b83acae0 Fix #105 - remove emdash from card type when getting main type 2014-06-21 12:42:46 -04:00
Fabio Bas
b743ba4e6e Partially revert previous commits; ensure the bundle is fixed up correctly 2014-06-21 18:15:27 +02:00
Fabio Bas
d74703f7af osx: install sounds and zonebg as cockatrice's resources 2014-06-21 17:28:58 +02:00
Fabio Bas
87d4309aaa Fix qt.conf file creation for "make package" 2014-06-21 17:28:27 +02:00
Fabio Bas
501ef1306b Workaround permission problem in ixup_bundle 
Without this change, make install and make package would require “sudo”
under osx
 2014-06-21 16:59:31 +02:00
Gavin Bisesi
51b4eae8af Merge remote-tracking branch 'origin/master' into feature-cpack 2014-06-21 10:09:03 -04:00
Fabio Bas
f6f6b5aa02 Merge remote-tracking branch 'upstream/master' into feature-cpack 2014-06-21 16:08:33 +02:00
Fabio Bas
9edd96c05c Merge remote-tracking branch 'upstream/master' into feature-cpack 2014-06-21 15:14:30 +02:00
Gavin Bisesi
c3ad6b1f69 Merge pull request #85 from ctrlaltca/mtgjson-importer 
Mtgjson importer (fixes #84)
 2014-06-21 08:13:11 -04:00
Fabio Bas
0ec5842c3f Add an unexposed config value for the AllSets.json file url 
It will be saved only if:
* it’s different than the default (the user used a custom url);
* the download actually worked
 2014-06-21 12:10:04 +02:00
Fabio Bas
17f7fe7ad9 Don't lock the UI if the loaded file was not readable 2014-06-21 11:41:31 +02:00
Fabio Bas
1edc34f086 Add an option to force selection of save path 
By default oracle saves cards.xml to the correct path, where cockatrice
will be able to pick it up;
if oracle is not able to determine the path or the user unchecks the
option, oracle will ask for a save path
 2014-06-21 11:37:46 +02:00
Fabio Bas
bb9a79f83b Rename the finish/done button as "Save" 2014-06-21 11:25:24 +02:00
Fabio Bas
c6078c384c Strip { } around mana cost 2014-06-21 11:18:41 +02:00