From 141d0c7618b36a2bbd85b3a449985875ae3753a5 Mon Sep 17 00:00:00 2001 From: Matt Lowe Date: Fri, 21 Nov 2014 00:09:38 +0100 Subject: [PATCH 1/3] Added fade to card drag items [REVIEW] Added a white mask to cards that are being dragged. Preview: http://webmup.com/1we4W/ --- cockatrice/src/abstractcarddragitem.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cockatrice/src/abstractcarddragitem.cpp b/cockatrice/src/abstractcarddragitem.cpp index acc73532..35476941 100644 --- a/cockatrice/src/abstractcarddragitem.cpp +++ b/cockatrice/src/abstractcarddragitem.cpp @@ -3,9 +3,11 @@ #include #include #include +#include static const float CARD_WIDTH_HALF = CARD_WIDTH / 2; static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2; +const QColor GHOST_MASK = QColor(255, 255, 255, 50); AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag) : QGraphicsItem(), item(_item), hotSpot(_hotSpot) @@ -40,6 +42,9 @@ AbstractCardDragItem::~AbstractCardDragItem() void AbstractCardDragItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { item->paint(painter, option, widget); + + // adds a mask to the card so it looks like the card hasnt been placed yet + painter->fillRect(boundingRect(), GHOST_MASK); } void AbstractCardDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) From 7e92b4e7df027164b8c4f5521a0978d59e770fa3 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Fri, 21 Nov 2014 11:19:58 -0500 Subject: [PATCH 2/3] Add community resource links to README ref #452 --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 9b88f18d..f66459cd 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,11 @@ The following flags can be passed to `cmake`: `cockatrice` is the game client `servatrice` is the server +# Community Resources +- [reddit r/Cockatrice](http://reddit.com/r/cockatrice) +- [Woogerworks Server & Forums](http://woogerworks.com) +- [Cockatrice Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) + # License Cockatrice is free software, licensed under the GPLv2; see COPYING for details. From 8c7aa41721b41618861b19943b224e577c01a721 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Fri, 21 Nov 2014 12:15:12 -0500 Subject: [PATCH 3/3] Permit linux/clang/qt5 build to fail --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index dfceb213..a1c468ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,3 +18,9 @@ notifications: on_success: change on_failure: change on_start: false +matrix: + fast_finish: true + allow_failures: + - compiler: clang + os: linux + env: QT4=0