Commit graph

986 commits

Author SHA1 Message Date
arxanas
1217689ed6 Hash the game type. 2014-07-07 19:04:01 -04:00
arxanas
8141901679 Fix #137: Game filter preferences are saved. 2014-07-07 17:41:16 -04:00
Daenyth
4d6f46b06e Change client ping send interval to 9 sec 2014-06-29 14:46:06 -04:00
Daenyth
8d31fe6cbc Clean up deck load chat message 2014-06-28 09:04:45 -04:00
Daenyth
4c2a553f03 Have servatrice inform players of sideboard size
Ref #142
2014-06-28 00:36:43 -04:00
Daenyth
6d3fe428e7 Fix some warnings
Ref #127
2014-06-27 22:19:23 -04:00
Daenyth
1d02e0d5ec Clarify comment about typedef for OSX compiling 2014-06-27 20:00:29 -04:00
arxanas
080fd326ed Fixed #131: Compiles on OS X now. 2014-06-26 16:57:47 -04:00
Daenyth
144bb7fa89 Merge remote-tracking branch 'origin/invalid-windows-paths' 2014-06-25 20:26:46 -04:00
Gavin Bisesi
fcc62a1e1f Use defined(Q_OS_WIN) in #elif to satisfy MSVC
It's always windows.
2014-06-25 17:09:17 -04: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
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
df659e58fe Mask set shortcodes for windows illegal filenames
Ref #122
2014-06-24 20:49:03 -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
e925403bc5 Log cardname when downloading 2014-06-23 22:18:40 -04:00
Daenyth
ea08fe168c Fix Q_INTERFACES warnings
Fix #88
2014-06-22 22:32:53 -04:00
Daenyth
e5d15e8dbc Notify deck editor when price feature setting is changed
Ref #112
2014-06-22 21:20:14 -04:00
Daenyth
c54f7b9245 Log on failed path copy 2014-06-22 20:14:22 -04: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
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
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
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
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
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
Daenyth
38b83acae0 Fix #105 - remove emdash from card type when getting main type 2014-06-21 12:42:46 -04:00
Daenyth
53d2b82e61 Use picUrl templates to download cards.
Add HQ card option
2014-06-21 01:12:47 -04:00
Daenyth
8281f63134 Add settings fields for pic urls 2014-06-20 22:10:26 -04:00
Daenyth
fa52ed00a3 Merge branch 'master' into mtgjson-importer 2014-06-20 20:43:19 -04:00
Gavin Bisesi
da4c25597e Merge pull request #61 from VanNostrand/win32
Windows MSVC support
2014-06-19 22:56:18 -04:00
Daenyth
3401098e63 Revert "Merge pull request #89 from dylan/master"
This reverts commit 552a8e0c23, reversing
changes made to d0f3ae6c80.
2014-06-19 22:11:20 -04:00
Mark Morschhäuser
391e480d7a Restored MSVC linkflags after cmake update. 2014-06-18 12:11:58 +02:00
Mark Morschhäuser
929bcb55da Fixed bug in filtertree.cpp 2014-06-18 12:10:15 +02:00
Mark Morschhäuser
8708c96695 Merge remote-tracking branch 'origin/master' into win32
Conflicts:
	cockatrice/CMakeLists.txt
	oracle/CMakeLists.txt
2014-06-18 12:09:32 +02:00
Gavin Bisesi
552a8e0c23 Merge pull request #89 from dylan/master
Added new app icons, SVG icon not replaced however...
2014-06-17 19:48:12 -04:00
Fabio Bas
f3a57d5506 Import data from mtgjson's allsets.xml
* add multiverse id to cards.xml
* remove pictures urls from cards.xml
TBD:
* fix/clean oracle’s gui
* add support in cockatrice
2014-06-16 00:27:33 +02:00
Daenyth
b749ddbc45 Add the ability to friend/ignore an offline user 2014-06-15 14:59:54 -04:00
Fabio Bas
dd768ba7bd OSX: Move translations inside app bundle
Additional: remove duplicate if(linux) and merge rules together
2014-06-12 23:42:20 +02:00
Fabio Bas
eca318c34d Make install paths relative to prepare for CPack 2014-06-12 23:29:42 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
62f756e698 Remove pthread detection and linking: it's unused 2014-06-11 01:20:19 +02:00