aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4621 commits 1 branch 0 tags 51 MiB
Commit graph

613 commits

Author SHA1 Message Date
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
878b760321 Removed lprotobuf error on building 
Will need @ctrlaltca to confirm this wont mess anything up. I have
removed a option to se set from the cmake file. This option is not
needed.

Windows users, you will need to run cmake to create the sln again.
 2015-05-01 22:32:31 +02:00
Matt Lowe
9c1e509a37 Fixed issue with non creature perms set to 0/0 
The issue was that I had set the ctor to set the p/t to 0/0 rather than
-1/-1. This meant that when you join a game in progress (spec or
reconnect) the server would send the card value to the client as 0/0,
instead of -1/-1. The client has been coded so that if the toughness is
<0 then dont show it. 0/0 is instead shown.

We still need to look into cards with no p/t being set to a 0/1 as
@tooomm mentioned in anther issue. As it stands, this is more important
than that.
 2015-04-26 00:57:31 +02:00
Matt Lowe
1356bbcd94 Fix for #1007 2015-04-22 16:53:07 +02:00
Matt Lowe
9a36ac8035 Added colored storm counter 2015-04-19 18:14:29 +02:00
Fabio Bas
1b9d835213 Quick compilation fix for debug mode 2015-04-17 17:30:42 +02:00
Matt Lowe
f46d68b5c6 Server was using message limit for commands 
Server was using getMaxMessageCountPerInterval over
getMaxCommandCountPerInterval.

Raised command limit from 10 to 20
 2015-04-12 22:55:38 +02:00
Matt Lowe
be2a5f4720 Creatures can now have power less than -1 
Addresses issue from #934
 2015-04-10 12:39:41 +02:00
Matt Lowe
7680154395 Added more actions to server white list 
I have added card moving to the white list. I was getting flood messages
when moving cards quickly in my side deck.
 2015-04-07 21:49:49 +02:00
Zach
bc8d9427e3 Merge pull request #899 from poixen/mull_flood 
Added Mull to the server whitelist
 2015-04-01 18:15:44 -04:00
Fabio Bas
dcc6677e8f fix #884 2015-04-01 23:04:10 +02:00
Matt Lowe
c039a3aa42 Added Mull to the whitelist 
Mullling through 2 hands will give a flood warning, a user thought this
should not happen. It is very similar to drawing cards, which is in the
white list.
 2015-04-01 22:08:46 +02:00
Fabio Bas
5463255516 Added whitelist for game commands 2015-03-19 10:50:46 +01:00
Fabio Bas
0e437cf13b Anti flood for game commands 2015-03-14 19:44:32 +01:00
poixen
93286f6d18 Merge pull request #803 from poixen/removed_constructor 
Removed constructor
 2015-03-07 11:50:41 +01:00
Zach
5f05c0be91 Merge pull request #775 from Cockatrice/fix-331 
Cards played face down always go untapped to main row.
 2015-03-06 23:57:05 -05:00
Matt Lowe
319b5d88b2 Removed redundant constructor 
Removed constructor that was not needed. Also removes annoying "error"
output when compiling.
 2015-03-06 21:09:18 +01: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
Gavin Bises
4d8218da13 Avoid compilation failure due to protobuf bug on osx 
https://code.google.com/p/protobuf/issues/detail?id=119
 2015-02-21 07:16:51 -05:00
Jeffrey Oliver
843cd9718e Reduce the whitespace in the server game constructor. 2015-02-03 22:22:31 -08:00
Gavin Bisesi
69e6aa355f Merge pull request #534 from poixen/accountage 
Added account age to user info window
 2015-01-11 21:37:07 -05:00
Matt Lowe
02043ad4f9 Added Account Age 
+ Added the ability to see the account age of registered users. Changes
are both in server and client. The server will now send back the
registration date along with the user data. The client will then use
this to calculate the account age and display it in the user details
window.
 2015-01-11 00:45:12 +01:00
Fabio Bas
925b4a83b0 Fix "sender id" and "ip address" fields in game 2015-01-01 16:20:57 +01:00
Fabio Bas
cd69bc8f9d Add configuration options to enable database logging 2015-01-01 15:48:53 +01:00
Fabio Bas
c875054fb5 Log messages from rooms, games and chats 2014-12-13 18:43:59 +01:00
Fabio Bas
02978ce404 Implement the logging method 2014-12-13 18:43:31 +01:00
Fabio Bas
15555c16fd Fix servatrice's regonly mode 2014-10-06 22:56:09 +02:00
Gavin Bisesi
134810b979 Merge pull request #279 from ctrlaltca/valgrind_unified 
Fixed Valgrind warnings
 2014-08-11 09:11:12 -04:00
