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

1842 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Gavin Bisesi
13f6da15ec Merge pull request #420 from ctrlaltca/unreg_create_game 
Fix #408
 2014-11-09 17:06:12 -05:00
Fabio Bas
da46996294 Fix #408 
Gray out "only buddies/only reg users" in the “create game” dialog if
the user is unregistered
 2014-11-09 22:12:55 +01:00
Fabio Bas
cb055055a9 Oracle: add button to restore default download url 
Should avoid the problem explained in #414
 2014-11-09 21:15:31 +01:00
Fabio Bas
a716d73a42 OSX: Add proper infos to info.plist 
fixes #411
 2014-11-09 21:03:10 +01:00
Matt Lowe
eef4a621b3 Updated Search Bar Style 
Please note that I don't feel that the search bar needs to be skinned by
users, hence why it is not part of the large css-skinning project. I
also feel that given the PR #416 a new search bar with highlight the new
search functionality.

Updated the look of the search  bar:
+ larger, curved edges
+ changes color when has focus
+ search icon built into search
- removed "Search For" text in lieu of search icon
 2014-11-09 12:04:09 +01:00
Matt Lowe
0589f02ca2 Partial Card Name Search 
+ Card searches now do partial string matches, rather than needing to
match the beginning of the string.
 2014-11-09 11:23:45 +01:00
Fabio Bas
4b8ac99370 Corrected spacing 2014-11-08 15:52:04 +01:00
Fabio Bas
8ca0b96d10 Rework the picture download behavior 
Should fix #412
 2014-11-08 15:08:49 +01:00
Gavin Bisesi
8d2e5d3c43 Merge pull request #306 from Mawu3n4/translation 
French translation
 2014-11-07 10:11:53 -05:00
Gavin Bisesi
8f801825a9 Merge pull request #379 from poixen/uicolors 
Changed UI colors
 2014-11-05 15:45:53 -05:00
Gavin Bisesi
5ad869c636 Merge pull request #378 from poixen/animation 
Card Animation performance improvement
 2014-11-05 15:45:24 -05:00
Gavin Bisesi
67db347d12 Merge pull request #366 from poixen/removeoldimages 
Resource cleanup
 2014-11-05 15:31:17 -05:00
poixen
967e1a469e Removed comments 
- Removed comments as-per request
 2014-11-05 14:10:30 +01:00
poixen
accd3ecca1 Removed commented line 
- removed unused commented out code
 2014-11-05 14:03:43 +01:00
Matt Lowe
332d69a1a5 Removed comment 
+ removed getters and setters comment
 2014-11-03 17:19:12 +01:00
Matt Lowe
097090ac1c Updated static variable name 
+ Updated DELTA variable to more suitable name:
ROTATION_DEGREES_PER_FRAME
 2014-11-03 16:33:48 +01:00
Gavin Bisesi
a051133af9 Merge pull request #397 from woogerboy21/patch-1 
Correct gametype primary key
 2014-11-03 10:22:24 -05:00
Matt Lowe
c130ee92fa Additional comment 
+ Added additional comment explaining what DELTA is.
 2014-11-03 14:39:51 +01:00
Gavin Bisesi
1d7850fff8 Merge pull request #406 from ctrlaltca/fix_405 
Fix for #405
 2014-10-29 09:53:21 -04:00
Fabio Bas
9cfb09cd5b Possible fix for #405 2014-10-28 16:30:49 +01:00