Commit graph

1177 commits

Author SHA1 Message Date
Frederik Holden
c0fdbb2cca Fix two bugs in the price tag feature
"The price tag feature currently has two bugs.
1. The final price that a card ends up with is the one in the last set
alphabetically, instead of the one from the set with the lowest price.
2. Black Lotus Project sometimes gets in prices for cards from Masters
Edition, for some reason. This set only exists in Magic the Gathering:
Online, i.e., not physically, and should not be considered. This might
be considered a BLP bug and not a Cockatrice bug.

This patch fixes those two bugs. I also changed the price value to be
based on BLP's "price" value instead of the "average" value. Seems more
logical."

Signed-off-by: Daenyth <Daenyth+git@gmail.com>
2013-07-11 13:50:31 -04:00
Daenyth
347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
Max-Wilhelm Bruker
ce642e3000 don't use Server_Room::getInfo when updating 2013-02-15 19:31:37 +01:00
Max-Wilhelm Bruker
7a30b827c8 changed Server_Room::gamesMutex to QReadWriteLock 2013-02-11 15:43:31 +01:00
Max-Wilhelm Bruker
00029eeeb4 Server_Room optimisation 2013-02-11 15:29:19 +01:00
Max-Wilhelm Bruker
de3055be6a Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-11 14:40:46 +01:00
Max-Wilhelm Bruker
49d2fdc93d changed users table in servatrice.sql 2013-02-11 14:40:32 +01:00
Max-Wilhelm Bruker
dca87cb41b Merge pull request #115 from aeosynth/master
Create README.md
2013-02-10 11:54:49 -08:00
Max-Wilhelm Bruker
bd9221f1a5 Merge pull request #123 from bafipawi/fixMacCompile
Fixed cmake error on mac install
2013-02-10 11:54:04 -08:00
Max-Wilhelm Bruker
fd07d8f6c4 Merge pull request #122 from bafipawi/supresscompilerwarnings
Added some paranthases to supress compiler warnings
2013-02-10 11:53:03 -08:00
Chris Hansen
422f73d4cd Fixed cmake error on mac install 2013-02-08 20:18:19 -08:00
Chris Hansen
b909047a43 Added some paranthases to supress compiler warnings 2013-02-07 12:49:09 -08:00
Max-Wilhelm Bruker
9f13254d01 don't allow players to move cards that are attached to something 2013-02-03 18:23:54 +01:00
Max-Wilhelm Bruker
1f6fbfddb3 updated servatrice.sql 2013-02-03 14:55:18 +01:00
James Campos
488726f9a6 Update README.md 2013-01-29 13:47:54 -08:00
James Campos
72b60026f7 server 2013-01-29 13:34:37 -08:00
James Campos
864fb5fd36 Create README.md 2013-01-29 13:15:06 -08:00
Max-Wilhelm Bruker
6807bb0bd7 server crash fix 2013-01-28 13:40:42 +01:00
Max-Wilhelm Bruker
b2dbfeb7f3 added thread names (2) 2013-01-27 16:42:53 +01:00
Max-Wilhelm Bruker
ae01144547 added thread names 2013-01-27 16:40:30 +01:00
Max-Wilhelm Bruker
c65f327e71 server crash fixes 2013-01-27 15:15:27 +01:00
Max-Wilhelm Bruker
4f97db62d7 server deadlock fix #2 2013-01-26 17:03:31 +01:00
Max-Wilhelm Bruker
8d596619e7 server deadlock fix 2013-01-26 16:34:24 +01:00
Max-Wilhelm Bruker
14287e54f9 server crash fix 2013-01-26 16:08:42 +01:00
Max-Wilhelm Bruker
d5ccda49a1 server code cleanup 2013-01-23 11:51:59 +01:00
Max-Wilhelm Bruker
60a1f5d7d1 Server_CardZone::getFreeGridColumn() now runs in O(log n), which should remove the performance bottleneck when processing insertCard(x = -1) commands on a large zone, e.g. createToken 2013-01-20 16:40:15 +01:00
Max-Wilhelm Bruker
590ab2f598 fixed #84: game creator couldn't re-join his game if the only buddies flag was set 2013-01-19 21:17:21 +01:00
Max-Wilhelm Bruker
f10543924d factored out duplicated code in [card] tag parsing 2013-01-19 17:29:15 +01:00
Max-Wilhelm Bruker
a4ae1bcd39 Merge pull request #64 from Daenyth/issue-64
Allow `[[Cardname]]` as a synonym for `[card]cardname[/card]`
2013-01-19 08:20:30 -08:00
Max-Wilhelm Bruker
7736f7b5f8 fixed #101: added option to filter password protected games 2013-01-19 17:16:04 +01:00
Max-Wilhelm Bruker
89ae29aaf0 added Georgia to countries 2013-01-19 16:14:47 +01:00
Max-Wilhelm Bruker
2deabebc7c added PasswordHasher::initialize() to make libgcrypt warnings go away 2013-01-12 18:05:08 +01:00
Max-Wilhelm Bruker
2789116d03 fixed cmdDeckSelect (2) 2013-01-12 16:33:29 +01:00
Max-Wilhelm Bruker
1d151d2d12 cmdDeckSelect fixed 2013-01-10 14:31:07 +01:00
Max-Wilhelm Bruker
d6cddbea13 added index to sql file 2013-01-10 02:01:19 +01:00
Max-Wilhelm Bruker
bc595bbab2 added missing confirmation dialogue for remote folder deletion 2013-01-10 00:16:52 +01:00
Max-Wilhelm Bruker
915e809eb5 changed user -> id_user in decklist_folders and decklist_files (issue #48) 2013-01-10 00:01:06 +01:00
Max-Wilhelm Bruker
2e06b95e5c deadlock fix 2013-01-09 22:28:49 +01:00
Max-Wilhelm Bruker
733aa6c52b Server_CardZone speed optimisation 2013-01-03 18:16:17 +01:00
Max-Wilhelm Bruker
8b6eace312 code cleanup 2013-01-03 17:18:37 +01:00
Max-Wilhelm Bruker
cc3760a7df fixed deadlock condition 2012-11-16 21:42:17 +01:00
Max-Wilhelm Bruker
de87bc6546 compile fixes by hasufell 2012-10-28 21:43:41 +01:00
Max-Wilhelm Bruker
43d7cf6a1a removed recursive lock in server; moved object serialisation to worker thread 2012-10-14 13:19:03 +02:00
Max-Wilhelm Bruker
e7fc3b59a7 changed ShutdownDialog to use QDialogButtonBox 2012-10-14 11:19:04 +02:00
Daenyth
b767b72230 Fix #64: Allow [[cardname]] shortcut for card:// 2012-07-25 00:38:26 -04:00
Daenyth
af09d0d294 Reject more invalid usernames from clients.
Specifically this should cover people connecting with a username of
"\u200C"
2012-07-25 00:12:35 -04:00
Max-Wilhelm Bruker
ba5669652c added Dominican Republic 2012-07-24 20:20:41 +02:00
Max-Wilhelm Bruker
1409c50fbe Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-07-22 18:16:11 +02:00
Max-Wilhelm Bruker
03cef19783 added New Zealand 2012-07-22 18:15:49 +02:00
Max-Wilhelm Bruker
4c9165f099 fixed #62: shuffling doesn't reveal the top card even if AlwaysRevealTopCard is set 2012-07-17 19:22:09 +02:00