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

..

pb

Force linking with pthread under unix

2014-06-13 19:09:33 +02:00

sfmt

Updated SFMT RNG code, removed Qt RNG

2014-03-08 17:08:40 +01:00

CMakeLists.txt

Re-indent CMakeLists.txt using spaces

2014-06-11 18:08:30 +02:00

color.h

Fixed compile warnings due to missing \n at EOF.

2013-05-15 21:31:47 +02:00

decklist.cpp

Right aligned the regex check

2014-01-08 12:55:44 -04:00

decklist.h

Fixed warning regarding virtual function overrides. Using C++ standard.

2014-03-12 09:11:01 +01:00

get_pb_extension.cpp

fixed pw loyalty in oracle, PB code working

2012-01-01 18:15:32 +01:00

get_pb_extension.h

fixed pw loyalty in oracle, PB code working

2012-01-01 18:15:32 +01:00

getversion.cmake

use 'git describe' to generate version info for the about box and servatrice. fixes issue #20

2012-02-21 01:08:16 +01:00

rng_abstract.cpp

RNG: added additional checks (which forced an interface redesign), updated comments

2014-06-09 13:31:21 +02:00

rng_abstract.h

RNG: added additional checks (which forced an interface redesign), updated comments

2014-06-09 13:31:21 +02:00

rng_sfmt.cpp

RNG: added additional checks (which forced an interface redesign), updated comments

2014-06-09 13:31:21 +02:00

rng_sfmt.h

RNG: added additional checks (which forced an interface redesign), updated comments

2014-06-09 13:31:21 +02:00

server_abstractuserinterface.cpp

changed Server_Room::gamesMutex to QReadWriteLock

2013-02-11 15:43:31 +01:00

server_abstractuserinterface.h

improved code for automatic joining of persistent games; disconnecting + reconnecting works as it should with ISL

2012-03-18 21:57:21 +01:00

server_arrow.cpp

preliminary AlwaysRevealTopCard support related to issue #31, server code cleanup (finally removed getGameState)

2012-03-31 21:47:30 +02:00

server_arrow.h

preliminary AlwaysRevealTopCard support related to issue #31, server code cleanup (finally removed getGameState)

2012-03-31 21:47:30 +02:00

server_arrowtarget.cpp

Overhaul common's CMakeLists.txt

2014-06-11 01:24:34 +02:00

server_arrowtarget.h

Fixed compile warnings due to missing \n at EOF.

2013-05-15 21:31:47 +02:00

server_card.cpp

preliminary AlwaysRevealTopCard support related to issue #31, server code cleanup (finally removed getGameState)

2012-03-31 21:47:30 +02:00

server_card.h

preliminary AlwaysRevealTopCard support related to issue #31, server code cleanup (finally removed getGameState)

2012-03-31 21:47:30 +02:00

server_cardzone.cpp

Merge branch 'master' into musty

2014-06-14 19:06:49 -04:00

server_cardzone.h

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

server_counter.cpp

preliminary AlwaysRevealTopCard support related to issue #31, server code cleanup (finally removed getGameState)

2012-03-31 21:47:30 +02:00

server_counter.h

preliminary AlwaysRevealTopCard support related to issue #31, server code cleanup (finally removed getGameState)

2012-03-31 21:47:30 +02:00

server_database_interface.cpp

Overhaul common's CMakeLists.txt

2014-06-11 01:24:34 +02:00

server_database_interface.h

cmdDeckSelect fixed

2013-01-10 14:31:07 +01:00

server_game.cpp

changed Server_Room::gamesMutex to QReadWriteLock

2013-02-11 15:43:31 +01:00

server_game.h

server code cleanup

2013-01-23 11:51:59 +01:00

server_metatypes.h

cleanups, games work with ISL, now we just need to clean up better when the ISL connection dies

2012-03-18 18:48:14 +01:00

server_player_reference.h

improved code for automatic joining of persistent games; disconnecting + reconnecting works as it should with ISL

2012-03-18 21:57:21 +01:00

server_player.cpp

RNG: added additional checks (which forced an interface redesign), updated comments

2014-06-09 13:31:21 +02:00

server_player.h

fixed cmdDeckSelect (2)

2013-01-12 16:33:29 +01:00

server_protocolhandler.cpp

Merge branch 'master' of git://github.com/mbruker/Cockatrice

2013-02-27 12:36:14 -05:00

server_protocolhandler.h

hide login passwords from server log; call logDebugMessage in S_PH thread instead of Server thread

2012-06-03 19:23:15 +02:00

server_remoteuserinterface.cpp

cleanups, games work with ISL, now we just need to clean up better when the ISL connection dies

2012-03-18 18:48:14 +01:00

server_remoteuserinterface.h

improved code for automatic joining of persistent games; disconnecting + reconnecting works as it should with ISL

2012-03-18 21:57:21 +01:00

server_response_containers.cpp

cleanups, games work with ISL, now we just need to clean up better when the ISL connection dies

2012-03-18 18:48:14 +01:00

server_response_containers.h

cleanups, games work with ISL, now we just need to clean up better when the ISL connection dies

2012-03-18 18:48:14 +01:00

server_room.cpp

don't use Server_Room::getInfo when updating

2013-02-15 19:31:37 +01:00

server_room.h

don't use Server_Room::getInfo when updating

2013-02-15 19:31:37 +01:00

server.cpp

Merge branch 'master' of git://github.com/mbruker/Cockatrice

2013-02-27 12:36:14 -05:00

server.h

Merge branch 'master' of git://github.com/mbruker/Cockatrice

2013-02-27 12:36:14 -05:00

serverinfo_user_container.cpp

server crash fixes

2013-01-27 15:15:27 +01:00

serverinfo_user_container.h

fixed cmdDeckSelect (2)

2013-01-12 16:33:29 +01:00

user_level.h

context menu for a message sender's name in chat; also display the user level icon next to the name; minor consistency and type-safety changes

2012-04-08 23:48:02 +02:00