Gavin Bisesi
5c46cfc169 Merge pull request #179 from woogerboy21/registered-user-only-server 
Registered Only Server
 2014-08-11 09:03:57 -04:00
Fabio Bas
1da2e7154c Fixed Valgrind warnings 
Running cockatrice in valgrind i didn't found any bad memory leak
(good!), but only a few jumps depending on uninitialized variables.
Even if the possibility of crashes are remote, it's nice to sort them
out.
 2014-08-11 10:08:33 +02:00
woogerboy21
6b8ca1e8a2 Cleaned up potential memory leak 2014-08-10 15:48:15 -04:00
Fabio Bas
3102dd60f9 Hide unused parameters in common/ to avoid warnings 2014-07-24 18:09:28 +02:00
Fabio Bas
6c7ba0950a Fix warning for DeskList copy constructors 
Using pointers for classes derived from QObject would be the best idea.
 2014-07-24 18:00:20 +02:00
Gavin Bisesi
395658988a Merge pull request #220 from arxanas/deck-parser-ampersand 
Fix #183: Deck parser doesn't too eagerly replace ampersands.
 2014-07-23 08:53:04 -04:00
Waleed Khan
359882917a Merge remote-tracking branch 'upstream/master' 
Some tabs to spaces, and maybe fixed to work with Qt 5.

Conflicts:
	cockatrice/src/deckstats_interface.cpp
	common/decklist.cpp
	common/decklist.h
	oracle/src/oracleimporter.cpp
 2014-07-20 14:40:18 -04:00
arxanas
b1bfda9f4e Merge remote-tracking branch 'upstream/master' into deck-parser-ampersand 
Conflicts:
	common/decklist.cpp
 2014-07-19 18:12:49 -04:00
arxanas
0eb97c91b3 Fix #183: Deck parser doesn't too eagerly replace ampersands. 2014-07-19 14:47:19 -04:00
arxanas
88e6d0d3eb Tabs to spaces. 2014-07-19 14:28:46 -04:00
woogerboy21
021f0911c4 Merge remote-tracking branch 'upstream/master' into registered-user-only-server 
Conflicts:
	common/server.cpp
	common/server_protocolhandler.cpp
	servatrice/src/servatrice.cpp
 2014-07-18 23:46:56 -04:00
Gavin Bisesi
f83d58309b Merge pull request #126 from ctrlaltca/cmake_qt5 
Qt5 support
 2014-07-10 13:13:51 -04:00
arxanas
04e80304ef Fix #184: Deck loader reads 4x cardname correctly. 2014-07-08 22:56:18 -04:00
arxanas
4e8ba699d2 Tabs to spaces. 2014-07-08 22:53:02 -04:00
woogerboy21
0a1fe7f5a8 Requested Cleanup 
Corrected tab to 4 space (per request)
Moved regonly option under authentication ini location (per request)
 2014-07-02 22:27:05 -04:00
woogerboy21
d246fa39fe Registered Only Server 
Implemented the ability to set the server to only allow registered
users.  Also updated client to reflect the log-in rejection as well as
put a check in place for the server to not start if db connection is not
available yet registration is required.
 2014-07-02 20:52:22 -04:00
arxanas
7cbe410172 Fix #45: don't send tokens to deckstats. 2014-06-30 03:08:55 -04:00
Fabio Bas
fc24ffdec2 Cmake reorganization 
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
 2014-06-28 19:39:26 +02:00
Daenyth
09d6d26fb2 Merge branch 'master' into cmake_qt5 
Conflicts:
	cockatrice/src/main.cpp
 2014-06-28 09:13:10 -04:00
Daenyth
4c2a553f03 Have servatrice inform players of sideboard size 
Ref #142
 2014-06-28 00:36:43 -04:00
Daenyth
6d3fe428e7 Fix some warnings 
Ref #127
 2014-06-27 22:19:23 -04:00
