Leahnaya/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-23 08:03:25 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
5,342 Commits 44 Branches 167 Tags 130 MiB
8cc64bf44e
Commit Graph

148 Commits

Author SHA1 Message Date
Zach H
12c9e4b81a allow placement below top X cards (#2666) 
Close #2666
 2017-04-27 20:32:24 -04:00
Fabio Bas
2c551bdd35 Revert "fix #2332" 
This reverts commit 0fd77346df.
 2017-04-25 19:35:07 +02:00
Fabio Bas
0fd77346df fix #2332 2017-04-25 18:58:01 +02:00
ctrlaltca
29904c49da Specify reason when on game leave; fix #2624 (#2633) 
* fix #2624

* feedback++
 2017-04-24 22:20:08 +02:00
Fabio Bas
8826908923 Automatically attach related cards to the original card 2015-06-13 15:40:59 +02:00
ctrlaltca
25f444a5af Merge pull request #1051 from poixen/reveal_top_x 
Reveal top x cards
 2015-05-16 18:20:56 +02:00
Matt Lowe
59c0834427 Reveal top x cards 
Updated reveal top card to reveal top x cards
Sometimes you want to reveal more than only the top 1 card.
 2015-05-04 10:49:49 +02:00
Matt Lowe
33fa3ae032 Fixed revealing top card bug 
Previously if you were to reveal the top card, then look at the top x (x
> 1) cards, then move them to another zone, the top card would stop
being revealed.

The issue was that when moving the cards the first card was being
revealed, then being moved.

I have also fixed an issue too:
+ reveal top card
+ scry 4
+ grab all cards and move to the first column of available space at the
left most of the screen (column 0). Everything is fine.
+ now try with another column (> 0), you will see that the card order
has flipped.

This no longer happens.

This needs some testing before being merged. I will run the build for a
while, right now it feels good though.
 2015-05-02 17:25:41 +02:00
Matt Lowe
9a36ac8035 Added colored storm counter 2015-04-19 18:14:29 +02:00
Fabio Bas
dcc6677e8f fix #884 2015-04-01 23:04:10 +02:00
Fabio Bas
c72ddcfaed Tabs -> spaces 2015-02-22 20:07:47 +01:00
Fabio Bas
a7b8934a1b Fix remaining issues 2015-02-22 20:02:58 +01:00
Fabio Bas
925b4a83b0 Fix "sender id" and "ip address" fields in game 2015-01-01 16:20:57 +01:00
Fabio Bas
c875054fb5 Log messages from rooms, games and chats 2014-12-13 18:43:59 +01:00
Fabio Bas
3102dd60f9 Hide unused parameters in common/ to avoid warnings 2014-07-24 18:09:28 +02:00
arxanas
4e8ba699d2 Tabs to spaces. 2014-07-08 22:53:02 -04:00
Daenyth
4c2a553f03 Have servatrice inform players of sideboard size 
Ref #142
 2014-06-28 00:36:43 -04:00
Mark Morschhäuser
ccab97ca7d RNG: added additional checks (which forced an interface redesign), updated comments 2014-06-09 13:31:21 +02: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
14287e54f9 server crash fix 2013-01-26 16:08:42 +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
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
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
Max-Wilhelm Bruker
8cc5ee28a3 disallow face-down cards in other zones than the table 2012-06-25 01:04:13 +02:00
Max-Wilhelm Bruker
aa2488fb91 server crash fix; also fixes single player crash on Mac wrt AlwaysRevealTopCard 2012-06-02 16:33:16 +02:00
Max-Wilhelm Bruker
b328c1ed4d database interface separated from server, multiple concurrent database connections are now possible 2012-05-28 16:32:45 +02:00
Max-Wilhelm Bruker
539b693ac4 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel 2012-04-22 11:02:52 +02:00
Max-Wilhelm Bruker
7649a36962 merged server crash fix 2012-04-22 11:02:36 +02:00
Max-Wilhelm Bruker
afe5c72204 server crash fix 2012-04-22 10:57:42 +02:00
Max-Wilhelm Bruker
95cd293b9c 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
Max-Wilhelm Bruker
c835a827b0 AlwaysRevealTopCard done, issue #31 fixed 2012-04-01 11:45:01 +02:00
Max-Wilhelm Bruker
840b577f42 complete server-side AlwaysRevealTopCard support, related to issue #31 2012-03-31 22:47:42 +02:00
Max-Wilhelm Bruker
005a4363d3 removed unnecessary mutex calls 2012-03-31 22:08:22 +02:00
Max-Wilhelm Bruker
7417236c3a preliminary AlwaysRevealTopCard support related to issue #31, server code cleanup (finally removed getGameState) 2012-03-31 21:47:30 +02:00
Max-Wilhelm Bruker
767d53b5a8 merged from master 2012-03-31 18:41:01 +02:00
Max-Wilhelm Bruker
b2b7242802 changed lock icon, added sideboard locking, issue #15 fixed 2012-03-27 20:32:24 +02:00
Max-Wilhelm Bruker
5ff1fd8ec6 added peeking at facedown cards, fixing issue #7 2012-03-24 18:52:08 +01:00
Max-Wilhelm Bruker
adbb607700 Revealing a library to a player now grants that player permission to drag cards out of that library onto his own table. This permission is revoked by shuffling the library. The zone view window tracks content changes of the zone for as long as the permission lasts so that card ID changes are kept track of. This hopefully fixes issues #5 and #12. 2012-03-24 17:48:25 +01:00
Max-Wilhelm Bruker
80967b59e3 fixed another faceDown bug 2012-03-22 23:42:26 +01:00
Max-Wilhelm Bruker
af8e357487 improved code for automatic joining of persistent games; disconnecting + reconnecting works as it should with ISL 2012-03-18 21:57:21 +01:00
Max-Wilhelm Bruker
5db0fcd6ae 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
Max-Wilhelm Bruker
c9a8429044 always get next game/replay id from database to avoid id collisions in multi-server mode 2012-03-17 23:01:56 +01:00
Max-Wilhelm Bruker
9706ecd98a added mutex for RNG, moved game command implementation from S_PH to S_Player in preparation for forwarding of game commands via tunneling interface 2012-03-17 22:26:12 +01:00
Max-Wilhelm Bruker
d50d179b2f server-side replay support 2012-02-20 22:13:48 +01:00
Max-Wilhelm Bruker
4895f2b4fd server code cleanup, changed in-game ping event to not use any bandwidth as long as nothing changes 2012-01-29 13:36:43 +01:00
Max-Wilhelm Bruker
e202d659a0 moc weirdness workaround on Unix, added install target 2012-01-21 22:13:27 +01:00
Max-Wilhelm Bruker
16541141bd Cleaned up decklist code 2012-01-21 16:41:46 +01:00
Max-Wilhelm Bruker
609e3fc41d converted SetCardAttr attr_name to enum 2012-01-02 20:20:31 +01:00
Max-Wilhelm Bruker
0c9a2b061c deck storage is fully working again, cleaned up some unnecessarily large messages 2012-01-02 15:46:14 +01:00
Max-Wilhelm Bruker
d4aaf9fff5 minor cleanups, server-side deck storage code is working again 2012-01-02 00:11:33 +01:00
Max-Wilhelm Bruker
6344b987de fixed pw loyalty in oracle, PB code working 2012-01-01 18:15:32 +01:00
Max-Wilhelm Bruker
d5c628966f PB: everything compiles except for deck storage 2012-01-01 02:48:24 +01:00
Max-Wilhelm Bruker
d3b96b1a88 PB: server compiles again, standalone RemoteClient is able to log in 2011-12-30 21:50:25 +01:00
Max-Wilhelm Bruker
10018280e5 more PB 2011-12-30 02:03:26 +01:00
Max-Wilhelm Bruker
314f17091d protobuf client->server communication almost working 2011-12-18 18:35:14 +01:00
Max-Wilhelm Bruker
4eb9dfc5bf server-side part of client -> server commands almost converted to ProtocolBuffers. not usable yet 2011-12-04 23:21:31 +01:00
unknown
0bb4ef8bb8 added deck hashing 2011-10-04 16:55:18 +02:00
unknown
da467468d5 improved facedown moving 2011-09-15 14:19:29 +02:00
Max-Wilhelm Bruker
898623f1ba filter running games; minor server code cleanup 2011-07-03 16:45:52 +02:00
Max-Wilhelm Bruker
808d2a3c01 Event context for mulligans, German translation 2011-05-21 23:48:46 +02:00
Max-Wilhelm Bruker
c4ba33dfeb server mutex fix 2011-04-21 02:04:15 +02:00
Max-Wilhelm Bruker
69fce1fb5d thread fixes 2011-04-18 18:55:35 +02:00
Max-Wilhelm Bruker
9933b219a9 game list mutex in S_PH 2011-04-17 16:31:03 +02:00
Max-Wilhelm Bruker
81a5d58d70 more mutexes 2011-03-22 19:37:56 +01:00
Max-Wilhelm Bruker
cd20a3d0f4 don't show p/t when playing facedown cards 2011-03-10 00:30:22 +01:00
Max-Wilhelm Bruker
ce80d29f50 improved cipt handling, initial p/t for cards 2011-02-16 20:05:03 +01:00
Max-Wilhelm Bruker
d05603f83b p/t changes 2011-02-16 18:34:46 +01:00
Max-Wilhelm Bruker
d4f600393f minor visual change, server crash fix, multiplayer leave/concede fixes 2011-02-15 22:50:16 +01:00
Max-Wilhelm Bruker
7116382a96 added 'undo last draw' feature. protocol version bump (12) 2011-01-27 17:49:31 +01:00
Max-Wilhelm Bruker
25de242180 controller change bug fix 2011-01-26 13:44:02 +01:00
Max-Wilhelm Bruker
92e842bb74 fixed direct chat, fixed in-game attachment bugs 2011-01-25 00:12:35 +01:00
Max-Wilhelm Bruker
6b370ce16b allow controller change even from a different zone 2011-01-21 18:00:01 +01:00
Max-Wilhelm Bruker
9c527fb5aa Click to hide revealed cards; MultiMove function 2011-01-15 21:39:24 +01:00
Max-Wilhelm Bruker
231887367c card menu improvement, change controller support (bug #3) 2010-12-23 19:21:47 +01:00
Max-Wilhelm Bruker
feb1dac1e1 attach arrow bug fix, improved stacking 2010-12-16 00:42:46 +01:00
Max-Wilhelm Bruker
f4962d021e experimental card stacking 2010-12-14 19:26:40 +01:00
Max-Wilhelm Bruker
df5791d318 Introduced stack zone, shrunk table to have higher zoom factor 2010-11-03 21:28:43 +01:00
Max-Wilhelm Bruker
b1d8c7bda0 Made QColor wrapper class so that Servatrice will compile without QtGui 2010-10-09 18:50:06 +02:00
Max-Wilhelm Bruker
f9446f9822 generalized user information 2010-09-18 21:05:28 +02:00
Max-Wilhelm Bruker
168d184e8f local playing bugfixes 2010-08-11 04:23:12 +02:00
Max-Wilhelm Bruker
7921b5f82d initial commit of local server code 2010-08-04 13:56:51 +02:00
Max-Wilhelm Bruker
929f4f9b4d cleanup 2010-03-09 14:43:06 +01:00
Max-Wilhelm Bruker
b2f83541e7 Initial commit for sideboarding. It's supposed to be fully functional. 2010-03-06 17:17:54 +01:00
Max-Wilhelm Bruker
0c508f63ec removed some useless game events in favor of event context classes; added some preliminary icons 2010-03-03 18:20:46 +01:00
Max-Wilhelm Bruker
3714e1cbf5 server crash fix 2010-01-26 16:56:07 +01:00
Max-Wilhelm Bruker
d23ece59ea crash fixes; move_card fixes 2009-12-18 19:03:02 +01:00
Max-Wilhelm Bruker
564ae4db84 some cleanups and fixes 2009-12-15 16:48:14 +01:00
Max-Wilhelm Bruker
035d143615 memory leak 2009-12-02 14:52:37 +01:00
Max-Wilhelm Bruker
e796af2b89 game is almost playable again 2009-11-26 18:52:53 +01:00
Max-Wilhelm Bruker
0d4717f40b new code 2009-11-25 22:58:20 +01:00
Max-Wilhelm Bruker
8dcf81654e decklist transfer code 2009-11-22 00:34:31 +01:00
Max-Wilhelm Bruker
dd5ae4d74d more server code 2009-11-08 17:05:25 +01:00
Max-Wilhelm Bruker
1c2aa15b22 boom 2009-10-29 17:13:37 +01:00