servatrice/common
Max-Wilhelm Bruker 135fed79ca Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice
Conflicts:
	common/server_game.cpp
2010-09-07 03:55:56 +02:00
..
.directory boom 2009-10-29 17:13:37 +01:00
decklist.cpp local playing bugfixes 2010-08-11 04:23:12 +02:00
decklist.h save deck to clipboard 2010-06-06 16:06:38 +02:00
protocol.cpp local playing bugfixes 2010-08-11 04:23:12 +02:00
protocol.h local playing bugfixes 2010-08-11 04:23:12 +02:00
protocol_datastructures.cpp local playing bugfixes 2010-08-11 04:23:12 +02:00
protocol_datastructures.h arrows can target players; card attachment works 2010-07-17 18:24:14 +02:00
protocol_item_ids.h optionally destroy tokens on zone change; added multi arrows; card menu changes; arrow fixes; initial commit for attachCard code 2010-06-27 14:50:51 +02:00
protocol_items.cpp optionally destroy tokens on zone change; added multi arrows; card menu changes; arrow fixes; initial commit for attachCard code 2010-06-27 14:50:51 +02:00
protocol_items.dat optionally destroy tokens on zone change; added multi arrows; card menu changes; arrow fixes; initial commit for attachCard code 2010-06-27 14:50:51 +02:00
protocol_items.h optionally destroy tokens on zone change; added multi arrows; card menu changes; arrow fixes; initial commit for attachCard code 2010-06-27 14:50:51 +02:00
protocol_mc.pl removed some useless game events in favor of event context classes; added some preliminary icons 2010-03-03 18:20:46 +01:00
rng_abstract.cpp boom 2009-10-29 17:13:37 +01:00
rng_abstract.h boom 2009-10-29 17:13:37 +01:00
rng_qt.cpp boom 2009-10-29 17:13:37 +01:00
rng_qt.h boom 2009-10-29 17:13:37 +01:00
serializable_item.cpp local playing bugfixes 2010-08-11 04:23:12 +02:00
serializable_item.h minor fixes; ROE set added 2010-04-16 16:15:27 +02:00
server.cpp single player improvements 2010-09-07 03:51:48 +02:00
server.h more code for local playing 2010-08-14 17:01:14 +02:00
server_arrow.h arrows can target players now 2010-06-27 17:56:09 +02:00
server_arrowtarget.h arrows can target players now 2010-06-27 17:56:09 +02:00
server_card.cpp arrows can target players; card attachment works 2010-07-17 18:24:14 +02:00
server_card.h arrows can target players; card attachment works 2010-07-17 18:24:14 +02:00
server_cardzone.cpp server has to assign free table space for a new card so that there is no race condition 2010-06-18 19:57:06 +02:00
server_cardzone.h server has to assign free table space for a new card so that there is no race condition 2010-06-18 19:57:06 +02:00
server_chatchannel.cpp local playing bugfixes 2010-08-11 04:23:12 +02:00
server_chatchannel.h events 2009-11-03 17:26:03 +01:00
server_counter.h game is almost playable again 2009-11-26 18:52:53 +01:00
server_game.cpp Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice 2010-09-07 03:55:56 +02:00
server_game.h nextTurn cleanup -> fixed the bug that the game would begin with active player 0 even if there is no player 0 2010-08-11 01:17:45 +02:00
server_player.cpp local playing bugfixes 2010-08-11 04:23:12 +02:00
server_player.h local playing bugfixes 2010-08-11 04:23:12 +02:00
server_protocolhandler.cpp Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice 2010-09-07 03:55:56 +02:00
server_protocolhandler.h local playing bugfixes 2010-08-11 04:23:12 +02:00