Fabio Bas
80f68306b5 Ported oracle to Qt5 2014-06-24 18:28:09 +02:00
Fabio Bas
5c13c06982 Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-24 18:13:26 +02:00
Daenyth
e5d9692d78 Fall back to plain text load when xml load fails 2014-06-24 00:14:59 -04:00
Daenyth
68c0932a2f Don't have decklist sort behavior rely on column order 2014-06-22 08:36:35 -04:00
Daenyth
e99c1bbe6d Merge remote-tracking branch 'origin/master' into editor-sorting-v5 2014-06-22 08:10:22 -04:00
Fabio Bas
d7a962c055 CMake: support fir linking against qt5 2014-06-21 14:12:55 +02:00
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
Daenyth
6913f2bb4e Merge branch 'master' into musty 
Conflicts:
	common/server_cardzone.cpp
 2014-06-14 19:06:49 -04:00
Fabio Bas
a4fbf8b677 Force linking with pthread under unix 
Protobuf depends on pthread under unix, but cmake’s FindProtobuf
doesn’t add -lpthread to link flags
 2014-06-13 19:09:33 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
ed0311d59e Added comments for comment's CMakeLists.txt 2014-06-11 01:26:54 +02:00
Fabio Bas
4fd8c94df0 Overhaul common's CMakeLists.txt 
* Use automoc instead of a manual list of headers
* Remove Qt4 detection
* Created missing .cpp for .h files (for automoc detection)
* Remove pthread linking
* Forcing -lprotobuf is not needed for mingw; msvc only?
 2014-06-11 01:24:34 +02:00
Mark Morschhäuser
ccab97ca7d RNG: added additional checks (which forced an interface redesign), updated comments 2014-06-09 13:31:21 +02:00
Mark Morschhäuser
197dd0f3c8 Remove useless bound checks. 2014-05-30 11:48:07 +02:00
Mark Morschhäuser
69201460e6 Included climits for UINT_MAX non-aware compilers. 2014-05-18 10:54:41 +02:00
Mark Morschhäuser
f964dcc656 Added additional bound checks. 2014-03-20 15:37:21 +01:00
Mark Morschhäuser
fbf54b62bc Test if macro already exists to shutup warning. 2014-03-18 20:41:39 +01:00
Mark Morschhäuser
7c606af63e Fixed warning regarding virtual function overrides. Using C++ standard. 
See http://msdn.microsoft.com/en-us/library/bb384874(v=vs.90).aspx
 2014-03-12 09:11:01 +01:00
Mark Morschhäuser
4eb845d438 Throw exception if RNG is used with invalid bounds. 2014-03-11 09:41:37 +01:00
Mark Morschhäuser
9a20e5e2e2 Commented a pitfall in case of RNG replacement. 2014-03-11 08:18:54 +01:00
Mark Morschhäuser
800f7e6373 Use distribution function with rejection sampling. 2014-03-10 14:13:46 +01:00
Mark Morschhäuser
424513eb90 Forgot to add lower bound in RNG generation. 2014-03-08 17:45:59 +01:00
Name
0128798c64 4 Space Tabs 2014-03-08 11:35:35 -05:00
Mark Morschhäuser
a15eb6f29f Updated SFMT RNG code, removed Qt RNG 2014-03-08 17:08:40 +01:00
Musty Mustelidae
1d3667f37d Implemented Fisher–Yates shuffle. Assumes RNG function is in form getNumber(min,max), with min and max inclusive (Did not find documentation on function) 2014-03-08 01:23:21 -05:00
Musty Mustelidae
2ad09399f4 Implemented Fisher–Yates shuffle. Assumes RNG function is in form getNumber(min,max), with min and max inclusive (Did not find documentation on function) 2014-03-07 09:09:56 -05:00
Buce
a62ba91a5d Add different compare methods for sorting 
Give DeckList nodes the ability to sort based on name, price, or
number.
 2014-02-28 15:38:23 -06:00
Matt Kelly
b93317cc17 OS X still works with pthread fix - added explanation 2014-02-14 14:14:10 -05:00
Matt Kelly
e366bd7a71 Fixed for Linux - pushing to test on OS X 2014-02-14 13:58:54 -05:00
jfreake
504a56cf95 Right aligned the regex check 
decklist - Right aligned the regex check
 2014-01-08 12:55:44 -04:00
