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

1879 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabio Bas
e48a815d25 Add move buttons, misc improvements 2014-11-30 21:37:06 +01:00
Gavin Bisesi
9e1f8a0892 Merge pull request #449 from ctrlaltca/set_extinfo 
Sets handling improvements
 2014-11-27 06:13:29 -05:00
Gavin Bisesi
0c92b3779a Merge pull request #461 from poixen/clickfix 
Double click room fix
 2014-11-27 06:11:14 -05:00
Matt Lowe
0f6dc6be6c Fix for #460 2014-11-27 09:52:27 +01:00
Gavin Bisesi
db0a77989b Merge pull request #456 from ctrlaltca/gamesmodel_qt 
Port #436 to QDateTime
 2014-11-26 17:28:35 -05:00
Fabio Bas
c8aeff0b0c Port #436 to QDateTime 2014-11-26 12:34:26 +01:00
Fabio Bas
2704523c73 Merge branch 'master' into set_extinfo 2014-11-26 11:45:51 +01:00
Gavin Bisesi
f71cfb1240 Merge pull request #436 from mitchellwrosen/master 
Add 'Start time' column to game list
 2014-11-25 09:01:24 -05:00
Gavin Bisesi
19de7cbc03 Merge pull request #428 from woogerboy21/static_reveal_library 
Don't remove card images from revealed decks
 2014-11-25 08:41:08 -05:00
Gavin Bisesi
9d62c578e6 Merge pull request #435 from poixen/bottomdeck 
Action: Move Bottom Card to Graveyard
 2014-11-25 08:40:45 -05:00
Gavin Bisesi
9f79bbd09f Merge pull request #454 from poixen/doubleclick 
Double click/ENTER to join a room in lobby
 2014-11-25 08:38:09 -05:00
Matt Lowe
bbcfe84d08 Added double click/Enter for Server tab 
Added the same functionality to the server tab
 2014-11-23 20:01:09 +01:00
Matt Lowe
9e349d8b88 Added "ENTER" to join a room 
Can now join a room by highlighting a room and pressing ENTER. Works
nice with arrow navigation.
 2014-11-23 00:46:54 +01:00
Matt Lowe
6a44855a5c Added double click to join a room 
Can now double click on a room in the lobby to join
 2014-11-23 00:36:50 +01:00
Mitchell Rosen
cab37b3945 Capitalize game columns 2014-11-22 00:08:47 -08:00
Mitchell Rosen
03bdbe2c7a Added '<1m ago' 2014-11-22 00:08:00 -08:00
Mitchell Rosen
0af70883a8 0s-5m displayed as '<5m ago' 2014-11-22 00:06:13 -08:00
Mitchell Rosen
d0969c10c6 Show hours and minutes between 60 and 90 minutes 2014-11-22 00:06:13 -08:00
Mitchell Rosen
da145bdd7b fix localization in time strings 2014-11-22 00:06:13 -08:00
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
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
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
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
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