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

1619 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabio Bas
b2e1855af7 Fix: <color> can appear more than once 2014-07-31 18:40:10 +02:00
Fabio Bas
c1b7d71dca Added schema for cards.xml 2014-07-31 17:53:39 +02:00
Gavin Bisesi
ca6bd669ce Merge pull request #233 from ctrlaltca/regression_card_picurl 
Add back support for custom picture urls in cards.xml
 2014-07-31 11:30:26 -04:00
Gavin Bisesi
7d5ce6f0ef Merge pull request #235 from ctrlaltca/offline_users_menu 
Disable some usercontextmenu actions if the user is offline; fix #234
 2014-07-30 15:49:43 -04:00
Gavin Bisesi
951e43b166 Update cmake build flags in README 2014-07-30 15:47:57 -04:00
Gavin Bisesi
1e5a00d100 Merge pull request #228 from ctrlaltca/error_suppression 
Fix building with debug
 2014-07-30 15:44:08 -04:00
Gavin Bisesi
14d6b011d7 Merge pull request #236 from arxanas/remove-price-column 
Fix #110: Price column is removed when the setting is disabled.
 2014-07-30 09:55:25 -04:00
Fabio Bas
9e12c5b2d4 Use custom picUrl if picUrlHq is not defined 2014-07-27 22:06:35 +02:00
Fabio Bas
6b9daf3d15 Enable Show this user's games" for offline users 2014-07-27 21:29:27 +02:00
Waleed Khan
689acc1e32 Fix #110: Price column is removed when the setting is disabled. 2014-07-26 21:13:30 -04:00
Fabio Bas
fe12f71b93 Disable some usercontextmenu actions if the user is offline; fix #234 2014-07-27 00:29:23 +02:00
Fabio Bas
aa225f8df7 Add back support for custom picture urls in cards.xml 2014-07-26 23:36:51 +02:00
Fabio Bas
1f0ba0ea08 Debug compilation: check flags actually supported by the compiler 2014-07-25 17:32:12 +02:00
Gavin Bisesi
ea897ee2ef Merge pull request #229 from arxanas/deckbrew-prices 
Fix issue mentioned in #152: price updater loads all cards now.
 2014-07-25 08:42:20 -04:00
Waleed Khan
fe9f7a22b1 Fix issue mentioned in #152: price updater loads all cards now. 2014-07-24 19:53:05 -04:00
Fabio Bas
3fda31073f Declare useless virtual dtor for polymorphic classes 2014-07-24 18:54:45 +02:00
Fabio Bas
0f501762e0 Reorder items initialization to match the order in class declaration 2014-07-24 18:44:19 +02:00
Fabio Bas
b10331fe66 Hide unused parameters in oracle/ to avoid warnings 2014-07-24 18:40:56 +02:00
Fabio Bas
bd97d7b933 Fix signed/unsigned comparision 2014-07-24 18:40:25 +02:00
Fabio Bas
d9577f0d6c Hide unused parameters in cockatrice/ to avoid warnings 2014-07-24 18:27:02 +02:00
Fabio Bas
13bd35e020 Servatrice: add prototypes for local functions 2014-07-24 18:16:08 +02:00
Fabio Bas
3102dd60f9 Hide unused parameters in common/ to avoid warnings 2014-07-24 18:09:28 +02:00
Fabio Bas
6c7ba0950a Fix warning for DeskList copy constructors 
Using pointers for classes derived from QObject would be the best idea.
 2014-07-24 18:00:20 +02:00
