3205 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ctrlaltca	c917a6c272	Merge pull request #1722 from ctrlaltca/rev-related ... Implement reverse-related tag for cards	2015-12-27 18:44:05 +01:00
Zach	c4508cd055	Merge pull request #1723 from ZeldaZach/fix_1710 ... Coin Flips	2015-12-27 12:38:06 -05:00
Zach H	137d7328b5	coin flip ... remove male/female as it's same male/female fixes translate	2015-12-27 12:34:11 -05:00
ctrlaltca	04797eaf48	Merge pull request #1724 from ctrlaltca/windows_merda ... Fix win32 package creation	2015-12-27 18:04:10 +01:00
Fabio Bas	49b22b7d2f	Try to fix package creation	2015-12-27 16:03:32 +01:00
Fabio Bas	4b1c59424e	Implement reverse-related tag for cards	2015-12-26 19:57:20 +01:00
ctrlaltca	f03051b6cf	Merge pull request #1642 from ctrlaltca/dont_merge_this_yet ... Split PictureLoader out of CardDatabase	2015-12-26 17:13:21 +01:00
Fabio Bas	e721280bc0	Implemented proposed changes	2015-12-26 16:40:17 +01:00
Fabio Bas	4d7795ca3a	Split pictuloader out of carddatabase	2015-12-26 16:40:17 +01:00
ctrlaltca	aebc18fc3f	Merge pull request #1717 from ctrlaltca/fix_1716 ... Possibly fix server crash #1716	2015-12-26 16:24:10 +01:00
ctrlaltca	4e17014ebf	Merge pull request #1714 from ctrlaltca/fix_1598 ... Possible fix for server crash	2015-12-20 14:45:06 +01:00
Fabio Bas	81cad7cefd	Possibly fix #1716	2015-12-20 14:38:27 +01:00
ctrlaltca	0e1c26a071	Merge pull request #1715 from ctrlaltca/pr_1668 ... Add gear icon to settings menu entry	2015-12-19 14:21:32 +01:00
Fabio Bas	696ae7e85f	Add gear icon to settings menu entry	2015-12-19 11:48:54 +01:00
Fabio Bas	25d77fb64a	Possibly fix #1598	2015-12-15 16:58:44 +01:00
ctrlaltca	7e6972a358	Merge pull request #1713 from ctrlaltca/translations ... Small typos + reextracted strings	2015-12-15 16:32:16 +01:00
Fabio Bas	5093ea4170	Small typos + reextracted strings	2015-12-15 16:31:58 +01:00
ctrlaltca	f5749886ee	Merge pull request #1712 from ctrlaltca/translations ... Extracted new translation strings	2015-12-15 15:59:39 +01:00
Fabio Bas	2712dd4248	Extracted new translation strings	2015-12-15 15:59:20 +01:00
ctrlaltca	ade0a4b7e2	Merge pull request #1708 from ctrlaltca/appveyor_deploy ... Deploy from Appveyor to Bintray	2015-12-14 16:29:36 +01:00
Fabio Bas	5636b43e67	Test appveyor deploy	2015-12-14 15:06:16 +01:00
ctrlaltca	db8548521c	Merge pull request #1707 from ctrlaltca/fix_1703 ... Add correct encrypted api key to deploy to bintray	2015-12-14 09:53:21 +01:00
Fabio Bas	1a6a1171e6	Add bintray badges	2015-12-14 09:47:03 +01:00
Fabio Bas	a637ff7cfa	Add correct encrypted api key to deploy to bintray	2015-12-14 09:32:31 +01:00
ctrlaltca	0e229ad1fd	Merge pull request #1705 from ctrlaltca/fix_1683 ... Add .txt to the common deck file types	2015-12-13 12:10:15 +01:00
Fabio Bas	ed4149fa7b	Add .txt to the common deck file types ... fix #1683	2015-12-13 12:00:39 +01:00
ctrlaltca	ea7db15597	Merge pull request #1704 from ctrlaltca/fix_1670 ... Whoops: Fix db schema number	2015-12-13 11:54:07 +01:00
Fabio Bas	53191fcb99	Whoops: Fix db schema number	2015-12-13 11:53:30 +01:00
ctrlaltca	ce6c97bcef	Merge pull request #1670 from jedinerd/sql_fix_for_token_disabled_option ... Having token set to not null breaks the use of requireemail=false	2015-12-13 11:46:23 +01:00
ctrlaltca	a17c300a41	Merge pull request #1688 from Cockatrice/check-schema-ver ... Add script to validate schema changes.	2015-12-13 11:04:02 +01:00
Fabio Bas	93566840b9	install bc package on linux for the check_schema_version script	2015-12-13 10:48:45 +01:00
Gavin BisesiandFabio Bas	3aac8930cc	Add script to validate schema changes. ... Basic assertions about version updates	2015-12-13 10:47:39 +01:00
ctrlaltca	586d580864	Merge pull request #1650 from ctrlaltca/test_travis_deploy ... Travis updates	2015-12-13 10:39:10 +01:00
ctrlaltca	8167448284	Merge pull request #1654 from ctrlaltca/facedown ... Server-size fixes for card stacking	2015-12-13 10:37:47 +01:00
ctrlaltca	0c137e8a10	Merge pull request #1662 from BrandonGriffin/SetFocusOnDescriptionWhenLoadingGameDialog ... Added set focus to description anytime a create dialog is opened	2015-12-12 18:17:12 +01:00
ctrlaltca	de6235f69c	Merge pull request #1698 from ctrlaltca/fix_1694 ... Improved login error message	2015-12-12 09:15:01 +01:00
ctrlaltca	a07b72a031	Merge pull request #1699 from ctrlaltca/fix_1687 ... Fix column widths in rooms list	2015-12-12 09:14:51 +01:00
ctrlaltca	7e63f44c04	Merge pull request #1700 from ctrlaltca/fix_1675 ... Avoid crash on dereferencing null pointer	2015-12-12 09:14:24 +01:00
Fabio Bas	deec7cdc14	Avoid crash on dereferencing null pointer	2015-12-11 19:32:08 +01:00
Fabio Bas	803589264d	Fix column widths in rooms list	2015-12-11 18:51:40 +01:00
Fabio Bas	beecc0f970	Improved login error message	2015-12-11 18:42:29 +01:00
ctrlaltca	0286cd3df0	Merge pull request #1697 from ctrlaltca/fix_1695 ... Fix velvet marble theme	2015-12-11 17:55:13 +01:00
Fabio Bas	91bb2b2954	Fix velvet marble theme ... fix #1695	2015-12-11 16:34:46 +01:00
Gavin Bisesi	a6ff54ae0e	Merge pull request #1682 from tooomm/patch-2 ... link renaming	2015-11-22 10:01:05 -05:00
tooomm	bc44f8ce2a	link renaming ... -`Linking FAQ` --> `How to set a custom picture url` -updated define accordingly	2015-11-17 16:04:29 +01:00
Michael Hogg	d9c0c97ae7	Updating schema version to 12 and adding migration script.	2015-11-08 03:05:12 -08:00
Michael Hogg	9963e9dfe7	Having token set to not null breaks the use of requireemail=false in the servatrice.ini as token will be null in this use case.	2015-11-07 12:57:58 -08:00
Brandon Griffin	813a0c2070	Added set focus to description anytime a create dialong is opened	2015-10-27 08:58:29 -04:00
Zach	77b9aa7c36	Merge pull request #1658 from BrandonGriffin/PlayToStackDefault ... Changed the default setting to play cards to the stack	2015-10-24 12:01:23 -04:00
Brandon Griffin	64c15d1fdc	Changed the default setting to play cards to the stack	2015-10-23 20:11:13 -04:00