woogerboy21
72a3f0e654
Merge remote-tracking branch 'upstream/master' into servatrice_trustedsources
2014-11-21 18:52:52 -05:00
Gavin Bisesi
8c7aa41721
Permit linux/clang/qt5 build to fail
2014-11-21 12:15:36 -05:00
Gavin Bisesi
7e92b4e7df
Add community resource links to README
...
ref #452
2014-11-21 11:19:58 -05:00
ctrlaltca
a28eb053c5
Merge pull request #450 from poixen/ghostcards
...
Added fade to card drag items
2014-11-21 08:24:14 +01:00
woogerboy21
20807f31d6
Merge remote-tracking branch 'upstream/master' into servatrice_trustedsources
2014-11-20 23:41:43 -05:00
Matt Lowe
141d0c7618
Added fade to card drag items
...
[REVIEW]
Added a white mask to cards that are being dragged.
Preview: http://webmup.com/1we4W/
2014-11-21 00:09:38 +01:00
Gavin Bisesi
68bc67cde5
Merge pull request #433 from poixen/scalecards
...
Cards Scale with mouse over action
2014-11-20 16:41:04 -05:00
woogerboy21
565fb9ef6e
Merge remote branch 'upstream/master' into servatrice_trustedsources
2014-11-19 23:06:06 -05:00
Gavin Bisesi
c35024e155
Merge pull request #440 from poixen/newsearchbar
...
QT_VERSION check now checks for correct version
2014-11-19 20:18:10 -05:00
Matt Lowe
94780d8f74
Merge branch 'master' into newsearchbar
2014-11-19 22:28:00 +01:00
Matt Lowe
916735d613
Merge branch 'master' into newsearchbar
2014-11-19 22:21:43 +01:00
woogerboy21
ff8e25bb7e
removed qdebug line for >= maxuser (no need to fill log)
2014-11-18 18:31:06 -05:00
woogerboy21
1195e4c77b
corrected default ini value
2014-11-18 17:32:10 -05:00
woogerboy21
37e08cfbb6
added logic to only write debug if max user value is reached
2014-11-18 17:27:57 -05:00
woogerboy21
197ae9213c
corrected invalid variable call & added log file debug information
2014-11-18 17:20:45 -05:00
woogerboy21
26f5110fea
convert file tab to 4 space indent
2014-11-18 16:59:08 -05:00
woogerboy21
3c513b4bfc
moved code logic to callling function & indent fix
2014-11-18 16:55:19 -05:00
woogerboy21
8aa7a1d6be
Merge branch 'servatrice_trustedsources' of ssh://github.com/woogerboy21/Cockatrice into servatrice_trustedsources
2014-11-18 15:41:10 -05:00
woogerboy21
44a302a2d6
added trusted sources to servatrice
2014-11-18 15:39:11 -05:00
woogerboy21
74f8a82a73
corrected miss-pasting
2014-11-18 15:25:47 -05:00
woogerboy21
3869532722
Merge remote branch 'upstream/master' into servatrice_trustedsources
2014-11-18 15:16:20 -05:00
wcollins
da98d24d8c
added trusted sources to servatrice
2014-11-18 15:09:21 -05:00
Gavin Bisesi
6d19f8e157
Merge pull request #423 from Cockatrice/travis-qt4-5-builds
...
Build both Qt4 and Qt5
2014-11-18 14:48:19 -05:00
Gavin Bisesi
b4dc9b79d4
Don't install qt4 when building qt5 on osx
2014-11-18 12:41:08 -05:00
Gavin Bisesi
ee2ba4abd3
Include qtmultimedia and qtsvg for travis qt5 build
2014-11-18 12:18:30 -05:00
Matt Lowe
d467cc8b01
QT_VERSION check now checks for correct version
...
Feature is only included in Qt 5.3+
2014-11-18 18:14:47 +01:00
Gavin Bisesi
1ba6b468de
Install updated cmake from ubuntu sdk ppa
2014-11-18 07:48:55 -05:00
Gavin Bisesi
d2e706164d
Install qt5tools-dev for ubuntu build
2014-11-18 06:08:56 -05:00
Gavin Bisesi
1640e77848
Notify gitter about build changes
2014-11-17 11:29:20 -05:00
Gavin Bisesi
fbbe40fbf3
Use correct qt version path for cmake on osx
2014-11-14 17:11:50 -05:00
Gavin Bisesi
5f944f1d6e
Actually use Qt5 for qt5-osx build
2014-11-14 16:32:56 -05:00
Gavin Bisesi
9599fe7b33
Merge remote-tracking branch 'origin/master' into travis-qt4-5-builds
2014-11-14 16:07:05 -05:00
Gavin Bisesi
b351abcce4
Update gitter chat room for org change
2014-11-14 10:54:02 -05:00
Gavin Bisesi
c93fdbefe2
Update travis build badge link for org change
2014-11-14 10:52:39 -05:00
Gavin Bisesi
e918900d4e
Refine travis config to only install qt4 or qt5 per build instead of both
2014-11-14 10:47:48 -05:00
Gavin Bisesi
438d4e4661
Merge pull request #417 from poixen/newsearchbar
...
Updated Search Bar Style
2014-11-14 10:19:24 -05:00
Matt Lowe
62b7890e59
Cards Scale with mouse over action
...
Cards now scale up by 10% when mouse over.
2014-11-12 23:26:24 +01:00
Gavin Bisesi
687d441a49
Merge pull request #426 from woogerboy21/patch-2
...
Default logging to enable with no config file
2014-11-11 14:22:11 -05:00
woogerboy21
84a5117b4c
Default logging to enable with no config file
...
If no configuration file is found, default the logger to logging enabled.
2014-11-11 14:15:02 -05:00
Matt Lowe
f58cc32ef4
Added version check
...
Added version check, to only include the new Searchbar icon for Users
running Qt 5+
2014-11-10 22:14:27 +01:00
Gavin Bisesi
a91106f90e
Add ppa for qt5 on travis ubuntu
2014-11-10 15:36:31 -05:00
Gavin Bisesi
4b478efa61
Build both Qt4 and Qt5
2014-11-10 15:12:45 -05:00
Gavin Bisesi
277c050d76
Merge pull request #421 from ctrlaltca/even_more_pictures
...
Add fallback urls for cards without a muId set
2014-11-10 10:27:47 -05:00
Matt Lowe
33a6e3c5c0
Removed hard coded CSS
...
Hard coded CSS might have a slight chance of not rendering the same
across all platforms. More research needs to be performed. Until then I
have removed the hard coded search bar customization.
2014-11-10 08:49:24 +01:00
Fabio Bas
fc1d06e13b
Add fallback urls for cards without a muId set
...
We only have a good HQ source for them; any idea on a low-quality
source?
2014-11-10 00:23:41 +01:00
Gavin Bisesi
a320af70da
Merge pull request #418 from ctrlaltca/osx_info_plist
...
OSX: Add proper infos to info.plist
2014-11-09 17:34:35 -05:00
Gavin Bisesi
6b1df247d1
Merge pull request #415 from ctrlaltca/no_pictures_yet
...
Rework the picture download behavior
2014-11-09 17:16:00 -05:00
Fabio Bas
c0ee060af4
Fixed vendor name
2014-11-09 23:14:36 +01:00
Gavin Bisesi
b3715c5da2
Merge pull request #416 from poixen/partialsearch
...
Partial Card Name Search
2014-11-09 17:08:02 -05:00
Gavin Bisesi
e1c5f4d436
Merge pull request #419 from ctrlaltca/oracle_url
...
Oracle: add button to restore default download url
2014-11-09 17:06:56 -05:00
