3157 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
ctrlaltca	613f712974	Merge pull request #1646 from ctrlaltca/debian_package ... CPack: Debian package	2015-10-17 09:33:06 +02:00
ctrlaltca	75eb779826	Merge pull request #1637 from ctrlaltca/cmdjoin_handler ... Handle more Command_JoinRoom return values	2015-10-16 11:48:40 +02:00
Fabio Bas	23e84273ed	If the user request to join a room and we are already in, just focus the correct tab ... Also, handle all the Command_JoinRoom return values	2015-10-15 19:17:02 +02:00
Fabio Bas	8f674bd18c	Updated to qt 5.4.2	2015-10-14 18:45:10 +02:00
Fabio Bas	4dba476ab6	modernize bash dialect	2015-10-14 15:45:54 +02:00
Fabio Bas	bab4a51ebb	CPack: Debian package	2015-10-13 22:16:00 +02:00
ctrlaltca	0c67cb6cb3	Merge pull request #1641 from ctrlaltca/pr_1600 ... CMake: Add "test" target	2015-10-09 18:53:01 +02:00
Fabio Bas	5fed8d04d6	Updated docs	2015-10-09 18:51:30 +02:00
Fabio Bas	b63475829b	Revert option from WITH_TESTS to TEST	2015-10-09 15:47:34 +02:00
Fabio Bas	7fe60279de	Fix PR #1600	2015-10-09 14:59:42 +02:00
Gavin BisesiandFabio Bas	3ebe42c400	Add dummy googletest ... Uses the built in cmake -Dtest=ON It should download googletest on the fly if needed. Adds a new make target, `make test` Ref #167	2015-10-09 14:58:46 +02:00
woogerboy21	cd02df78a1	Merge pull request #1627 from ctrlaltca/no_jom_no_cry ... Fix appveyor builds	2015-10-05 15:13:43 -04:00
Fabio Bas	784148e158	try fixing appveyor ... dropping jom and using plain nmake	2015-10-02 18:14:54 +02:00
ctrlaltca	43262b294d	Merge pull request #1620 from ctrlaltca/fix_rpath ... Fix qt libraries bundling on osx	2015-10-02 17:54:10 +02:00
ctrlaltca	b0e9e0fb3a	Merge pull request #1603 from ctrlaltca/fix_audio ... Fix volume control	2015-10-02 14:46:30 +02:00
Fabio Bas	74c58cc2b0	fix qt libraries bundling on osx ... fix #1547	2015-10-01 23:35:54 +02:00
Zach	d09b75a3c0	Merge pull request #1608 from ctrlaltca/travis_package ... Travis changes for package creation	2015-10-01 14:32:24 -04:00
Zach	30531683f4	Merge pull request #1615 from Psithief/patch-1 ... Revert focus policy change	2015-10-01 14:17:06 -04:00
Zach	56f8ddc1f6	Merge pull request #1619 from tooomm/patch-2 ... added appveyor badge to README	2015-10-01 14:11:33 -04:00
tooomm	ab2a6867b5	added appveyor badge ... badge for master branch	2015-10-01 18:37:11 +02:00
ctrlaltca	9d4882415a	Merge pull request #1618 from ctrlaltca/fix_artifacts ... Appveyor: fix artifact names	2015-10-01 15:08:45 +02:00
Fabio Bas	3e9610a084	Fix artifact names	2015-10-01 10:14:50 +02:00
Psithief	ca9bfc9ff2	Revert focus policy change in tab_game ... Fixes #1529. Completely untested, because I don't think this could possibly interfere with anything. It's a straight revert.	2015-10-01 12:00:30 +08:00
ctrlaltca	6a869906d9	Merge pull request #1589 from ctrlaltca/appveyor ... Added appveyor script	2015-09-30 09:46:35 +02:00
Fabio Bas	35815a894a	Make travis build a package	2015-09-29 23:38:30 +02:00
Fabio Bas	a9f2cd73de	Fix volume control ... fix #1528	2015-09-28 12:24:22 +02:00
Fabio Bas	8e348455f9	Added appveyor script	2015-09-27 10:36:53 +02:00
woogerboy21	9c4bd8ebed	Merge pull request #1593 from woogerboy21/remove_mod_notify ... Crash Fix: Removed mod notification code that causes crashes	2015-09-26 23:36:50 -04:00
woogerboy21	7d7151135e	Removed mod notification code that causes crashes	2015-09-26 23:19:49 -04:00
woogerboy21	c1663d578a	Merge pull request #1588 from Cockatrice/servatrice.sql_warntable_syntaxfix ... Corrected mod_name column syntax in warnings table	2015-09-25 18:40:09 -04:00
woogerboy21	7a4cabaf67	Corrected mod_name column syntax in warnings table ... It was missing a comma at the end of the line.	2015-09-25 18:19:44 -04:00
woogerboy21	291b262b64	Merge pull request #1569 from woogerboy21/correct_warn_schema ... Updated cockatrice_warnings table to use id column as primary key	2015-09-25 08:09:56 -04:00
woogerboy21	b65882f7ce	Updated cockatrice_warnings table to use id column as primary key	2015-09-25 07:35:23 -04:00
Zach	d55e44ea60	Merge pull request #1558 from Cockatrice/revert-1556-carddatabase_changes ... Revert "Reimplemented PictureLoader as a singleton" 2015-09-24-Release	2015-09-23 03:17:49 -04:00
Zach	d5adec53a2	Revert "Reimplemented PictureLoader as a singleton"	2015-09-23 03:17:33 -04:00
Zach	064c89ba5c	Merge pull request #1556 from ctrlaltca/carddatabase_changes ... Reimplemented PictureLoader as a singleton	2015-09-23 01:21:37 -04:00
Zach	ad55c3e198	Merge pull request #1541 from woogerboy21/log_tab ... Added logs tab to allow moderators the ability to review log history	2015-09-23 01:01:20 -04:00
woogerboy21	62ffcde6bd	Added logs tab to allow moderators the ability to review log history/details	2015-09-23 00:50:01 -04:00
Zach	e68b8b314a	Merge pull request #1522 from woogerboy21/offical_warnings ... Added official warning messages moderators can use to inform users	2015-09-22 23:29:12 -04:00
woogerboy21	6ad2a59367	Added official warning messages moderators can use to inform users	2015-09-22 22:27:46 -04:00
Fabio Bas	e0383af6dd	workaround "Signals are protected in qt4"	2015-09-22 23:57:39 +02:00
Fabio Bas	ac16602f08	Fix crash on null pointer dereference	2015-09-22 23:46:41 +02:00
Fabio Bas	f6c7f3355f	Reimplemented PictureLoader as a singleton ... * Removed remaining picture handling from card database and cardinfo * removed the “noCard object” hack	2015-09-22 23:09:53 +02:00
Zach	3f70513096	Merge pull request #1555 from ctrlaltca/cards_crash ... Fix crash on loading invalid cards.xml	2015-09-22 16:19:12 -04:00
Zach	8125358052	Merge pull request #1523 from marcofernandezheras/Restore-Shortcuts ... Restore shortcuts	2015-09-22 16:00:49 -04:00