jfreake
67c4d089be Deck Load Mods and Movable Tabs 
Changes:
Deck Load - Default to all types *.*
Decklist - Strip "|edition" from .dec formats that include a pipe and
the edition after the card name
Tab_Supervisor - Make tabs movable (able to rearrange tabs)
 2014-01-08 11:54:02 -04:00
Tomasz Wegrzanowski
b57d628278 Made Ctrl-V importer work more robust. 2013-11-12 11:46:38 +00:00
Mark Morschhäuser
562de0553f Fixed compile warnings due to missing \n at EOF. 2013-05-15 21:31:47 +02:00
Daenyth
347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
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
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
c65f327e71 server crash fixes 2013-01-27 15:15:27 +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
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
cc3760a7df fixed deadlock condition 2012-11-16 21:42:17 +01:00
Max-Wilhelm Bruker
43d7cf6a1a removed recursive lock in server; moved object serialisation to worker thread 2012-10-14 13:19:03 +02:00
Daenyth
af09d0d294 Reject more invalid usernames from clients. 
Specifically this should cover people connecting with a username of
"\u200C"
 2012-07-25 00:12:35 -04: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
a1e35ccda5 servatrice: create correct game ids when not using a database 2012-07-17 18:47:00 +02:00
Max-Wilhelm Bruker
f080e8b1a4 fixed bug #61: replay doesn't show game info; also fixed playing area not being displayed in any subgame but the first 2012-06-27 20:03:39 +02:00
Max-Wilhelm Bruker
e7b58c4d8e server: fixed spectator count not being updated 2012-06-25 13:07: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
80439762cf hide login passwords from server log; call logDebugMessage in S_PH thread instead of Server thread 2012-06-03 19:23:15 +02:00
Max-Wilhelm Bruker
7157963204 removed usleep() call to enable compilation on Windows again 2012-06-02 19:38:31 +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
d7e7606104 fixed 'open deck in deck editor' option in game, fixed freeze when closing local game 2012-05-28 19:34:07 +02:00
Max-Wilhelm Bruker
520300dc86 made server threaded, fixing issue #51 2012-05-28 18:51:58 +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
981db47f9e initial commit for connection pools 2012-05-20 18:47:28 +02:00
Max-Wilhelm Bruker
44d688b1d5 added deckstats.net interface in deck editor, fixing issue #39 2012-05-17 20:11:46 +02:00
Max-Wilhelm Bruker
295cc65dce minor fix wrt issue #42 2012-05-09 23:25:29 +02:00
Max-Wilhelm Bruker
b9087715bf fixed issue #42: make 'client deprecated' message work for v13 client <-> v14 server 2012-05-09 23:13:23 +02:00
Max-Wilhelm Bruker
0eee6d7ab9 fixed issue #49: when editing a remote deck, be able to directly save it there 2012-05-09 21:52:09 +02:00
Max-Wilhelm Bruker
f00eaa83d4 added missing file 2012-05-07 20:24:18 +02:00
Max-Wilhelm Bruker
e76502cf0e handle dead commands when the connection is lost before the reply gets processed 2012-05-01 21:16:16 +02:00
Max-Wilhelm Bruker
f6f8ad82b2 server code cleanup 2012-05-01 12:48:59 +02:00
Max-Wilhelm Bruker
e5a0a08569 fixed #43: add delete button to local dir view in deck storage tab and in remote dir view in replays tab 2012-05-01 12:08:09 +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
0a30f22e5f Merge branch 'master' of github.com:mbruker/Cockatrice 2012-04-22 10:58:15 +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
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
f553fd7456 some token code 2012-04-05 11:48:13 +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
b289ab0d9f fixed server crash condition 2012-03-31 18:07:31 +02:00
Max-Wilhelm Bruker
13b992cf12 show ban duration in client 2012-03-31 12:07:25 +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
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
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
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
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
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
c9b66e4239 more ServerNetwork code 2012-03-04 19:23:43 +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
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
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
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
d50d179b2f server-side replay support 2012-02-20 22:13:48 +01:00
Max-Wilhelm Bruker
a2778ab129 fixed bug #21: Players can't draw arrow to avatar icons any more 2012-02-16 21:22:46 +01:00
Max-Wilhelm Bruker
5692addf54 don't send useless information in getGameState; fixed bug that caused an attached card to have undefined coordinates when its parent card was destroyed by conceding or leaving 2012-01-30 00:21:47 +01:00
a b
7faa033855 Mac fixes 2012-01-29 21:17:32 +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
f385917a90 Win32 compile fix 2012-01-21 20:38:16 +01:00
Max-Wilhelm Bruker
3c24899de6 switched from qmake to cmake 2012-01-21 19:21:57 +01:00
Max-Wilhelm Bruker
16541141bd Cleaned up decklist code 2012-01-21 16:41:46 +01:00
Max-Wilhelm Bruker
7c2c6eac14 changed creation_time to time_t to get around Qt4.7 dependency 2012-01-03 01:13:15 +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
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
c5509db251 reasonable defaults 2011-12-19 00:03:05 +01:00
Max-Wilhelm Bruker
f115342e47 local mode is working again 2011-12-18 23:30:53 +01:00
Max-Wilhelm Bruker
38e4781624 fixed packet length calculation bug, re-enabled deck selection 2011-12-18 19:10:47 +01:00
Max-Wilhelm Bruker
314f17091d protobuf client->server communication almost working 2011-12-18 18:35:14 +01:00
Max-Wilhelm Bruker
6ca1d1f09f server crash fix 2011-12-18 12:59:04 +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
Max-Wilhelm Bruker
1455c093cc store sessions in database 2011-12-04 13:36:53 +01:00
Max-Wilhelm Bruker
6b18ba6bac concession fix 2011-11-13 16:55:41 +01:00
Max-Wilhelm Bruker
a34bccb530 give back host privileges to game creator when he rejoins 2011-11-13 13:58:21 +01:00
Max-Wilhelm Bruker
c7ef61f750 moderators can override game restrictions and kick players when spectating; game host privileges shift when host leaves 2011-11-13 13:13:41 +01:00
Max-Wilhelm Bruker
632e9bbff3 improved banning and deck hashing 2011-11-01 22:44:51 +01:00
unknown
3ea81dfe2b server deck hash fix 2011-10-04 17:17:49 +02:00
unknown
0bb4ef8bb8 added deck hashing 2011-10-04 16:55:18 +02:00
cockatrice
53330090fb added sha512 password hashing, protocol version 13, server version bump 2011-09-21 13:12:08 +00:00
unknown
8344920fdc minor server fix 2011-09-16 15:09:59 +02:00
unknown
da467468d5 improved facedown moving 2011-09-15 14:19:29 +02:00
unknown
1047ab08e8 added facedown to ServerInfo_Card 2011-09-15 12:24:33 +02:00
unknown
e105c42580 preliminary: moved auto-rejoin code back to login 2011-09-13 16:09:42 +02:00
Max-Wilhelm Bruker
f38c5f50ef server crash fix 2011-08-03 16:51:14 +02:00
Max-Wilhelm Bruker
a569a1b8b1 changed chat indentation, allow leftclick for CardInfoWidget in ChatView, changed GameSelector indentation 2011-08-03 01:19:57 +02:00
Max-Wilhelm Bruker
3ff5158b6f server crash fix 2011-08-02 21:10:38 +02:00
Max-Wilhelm Bruker
b38f0e2100 extra logging; minor server crash fix 2011-07-11 23:49:54 +02:00
Max-Wilhelm Bruker
c8813bb2aa extra server logging, server memory leak fixed, m12 2011-07-11 23:01:59 +02:00
Max-Wilhelm Bruker
f10d9c9bec strip newlines from msg in cmdRoomSay; improved i18n in MessageLogWidget 2011-07-06 18:45:56 +02:00
Max-Wilhelm Bruker
17609ec6f8 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-05 12:44:46 +02:00
Max-Wilhelm Bruker
ef42c7518a added argentina to countries 2011-07-05 12:44:39 +02:00
Max-Wilhelm Bruker
6a77e765a7 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-05 01:49:43 +02:00
Max-Wilhelm Bruker
c4a2229ae4 added debug stuff 2011-07-05 01:49:15 +02:00
Max-Wilhelm Bruker
83e2e3666a server memory leak fixed 2011-07-04 17:14:48 +02:00
Max-Wilhelm Bruker
fd171fa260 servatrice Qt 4.4 compile fix 2011-07-03 17:10:24 +02:00
Max-Wilhelm Bruker
898623f1ba filter running games; minor server code cleanup 2011-07-03 16:45:52 +02:00
Max-Wilhelm Bruker
abd5425796 finished getGamesOfUser function 2011-07-02 16:43:19 +02:00
Max-Wilhelm Bruker
d5de76ec4a Merge branch 'master' of ssh://129.217.164.162/home/brukie/cockatrice 2011-07-02 14:36:36 +02:00
Max-Wilhelm Bruker
be12a0b3a9 preliminary showGamesOfUser support 2011-07-02 14:36:10 +02:00
Max-Wilhelm Bruker
a86f6ba5b8 minor change 2011-07-02 02:14:08 +02:00
Max-Wilhelm Bruker
aa38733f03 fixed Server_Card::resetState 2011-06-27 14:50:07 +02:00
Max-Wilhelm Bruker
d0e832b069 limit game name length to 50 characters 2011-06-27 14:42:57 +02:00
Max-Wilhelm Bruker
05ebb83ba4 improved banning; added [url] and [card] tags for chat 2011-06-25 21:21:19 +02:00
Max-Wilhelm Bruker
4b84168bda client/server version bump; eventConnectionStateChanged 2011-06-25 17:50:28 +02:00
Max-Wilhelm Bruker
d892d320ea dynamic compression support 2011-06-25 15:58:38 +02:00
Max-Wilhelm Bruker
a4c3d48389 server shutdown function 2011-06-24 18:45:39 +02:00
Max-Wilhelm Bruker
b7ab2d97bd support for women 2011-06-22 17:39:25 +02:00
Max-Wilhelm Bruker
6226e381de price tag feature by Marcio Ribeiro 2011-06-16 16:43:01 +02:00
Max-Wilhelm Bruker
04a96be84a fixed doesntUntap bug (with protocol change) 2011-05-27 21:56:16 +02:00
Max-Wilhelm Bruker
808d2a3c01 Event context for mulligans, German translation 2011-05-21 23:48:46 +02:00
Max-Wilhelm Bruker
461a62e0c8 LocalServer crash fix 2011-05-08 17:56:52 +02:00
Max-Wilhelm Bruker
c4ba33dfeb server mutex fix 2011-04-21 02:04:15 +02:00
Max-Wilhelm Bruker
38b31681e2 changed leave game shortcut, server cleanups, added max_games_per_user 2011-04-21 01:52:09 +02:00
Max-Wilhelm Bruker
d0b8c6ebd9 changed mutex lock 2011-04-19 04:13:23 +02:00
Max-Wilhelm Bruker
2c6d112ba4 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-04-18 18:56:27 +02:00
Max-Wilhelm Bruker
69fce1fb5d thread fixes 2011-04-18 18:55:35 +02:00
Max-Wilhelm Bruker
6f3a20f53f SIGABRT handler, crash fix 2011-04-18 17:50:42 +02:00
Max-Wilhelm Bruker
9933b219a9 game list mutex in S_PH 2011-04-17 16:31:03 +02:00
Max-Wilhelm Bruker
2d8b12a576 reduced game selector minimum height; server race conditions fixed 2011-04-17 15:46:47 +02:00
Max-Wilhelm Bruker
42ad959220 Merge branch 'master' into experimental 2011-04-06 15:49:20 +02:00
Max-Wilhelm Bruker
6c5dd0b3d1 attach fix 2011-04-05 17:56:40 +02:00
Max-Wilhelm Bruker
6d5b29395c mutex and ghost games fixes 2011-03-29 23:54:08 +02:00
Max-Wilhelm Bruker
8e0f7dcf03 Merge branch 'master' of ../bla 2011-03-29 23:09:40 +02:00
Max-Wilhelm Bruker
2f98abe892 fixFreeSpaces fixed 2011-03-29 23:04:48 +02:00
Max-Wilhelm Bruker
eca941201d more mutexes 2011-03-22 22:46:15 +01:00
Max-Wilhelm Bruker
45890b836b added send buffer to limit socket operations to one thread 2011-03-22 20:45:18 +01:00
Max-Wilhelm Bruker
81a5d58d70 more mutexes 2011-03-22 19:37:56 +01:00
Max-Wilhelm Bruker
4548841a93 server crash fix 2011-03-22 18:31:26 +01:00
Max-Wilhelm Bruker
fd7593edc1 improved logging, improved server multithreading 2011-03-22 17:55:20 +01:00