Fabio Bas
036980eb44 ISO C++ forbids variable length array 2014-07-24 17:37:54 +02:00
Fabio Bas
f32a999b4e Remove unused variable 2014-07-24 15:38:36 +02:00
Gavin Bisesi
abdaa610ee Merge pull request #152 from ctrlaltca/master_feature_prices 
Add pricing from deckbrew.com (refs #147)
 2014-07-24 07:45:37 -04:00
Fabio Bas
49b3568b53 small fix: moving the url length check in the inner loop 2014-07-23 23:10:48 +02:00
Fabio Bas
b40abfa1ad Split price retrieval on multiple request 2014-07-23 23:00:58 +02:00
Fabio Bas
bf92e67002 Ensure the whole table gets refreshed when updating prices 2014-07-23 22:11:26 +02:00
Gavin Bisesi
a8031321c6 Merge pull request #226 from arxanas/deckstats-multiple-cards 
Fix #225: Multiples of cards are now sent to deckstats.
 2014-07-23 15:38:09 -04:00
Fabio Bas
b0ee2e6d4b Merge branch 'master' into master_feature_prices 2014-07-23 21:37:37 +02:00
Waleed Khan
68ac8d1a33 Fix #225: Multiples of cards are now sent to deckstats. 2014-07-23 15:21:46 -04:00
Gavin Bisesi
395658988a Merge pull request #220 from arxanas/deck-parser-ampersand 
Fix #183: Deck parser doesn't too eagerly replace ampersands.
 2014-07-23 08:53:04 -04:00
Gavin Bisesi
a50e7ba936 Merge pull request #156 from arxanas/master 
Fix #45: don't send tokens to deckstats.
 2014-07-23 08:41:15 -04:00
Gavin Bisesi
0f627958c7 Merge pull request #224 from arxanas/case-insensitive-card-tag 
Æ now actually works with the case-insensitive tags.
 2014-07-23 08:12:54 -04:00
Waleed Khan
feaa3f5052 Merge remote-tracking branch 'origin/master' 
Conflicts:
	cockatrice/src/carddatabase.cpp
 2014-07-23 00:50:16 -04:00
Waleed Khan
40e97140d6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	cockatrice/src/carddatabase.cpp
 2014-07-23 00:49:13 -04:00
Waleed Khan
d663c12689 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	cockatrice/src/carddatabase.cpp
 2014-07-23 00:21:16 -04:00
Waleed Khan
2a5aa06881 Æ now actually works with the case-insensitive tags. 2014-07-22 20:58:38 -04:00
Gavin Bisesi
27eca25057 Merge pull request #197 from arxanas/case-insensitive-card-tag 
Fix #117: Card tags now match disregarding case and punctuation.
 2014-07-21 13:02:09 -04:00
Waleed Khan
aff32e0f56 Ignore diacritics as well. 
So [card]jotun grunt[/card] works as well as [card]Jötun Grunt[/card].
Also I removed some debugging information I accidentally left in.
 2014-07-20 21:20:50 -04:00
Waleed Khan
4729171ef7 Merge remote-tracking branch 'upstream/master' into deck-parser-ampersand 2014-07-20 15:08:22 -04:00
Waleed Khan
e5be082714 Merge remote-tracking branch 'upstream/master' into case-insensitive-card-tag 2014-07-20 15:06:51 -04:00
Waleed Khan
359882917a Merge remote-tracking branch 'upstream/master' 
Some tabs to spaces, and maybe fixed to work with Qt 5.

Conflicts:
	cockatrice/src/deckstats_interface.cpp
	common/decklist.cpp
	common/decklist.h
	oracle/src/oracleimporter.cpp
 2014-07-20 14:40:18 -04:00
Gavin Bisesi
1973df10e8 Merge pull request #221 from arxanas/travis-osx-no-cmake 
Removed cmake from Travis's OS X dependencies.
 2014-07-19 22:02:42 -04:00
Waleed Khan
fd5c497e8e Merge branch 'travis-osx-no-cmake' into deck-parser-ampersand 2014-07-19 18:38:41 -04:00
Waleed Khan
4df46b13e6 Removed cmake from Travis's OS X dependencies. 2014-07-19 18:27:44 -04:00
arxanas
b1bfda9f4e Merge remote-tracking branch 'upstream/master' into deck-parser-ampersand 
Conflicts:
	common/decklist.cpp
 2014-07-19 18:12:49 -04:00
arxanas
0eb97c91b3 Fix #183: Deck parser doesn't too eagerly replace ampersands. 2014-07-19 14:47:19 -04:00
arxanas
88e6d0d3eb Tabs to spaces. 2014-07-19 14:28:46 -04:00