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
1,000 Commits 53 Branches 176 Tags
eced4e23407d437d2f08e36023ff82e78c345465
Commit Graph
1000 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Max-Wilhelm Bruker eced4e2340 merge 2012-03-25 17:06:48 +02:00
Max-Wilhelm Bruker 1224eae1c0 added button to test custom translation file 2012-03-25 17:02:52 +02:00
Max-Wilhelm Bruker 95dd3fc04c added credits for Swedish translation 2012-03-25 16:40:54 +02:00
Max-Wilhelm Bruker 9dcf205d36 really added the file this time 2012-03-25 15:49:43 +02:00
Max-Wilhelm Bruker 7833363501 Merge branch 'master' of github.com:mbruker/Cockatrice 2012-03-25 15:48:57 +02:00
Max-Wilhelm Bruker 9a34d7b929 translation update, included stub for Swedish 2012-03-25 15:48:29 +02:00
Max-Wilhelm Bruker 3b70ad8c66 minor fixes wrt commit 4e4a7563db 2012-03-25 14:41:52 +02:00
Max-Wilhelm Bruker 4e4a7563db The remote client now runs in an extra thread, fixing issue #29 2012-03-25 13:19:40 +02:00
Max-Wilhelm Bruker 542fd2c5c8 added menu item: game->game information, issue #1 fixed 2012-03-24 22:09:06 +01:00
Max-Wilhelm Bruker 5ff1fd8ec6 added peeking at facedown cards, fixing issue #7 2012-03-24 18:52:08 +01:00
Max-Wilhelm Bruker 662df6d972 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel 2012-03-24 17:50:29 +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 2ce18a82f5 RevealCards message log bug fixed 2012-03-24 15:25:32 +01: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 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 671214c60e mutex fixes, server shutdown works again 2012-03-17 19:05:22 +01:00
Max-Wilhelm Bruker d792c3ddc6 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into servernetwork 2012-03-17 17:08:47 +01:00
Max-Wilhelm Bruker 9e1ee50081 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel 2012-03-17 17:08:19 +01:00
Max-Wilhelm Bruker 2259204890 cleaned up PictureLoader thread 2012-03-17 17:07:48 +01:00
Max-Wilhelm Bruker c23af44749 changed a lot of thread locking code in the server, rooms are working with ISL now 2012-03-17 16:09:00 +01:00
Max-Wilhelm Bruker 572e4eaafa more ISL code, mutex fixes 2012-03-12 00:36:44 +01:00
Max-Wilhelm Bruker 0ae18d7b2e more ISL code: join, leave, and userMessage work on both sides 2012-03-11 17:25:45 +01:00
Max-Wilhelm Bruker 61b351aa9f fixed client crash that occurred when the game ended with a card tap/untap animation running 2012-03-11 11:26:07 +01:00
Max-Wilhelm Bruker 76c7d96310 CardInfoWidget as popup now has a card size related to the screen size 2012-03-10 23:26:35 +01:00
Max-Wilhelm Bruker 5963c2239c renamed servernetwork to ISL (inter-server link), join/leave is working 2012-03-10 19:02:15 +01:00
Max-Wilhelm Bruker dda78661ea added missing table unlock command 2012-03-10 16:38:00 +01:00
Max-Wilhelm Bruker decf1c04bd switched NetworkServerThread to new thread creation method, SSL is working 2012-03-10 16:16:31 +01:00
Max-Wilhelm Bruker 0719d4c6ed client-side SSL works, thread initialization needs fixing 2012-03-04 23:15:39 +01:00
Max-Wilhelm Bruker c9b66e4239 more ServerNetwork code 2012-03-04 19:23:43 +01:00
Max-Wilhelm Bruker 6bbc76af2b Merge branch 'devel' into servernetwork 2012-03-04 12:23:22 +01:00
Max-Wilhelm Bruker b0378544c4 added icon for expiration lock button, added close button to replay tab, minor GUI fixes 2012-03-04 12:05:28 +01:00
Max-Wilhelm Bruker acb03c2bf2 replays expire after two weeks, lock can be toggled to prevent that 2012-03-04 11:35:56 +01:00
Max-Wilhelm Bruker a876a0bf5f tell logged in clients about new replays 2012-03-03 18:10:16 +01:00
Max-Wilhelm Bruker 2487476fcc added checkbox to disable password storage 2012-03-03 15:54:50 +01:00
Max-Wilhelm Bruker a27bc20887 added missing file 2012-03-02 20:45:57 +01:00
Max-Wilhelm Bruker 8481e61e8f Replays split up, one for each subgame 2012-03-02 20:45:04 +01:00
Max-Wilhelm Bruker 50e53fbe53 initial commit for server network support 2012-02-26 21:00:05 +01:00
Max-Wilhelm Bruker 4dc712286f preliminary client-side replay watching code 2012-02-26 16:35:34 +01:00
Max-Wilhelm Bruker 65d4c77ee8 cmake fix 2012-02-25 23:18:08 +01:00
Max-Wilhelm Bruker 89b8fe1e21 cmake fix 2012-02-25 23:10:56 +01:00
Max-Wilhelm Bruker c6c6a970c6 interface & client tab for replay transfer 2012-02-25 19:33:44 +01:00
Max-Wilhelm Bruker faf6b2c5cb Merge /home/brukie/.VirtualBox/Machines/Windows XP/shared/cock_devel 2012-02-25 15:18:34 +01:00
Max-Wilhelm Bruker 703426d848 cmake fix 2012-02-25 15:18:14 +01:00
Max-Wilhelm Bruker 50295b6e98 Merge /home/brukie/.VirtualBox/Machines/Windows XP/shared/cock_devel 2012-02-25 14:56:12 +01:00
Max-Wilhelm Bruker 96213fc3f3 Windows fixes 2012-02-25 14:50:06 +01:00