gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-28 22:51:03 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,319 Commits 52 Branches 176 Tags
cd9f4e985629e073dd15c0005261ab4a00a4bf99
Commit Graph
400 Commits
Author SHA1 Message Date
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