3073 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gavin Bisesi	ebc4011559	Restore register.py script removed in 5ace0dd892 ... This is intended to be an example of using the protocol from something other than C++ and to be a building block for future test clients.	2015-09-03 09:13:31 -04:00
Zach	f4ae08f8b1	Merge pull request #1439 from woogerboy21/feature_check ... Added server/client feature set communication	2015-09-02 23:38:53 -04:00
woogerboy21	044c2356ff	Added server/client feature set communication	2015-09-02 17:54:06 -04:00
Zach	3188ef4cde	Merge pull request #1444 from woogerboy21/fix_blank_ban ... Detect if a use is trying to place an invalid ban	2015-09-01 22:20:05 -04:00
marco	baa61d0571	Merge branch 'master' into Refactor-settings ... Conflicts: oracle/CMakeLists.txt	2015-09-01 21:28:53 +02:00
ctrlaltca	0a9057d1b8	Merge pull request #1451 from ctrlaltca/fix_1449 ... Let git track the empty dir "themes/Default"	2015-09-01 10:29:35 +02:00
Fabio Bas	d9ecb5db8b	Let git track this empty dir	2015-09-01 08:57:30 +02:00
Zach	f5f5074023	Merge pull request #1081 from ctrlaltca/themes_clean ... Theme manager	2015-08-31 18:50:36 -04:00
Fabio Bas	6d7baec37b	Merge with master	2015-08-31 22:55:46 +02:00
Fabio Bas	5cfb034452	merged with master	2015-08-31 22:48:14 +02:00
ctrlaltca	949b0183c8	Merge pull request #1448 from woogerboy21/log_session_mismatch ... Log inconsistent session / session table situation	2015-08-31 21:45:55 +02:00
woogerboy21	de073a51d6	Log inconsistent session / session table situation	2015-08-31 08:29:26 -04:00
woogerboy21	66c19ab727	Detect if a use is trying to place an invalid ban	2015-08-31 01:00:13 -04:00
woogerboy21	13e536013e	Merge pull request #1442 from woogerboy21/fix_oldsession ... Fix bug that crashes server when old session is logged out during login	2015-08-30 23:51:33 -04:00
woogerboy21	66dce1bf46	Fix bug that crashes server when old session is logged out during login	2015-08-30 23:33:11 -04:00
woogerboy21	8bb6bb04d7	Merge pull request #1441 from woogerboy21/fix_check ... Fix ban issue	2015-08-30 19:45:04 -04:00
woogerboy21	d8b53f9345	Update ban check to exclude empty client id's	2015-08-30 18:48:57 -04:00
Gavin Bisesi	c0a0775323	Merge pull request #1434 from Cockatrice/restore-xsd ... Restore xsd files removed in #1428	2015-08-28 18:25:14 -04:00
Gavin Bisesi	3c1a7bc760	Restore xsd files removed in #1428 ... ಠ_ಠ	2015-08-28 18:24:25 -04:00
Zach	6a64e4a2e1	Merge pull request #1432 from ZeldaZach/fix_1427 ... Remove docs in favor of wiki	2015-08-28 15:39:00 -04:00
Zach H	854e0a764c	remove docs in favor of wiki	2015-08-28 14:59:49 -04:00
Zach	e6a8fa59e3	Merge pull request #1428 from tooomm/patch-1 ... text adjustments in oracle	2015-08-27 12:39:00 -04:00
ctrlaltca	885edc8953	Merge pull request #1429 from ctrlaltca/translations ... Fetched new translations. Arrr!	2015-08-27 18:32:54 +02:00
Fabio Bas	fcff6301ed	Fetched new translations. Arrr!	2015-08-27 18:32:14 +02:00
tooomm	5d8d2f277c	oxford compliance ... @ZeldaZach grammar nazi :) 👍	2015-08-27 15:55:22 +02:00
tooomm	17665aad60	fixed alignment ... nice alignment over strict tabbing	2015-08-27 14:55:19 +02:00
tooomm	f18f136d2b	text adjustments ... - removed some info text since oracle imports all cards now and no longer offers sets selection - added info about token - `<br/>` --> `\n` - capitalized `URL` --> http://www.oxforddictionaries.com/definition/english/URL	2015-08-27 14:43:34 +02:00
Zach	311536d1aa	Merge pull request #1423 from tooomm/patch-1	2015-08-26 10:26:57 -04:00
tooomm	83e9f9deba	typos resolved ... @marcofernandezheras ok?	2015-08-26 15:33:05 +02:00
woogerboy21	fdea69cfed	Merge pull request #1421 from woogerboy21/fix_proto_warnings ... Corrected proto warnings & spacing	2015-08-26 08:22:50 -04:00
woogerboy21	cfebd53d5d	Corrected proto warnings	2015-08-25 23:40:08 -04:00
marco	0b94b47f72	Servatrice portable + cmake options ... Use -DPORTABLE=1 to build a portable version	2015-08-25 21:25:13 +02:00
marco	4125d690fa	Fix merge & relative path for portable build	2015-08-25 20:22:31 +02:00
woogerboy21	7453385903	Merge pull request #1417 from woogerboy21/send_clientver ... Extend the login protocol to send the client version (as optional)	2015-08-24 11:54:04 -04:00
woogerboy21	364df4daf0	Extend the login protocol to send the client id (as optional)	2015-08-24 11:38:24 -04:00
Zach	324ddda4dd	Merge pull request #1416 from ZeldaZach/fix_1411 ... Define URLs	2015-08-23 23:00:22 -04:00
Zach	14da4efe6d	Merge pull request #1414 from ZeldaZach/fix_1412 ... Prevent bad flags	2015-08-23 17:59:52 -04:00
Zach H	a8727d5a50	define URLs	2015-08-23 17:57:26 -04:00
Zach	4d2fdaec08	Merge pull request #1407 from Fizztastic/fix_1396 ... Option to opt-out of remember game settings	2015-08-23 16:28:01 -04:00
Zach H	8ffe310855	prevent bad flags	2015-08-23 16:27:18 -04:00
ctrlaltca	ab33258ce9	Merge pull request #1415 from ctrlaltca/translations ... Translations: extracted new strings	2015-08-23 20:54:50 +02:00
Fabio Bas	b335bc5e7d	Translations: extracted new strings	2015-08-23 20:54:11 +02:00
marco	be7efa98cf	Fix relative path for image download & settings	2015-08-23 15:54:52 +02:00
marco	1e2d5b0693	Fix translate setting + Mod oracle to portable build	2015-08-23 14:14:11 +02:00
Jeff	ca82fd867a	Option to opt-out of remember game settings	2015-08-22 15:52:03 -04:00
Zach	432c856f0d	Merge pull request #1400 from woogerboy21/logout_old_session ... Log old session out of server if logging in from a second location	2015-08-22 15:37:50 -04:00
woogerboy21	b0630b81ca	Log old session out of server if logging in from a second location	2015-08-22 13:41:02 -04:00
Gavin Bisesi	0c0413f056	Merge pull request #1404 from Cockatrice/docker-tweak ... Use servatrice as docker entrypoint	2015-08-22 09:57:10 -04:00
Gavin Bisesi	34c78b3113	Use servatrice as docker entrypoint ... This lets you "docker run servatrice" and pass command line arguments	2015-08-22 08:43:44 -04:00
ctrlaltca	18ec8e20b6	Merge pull request #1381 from ZeldaZach/flags_to_lower ... Country to lower (fix win bug)	2015-08-22 11:53:22 +02:00