gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
6,102 Commits 53 Branches 176 Tags
471393b4214b1c8f8c836db56c2effc2f65ab04c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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 28b18575f2 fixed issue #66: game creators can't kick spectators; unfortunately, this fix is client-side 2012-07-17 19:06:12 +02:00
Max-Wilhelm Bruker a1e35ccda5 servatrice: create correct game ids when not using a database 2012-07-17 18:47:00 +02:00
Max-Wilhelm Bruker c8852b450d don't open database in connection pools if main database connection is not valid 2012-07-17 18:15:10 +02:00
Max-Wilhelm Bruker 2c22fc93ff Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-29 15:48:04 +02:00
Max-Wilhelm Bruker 2eb3df1cde servatrice.sql fixes 2012-06-29 15:47:53 +02:00
Max-Wilhelm Bruker 63dc0bd4a9 Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-28 10:54:21 +02:00
Max-Wilhelm Bruker a91090a828 added missing tables in servatrice.sql 2012-06-28 10:54:08 +02:00
Max-Wilhelm Bruker 7938171aca Mac client: translation path fix 2012-06-27 21:44:49 +02:00
Max-Wilhelm Bruker c7131e3a1d Windows client: translation path fix 2012-06-27 20:41:42 +02:00
Max-Wilhelm Bruker e17751ccdf added Croatia to countries 2012-06-27 13:30:24 +02:00
Max-Wilhelm Bruker 8e5f5e4cbd added missing table to servatrice.sql 2012-06-27 11:20:53 +02:00
Max-Wilhelm Bruker e7b58c4d8e server: fixed spectator count not being updated 2012-06-25 13:07:26 +02:00
Max-Wilhelm Bruker 593be45d94 added missing retranslateUi() call in TabMessage; minor Swedish fixes 2012-06-25 12:16:02 +02:00
Max-Wilhelm Bruker 7f6e1e7314 Merge pull request #57 from Daenyth/master 
Fix compile error with gcc >= 4.7
 2012-06-10 04:00:24 -07:00
Max-Wilhelm Bruker c043fe3c5a client local game crash fix 2012-05-08 12:48:24 +02:00
Max-Wilhelm Bruker c7fa2fe985 fixed clone function, updated servatrice.ini.example to reflect changes in room creation syntax 2012-04-26 16:22:48 +02:00
Max-Wilhelm Bruker 86111c7bad updated windows installer 2012-04-22 18:27:28 +02:00
Max-Wilhelm Bruker 38cf2621b4 preliminary changes to make deck editor a tab 2012-04-22 05:06:51 -04:00
Max-Wilhelm Bruker eb927d77c3 updated German translation; added some missing retranslateUi() calls 2012-04-08 23:58:25 +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 f9e0b6fe9e moved the user list context menu to a separate class to avoid redundant code 2012-04-07 23:05:45 +02:00
Max-Wilhelm Bruker ae19d3dc4b fixed game list update bug, minor optimizations, restrict client protocol output to QT_DEBUG mode 2012-04-06 17:52:23 +02:00
Max-Wilhelm Bruker 118b575e58 updated German translation, minor token fix 2012-04-06 15:34:00 +02:00
Max-Wilhelm Bruker 12b5e39440 improved token dialog w/ storage inside the deck list - now we need a reliable online source for token data (preferably with pictures) 2012-04-06 15:16:52 +02:00
Max-Wilhelm Bruker f553fd7456 some token code 2012-04-05 11:48:13 +02:00
Max-Wilhelm Bruker 0165ea61ff Swedish translation done 2012-03-27 10:55:57 +02:00
Max-Wilhelm Bruker 10d958c4ce Merge branch 'master' into devel 2012-03-23 12:18:16 +01:00
Max-Wilhelm Bruker c92f3e4239 fix for issue #17: oracle: convert smart quotes to normal quotes in card names 2012-03-23 12:17:59 +01:00
Max-Wilhelm Bruker 89b8fe1e21 cmake fix 2012-02-25 23:10:56 +01:00
Max-Wilhelm Bruker 703426d848 cmake fix 2012-02-25 15:18:14 +01:00
Max-Wilhelm Bruker 96213fc3f3 Windows fixes 2012-02-25 14:50:06 +01:00
Max-Wilhelm Bruker 89c920479c cmake fix 2012-02-21 01:21:32 +01:00
Max-Wilhelm Bruker 89bb8e72ee use 'git describe' to generate version info for the about box and servatrice. fixes issue #20 2012-02-21 01:08:16 +01:00
Max-Wilhelm Bruker a1bcd9854f preliminary client-side replay support, works in principle 2012-02-21 00:09:03 +01:00
Max-Wilhelm Bruker d50d179b2f server-side replay support 2012-02-20 22:13:48 +01:00
Max-Wilhelm Bruker 7cec442694 setDoesntUntap fixed, card menu moved to player to avoid unnecessary allocation of QActions 2012-02-20 17:26:46 +01:00
Max-Wilhelm Bruker 8af0f01db8 CardInfoWidget fix 2012-02-20 12:53:33 +01:00
mbruker 332ca29d62 Merge pull request #4 from Daenyth/show-unjoinable-checkbox 
Change "Show full" "Show running" checkboxes to a single box
 2012-01-29 08:02:06 -08:00
mbruker c7662999d3 Merge pull request #3 from Daenyth/master 
Add planeswalker loyalty to CardInfoWidget
 2012-01-29 07:56:36 -08:00
mbruker 355c0919e7 Merge pull request #8 from Daenyth/translation 
Translation: gd (Scots Gaelic)
 2012-01-22 03:44:37 -08:00
Max-Wilhelm Bruker 609e3fc41d converted SetCardAttr attr_name to enum 2012-01-02 20:20:31 +01:00
Max-Wilhelm Bruker 4634787b00 converted some Player commands to command lists; added db type checks in server 2012-01-02 19:41:37 +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 eabe3511cb compile fix 2012-01-01 20:07:54 +01:00
Max-Wilhelm Bruker ff3eb9b5f4 display reason for ban to banned user 2012-01-01 19:38:52 +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 695fde7541 PB: enough for today 2011-12-31 00:12:46 +01:00
Max-Wilhelm Bruker c4eb7ba6cf PB: more client files compile 2011-12-30 22:29:57 +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 ca9122b9fb added responses + events 2011-12-29 19:40:41 +01:00
Max-Wilhelm Bruker 153ba11271 nsis update 2011-07-20 22:19:03 +02:00
Max-Wilhelm Bruker 55a9e68822 German translation fix 2011-07-20 21:43:20 +02:00
Max-Wilhelm Bruker 46fdae43cd visual improvements: card hover effect, independent scaling of ZoneViewWidget 2011-07-20 21:25:43 +02:00
Max-Wilhelm Bruker 6b7c5eefd3 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-20 16:18:57 +02:00
Max-Wilhelm Bruker 58ace2fac8 deck editor autoselection 2011-07-20 16:14:56 +02:00
Max-Wilhelm Bruker 380a8b2d41 foo 2011-07-10 14:43:22 +02:00
Max-Wilhelm Bruker dd4948576c temp: removed cockatrice_cs.ts 2011-07-10 14:40:48 +02:00
Max-Wilhelm Bruker 8c3a3150b4 initial Czech translation by Ondřej Trhoň 2011-07-10 14:29:16 +02:00
Max-Wilhelm Bruker 07317efd46 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-09 12:14:24 +02:00
Max-Wilhelm Bruker fbc9ff7601 extra logging 2011-07-09 12:14:07 +02:00