Mitchell Rosen
7aff20b4ee
Fix the build
2014-11-22 00:06:13 -08:00
Mitchell Rosen
a3dc403f75
Translate, change 'Start time' to 'Game created', add debug log
2014-11-22 00:06:13 -08:00
Mitchell Rosen
4972d227d9
Add back -Werror, etc. on debug build
2014-11-22 00:06:13 -08:00
Mitchell Rosen
93ab9f9691
Add 'Start time' column to game list
2014-11-22 00:06:13 -08:00
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
Fabio Bas
859adca0c7
Fixed indentation
2014-11-20 09:16:30 +01:00
Fabio Bas
ee3731717c
Fixed button labels
2014-11-20 09:15:58 +01: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
Fabio Bas
f48f386f35
Sets window: implemented save and restore buttons
2014-11-19 22:18:41 +01:00
Fabio Bas
ac43fa23b9
Better handle the TK set used for tokens
...
Let oracle add a basic TK set in cards.xml
Unify all the code previously using the string literal “TK”
2014-11-19 19:44:54 +01:00
Fabio Bas
8542d875d3
Sets dialog: new columns and sorting
...
Added "order key", "set type" and "release date" columns
Use a proxy model to sort the table
made the dialog wider accordingly
2014-11-19 18:09:37 +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
Matt Lowe
a2c4a1e537
Action: Move Bottom Card to Graveyard
...
Created menu action to move card from the bottom of the library to the
graveyard. Qt accelerator key is "i". #125
2014-11-15 16:35:30 +01: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
woogerboy21
6811819161
Don't remove card images from revealed decks
...
Revealed library had write access, which meant that the user would see cards being removed from the zone as the other player drew cards. The cards were not the actual ones drawn, just the ones at the same index, so no information was leaked.
Fix #297
2014-11-13 20:31:55 -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
