Daenyth
e5d9692d78
Fall back to plain text load when xml load fails
2014-06-24 00:14:59 -04:00
Daenyth
68c0932a2f
Don't have decklist sort behavior rely on column order
2014-06-22 08:36:35 -04:00
Daenyth
e99c1bbe6d
Merge remote-tracking branch 'origin/master' into editor-sorting-v5
2014-06-22 08:10:22 -04:00
Mark Morschhäuser
8708c96695
Merge remote-tracking branch 'origin/master' into win32
...
Conflicts:
cockatrice/CMakeLists.txt
oracle/CMakeLists.txt
2014-06-18 12:09:32 +02:00
Daenyth
6913f2bb4e
Merge branch 'master' into musty
...
Conflicts:
common/server_cardzone.cpp
2014-06-14 19:06:49 -04:00
Fabio Bas
a4fbf8b677
Force linking with pthread under unix
...
Protobuf depends on pthread under unix, but cmake’s FindProtobuf
doesn’t add -lpthread to link flags
2014-06-13 19:09:33 +02:00
Fabio Bas
721cf6fe4f
Re-indent CMakeLists.txt using spaces
2014-06-11 18:08:30 +02:00
Fabio Bas
ed0311d59e
Added comments for comment's CMakeLists.txt
2014-06-11 01:26:54 +02:00
Fabio Bas
4fd8c94df0
Overhaul common's CMakeLists.txt
...
* Use automoc instead of a manual list of headers
* Remove Qt4 detection
* Created missing .cpp for .h files (for automoc detection)
* Remove pthread linking
* Forcing -lprotobuf is not needed for mingw; msvc only?
2014-06-11 01:24:34 +02:00
Mark Morschhäuser
ccab97ca7d
RNG: added additional checks (which forced an interface redesign), updated comments
2014-06-09 13:31:21 +02:00
Mark Morschhäuser
197dd0f3c8
Remove useless bound checks.
2014-05-30 11:48:07 +02:00
Mark Morschhäuser
69201460e6
Included climits for UINT_MAX non-aware compilers.
2014-05-18 10:54:41 +02:00
Mark Morschhäuser
f964dcc656
Added additional bound checks.
2014-03-20 15:37:21 +01:00
Mark Morschhäuser
fbf54b62bc
Test if macro already exists to shutup warning.
2014-03-18 20:41:39 +01:00
Mark Morschhäuser
7c606af63e
Fixed warning regarding virtual function overrides. Using C++ standard.
...
See http://msdn.microsoft.com/en-us/library/bb384874(v=vs.90).aspx
2014-03-12 09:11:01 +01:00
Mark Morschhäuser
4eb845d438
Throw exception if RNG is used with invalid bounds.
2014-03-11 09:41:37 +01:00
Mark Morschhäuser
9a20e5e2e2
Commented a pitfall in case of RNG replacement.
2014-03-11 08:18:54 +01:00
Mark Morschhäuser
800f7e6373
Use distribution function with rejection sampling.
2014-03-10 14:13:46 +01:00
Mark Morschhäuser
424513eb90
Forgot to add lower bound in RNG generation.
2014-03-08 17:45:59 +01:00
Name
0128798c64
4 Space Tabs
2014-03-08 11:35:35 -05:00
Mark Morschhäuser
a15eb6f29f
Updated SFMT RNG code, removed Qt RNG
2014-03-08 17:08:40 +01:00
Musty Mustelidae
1d3667f37d
Implemented Fisher–Yates shuffle. Assumes RNG function is in form getNumber(min,max), with min and max inclusive (Did not find documentation on function)
2014-03-08 01:23:21 -05:00
Musty Mustelidae
2ad09399f4
Implemented Fisher–Yates shuffle. Assumes RNG function is in form getNumber(min,max), with min and max inclusive (Did not find documentation on function)
2014-03-07 09:09:56 -05:00
Buce
a62ba91a5d
Add different compare methods for sorting
...
Give DeckList nodes the ability to sort based on name, price, or
number.
2014-02-28 15:38:23 -06:00
Matt Kelly
b93317cc17
OS X still works with pthread fix - added explanation
2014-02-14 14:14:10 -05:00
Matt Kelly
e366bd7a71
Fixed for Linux - pushing to test on OS X
2014-02-14 13:58:54 -05:00
jfreake
504a56cf95
Right aligned the regex check
...
decklist - Right aligned the regex check
2014-01-08 12:55:44 -04:00
jfreake
67c4d089be
Deck Load Mods and Movable Tabs
...
Changes:
Deck Load - Default to all types *.*
Decklist - Strip "|edition" from .dec formats that include a pipe and
the edition after the card name
Tab_Supervisor - Make tabs movable (able to rearrange tabs)
2014-01-08 11:54:02 -04:00
Tomasz Wegrzanowski
b57d628278
Made Ctrl-V importer work more robust.
2013-11-12 11:46:38 +00:00
Mark Morschhäuser
562de0553f
Fixed compile warnings due to missing \n at EOF.
2013-05-15 21:31:47 +02: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
9f13254d01
don't allow players to move cards that are attached to something
2013-02-03 18:23:54 +01:00
Max-Wilhelm Bruker
6807bb0bd7
server crash fix
2013-01-28 13:40:42 +01:00
Max-Wilhelm Bruker
c65f327e71
server crash fixes
2013-01-27 15:15:27 +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
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
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
43d7cf6a1a
removed recursive lock in server; moved object serialisation to worker thread
2012-10-14 13:19:03 +02: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
4c9165f099
fixed #62 : shuffling doesn't reveal the top card even if AlwaysRevealTopCard is set
2012-07-17 19:22:09 +02:00
Max-Wilhelm Bruker
886f12d116
fixed #63 : spectators have sideboard lock icons
2012-07-17 19:17:26 +02:00
