Waleed Khan
bee1ff39f5
Added section on memory management to CONTRIBUTING.md.
2014-08-07 15:37:40 -04:00
Waleed Khan
ffc5b59fec
Fix #258 : Dashes to spaces.
2014-08-07 12:29:20 -04:00
Waleed Khan
da9592f0d8
Added style guide.
2014-08-07 11:52:40 -04:00
Waleed Khan
c0d4669088
Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml
...
Conflicts:
cockatrice/src/carddatabase.cpp
2014-08-07 11:06:41 -04:00
Waleed Khan
309494111c
Fix #248 : the token dialog generates cards irrespective of their case and punctation.
2014-08-02 19:32:24 -04:00
Waleed Khan
9ba5d7968e
Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml.
2014-07-29 23:46:04 -04:00
Waleed Khan
8df7e9f164
Fix #231 : tokens.xml no longer overwritten by cards.xml.
2014-07-27 20:55:47 -04:00
Waleed Khan
689acc1e32
Fix #110 : Price column is removed when the setting is disabled.
2014-07-26 21:13:30 -04:00
Waleed Khan
fe9f7a22b1
Fix issue mentioned in #152 : price updater loads all cards now.
2014-07-24 19:53:05 -04:00
Waleed Khan
68ac8d1a33
Fix #225 : Multiples of cards are now sent to deckstats.
2014-07-23 15:21:46 -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
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
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
arxanas
04e80304ef
Fix #184 : Deck loader reads 4x cardname correctly.
2014-07-08 22:56:18 -04:00
arxanas
4e8ba699d2
Tabs to spaces.
2014-07-08 22:53:02 -04:00
arxanas
1217689ed6
Hash the game type.
2014-07-07 19:04:01 -04:00
arxanas
8141901679
Fix #137 : Game filter preferences are saved.
2014-07-07 17:41:16 -04:00
arxanas
810029ce15
Fix #117 : Card tags now match disregarding case and punctuation.
2014-07-06 20:04:09 -04:00
arxanas
f730dca14c
Fix #155 : Vanguard card names no longer conflict with regular card names.
2014-07-01 02:29:25 -04:00
arxanas
7cbe410172
Fix #45 : don't send tokens to deckstats.
2014-06-30 03:08:55 -04:00
arxanas
080fd326ed
Fixed #131 : Compiles on OS X now.
2014-06-26 16:57:47 -04:00
arxanas
629668d7c0
Fix #34
...
This is @mcallahan's patch — see #35 . I had to apply this diff by hand,
because both `git` and `patch` refused to apply it and I didn't know
how to resolve that. Consequently, there might be an error.
2014-01-17 20:30:06 -05:00
arxanas
b1af4237e7
Added setting to enable/disable notifications
...
When something happens, the taskbar icon lights up/the dock icon
bounces. This can be annoying, so here is a setting to disable that.
2013-12-06 21:04:00 -05:00
Waleed Khan