2333 commits

Author	SHA1	Message	Date
Zach H	27969b6752	prevent null crash	2016-03-18 14:25:29 -04:00
Fabio Bas	1e3fb6c6e1	Rework "paths" settings loading and card database loading ... * main.cpp: removed path checking and db loading * card database: merge card loading methods into a single one * settings cache: take care of returning safe paths for decks, replays, etc.. * main window: if db loading fails (eg. first run), propose to run oracle NSIS: propose to run cockatrice instead of oracle Rework card database loading * Move carddatabase-related method out of deckeditor tab * Load cards in another thread and render them progressively * Optimize database reload after enabled sets change Fix deck editor column width * removed the noCard hack. * getCard() no more creates cards instead of just returning existing ones * Fix the “edit tokens” dialog. * PictureLoader: avoid trying to download twice the same card * PictureLoader: correct return of card background * AbstractCardItem: avoid recalculating card color at every paint Use a different file to save custom tokens Misc required improvements * Use nullptr; * Refactor CardInfoWidget to use CardInfoPicture and CardInfoText instead of duplicating code; * Added CardInfo::getColorChar() * Fixed some potential crashes * removed dead code related to CardInfoWidget * Don't require a restart after adding a new custom sets file * Bump CMake requirements to 3.1	2016-03-15 22:27:55 +01:00
ctrlaltca	b2c1ae264b	Merge pull request #1832 from tooomm/restructure ... move sounds+themes folder inside cockatrice	2016-02-24 21:38:09 +01:00
tooomm	754e666eaa	updated to new folder locations ... - `sounds` and `themes` moved into `cockatrice/` moved subdirectory reference `/cmakelists` to `/cockatrice/cmakelists`	2016-02-24 15:41:04 +01:00
Gavin Bisesi	bc79d9e2f8	Merge pull request #1796 from zebington/feat/custom-set-import ... Add "Import custom set" function	2016-02-24 09:12:31 -05:00
Zach	5b22187a3d	Merge pull request #1794 from zebington/master ... Fixes for create game dialogue.	2016-02-16 17:07:28 -05:00
Fabio Bas	a8c723326d	Game tab: use short title for undocked wdgets ... fix #1777	2016-02-12 14:49:37 +01:00
Fabio Bas	ae8296a50e	Game tab: reset docks sizes on "reset layout"	2016-02-11 18:29:50 +01:00
Ira Aspen	aa658f95f6	Gave error dlg a description of the error for the user.	2016-02-09 03:10:57 +00:00
Ira Aspen	d078cf52c9	Removed unnecessary confirmClose() call.	2016-02-09 02:57:23 +00:00
Ira Aspen	96fbad1f0c	Moved get next set index code to own function	2016-02-09 02:55:52 +00:00
Ira Aspen	829f84fe50	Moved from using hex QT version checks to QT_VERSION_CHECK().	2016-02-09 01:56:24 +00:00
Ira Aspen	0ef2b48902	Refactored DlgAddSet class/functions to DlgAddSetResult	2016-02-09 01:52:09 +00:00
Ira Aspen	5a975831d4	Renamed "dlg_add_set.*" to "dlg_add_set_result.*" and updated references.	2016-02-09 01:40:21 +00:00
Fabio Bas	058b913455	Game: save and restore dock sizes	2016-02-07 21:58:51 +01:00
Ira Aspen	9d3c4f20a1	Changed strings referencing a set to say sets/cards.	2016-02-07 01:41:35 +00:00
tooomm	802ccd7f14	shortcut tabs adjustments ... - typo fix - improved description of some shortcuts	2016-02-06 19:29:57 +01:00
Ira Aspen	b5363f47ab	Updated message.	2016-02-06 12:42:45 +00:00
Ira Aspen	927226633d	Moved menu item decleration to work on all OSs.	2016-02-06 02:37:34 +00:00
Ira Aspen	de388a74bd	Moved exec statement.	2016-02-06 02:32:04 +00:00
Ira Aspen	54a759497f	Added confirmation dialogue when set added.	2016-02-06 02:29:09 +00:00
Ira Aspen	c914395236	Finished add set functionality.	2016-02-06 01:33:43 +00:00
Ira Aspen	2960cba12b	Added a file picker to the add set menu item.	2016-02-05 21:09:24 +00:00
Ira Aspen	646c4b4197	Added functionless menu button for adding a set.	2016-02-05 20:32:40 +00:00
Ira Aspen	9846fb1d8e	Made reseting the create game dialogue box only select 'Only regeistered users' if player is a registered user.	2016-02-05 19:32:27 +00:00
Ira Aspen	154da4452d	Made create game box prevent only buddies can join being selected for unregistered users.	2016-02-05 19:29:19 +00:00
Fabio Bas	50dde5dde1	Some updated translations from transfix	2016-02-02 22:04:49 +01:00
Fabio Bas	7c128f69b0	Updated translations	2016-01-29 00:30:54 +01:00
Gavin Bisesi	7de8e8a6a7	Merge pull request #1747 from tooomm/about_url ... [WAIT] added webpage to about window	2016-01-28 18:02:37 -05:00
ctrlaltca	5dd20181fd	Merge pull request #1753 from ctrlaltca/pr_1544 ... Re-Dockified the game & replay review areas	2016-01-28 22:44:32 +01:00
ctrlaltca	14e94f1f8b	Merge pull request #1767 from Fizztastic/fix_1764 ... Sounds on buddy login & logout.	2016-01-28 22:33:10 +01:00
Fabio Bas	ee42d547bf	Disable downlod button when download starts	2016-01-28 22:27:14 +01:00
ctrlaltca	5577d618bd	Merge pull request #1727 from TMiguelT/target ... Client update implementation	2016-01-28 22:25:54 +01:00
ctrlaltca	7ec3968c02	Merge pull request #1770 from ctrlaltca/fix_pixmaps ... Fix pixmap usage in pictureloader	2016-01-23 18:23:55 +01:00
Fabio Bas	133693d9ce	Fix pixmap usage in pictureloader ... fix #1765	2016-01-23 11:00:10 +01:00
Jeff	9767b1f69d	Fix #1764 ... Add Sounds on buddy login & logout. Add Files: buddy_join.wav; buddy_leave.wav	2016-01-22 15:03:01 -05:00
Michael Milton	66fda086c3	Client update implementation	2016-01-20 22:26:17 +01:00
woogerboy21	f57e0454bb	Dockified the game & replay review areas	2016-01-16 00:54:14 +01:00
Zach	36c3536e0c	Merge pull request #1721 from ctrlaltca/speedup ... Misc speedups in card database	2016-01-15 18:43:01 -05:00
Fabio Bas	3605cc55b7	fix replay progress bar	2016-01-13 00:17:02 +01:00
tooomm	953b183dab	added url to about ... added gh pages url	2016-01-09 22:53:54 +01:00
Zach H	e0a25e74ac	fix merge issues	2015-12-30 11:54:30 -05:00
Zach H	f568a4e865	todo	2015-12-30 11:51:53 -05:00
Zach H	703ff7905c	token coordinates	2015-12-29 23:43:03 -05:00
Zach H	da0e3292d3	Token PT shown in create related dialog	2015-12-29 18:28:41 -05:00
Lee Matos	8a6d63265f	Enable HiDpiPixmaps for Qt5	2015-12-28 22:03:38 -05:00
Fabio Bas	fddcbb8296	Lazy loading of card database view => faster startup times	2015-12-28 15:26:10 +01:00
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 H	137d7328b5	coin flip ... remove male/female as it's same male/female fixes translate	2015-12-27 12:34:11 -05:00
Fabio Bas	4b1c59424e	Implement reverse-related tag for cards	2015-12-26 19:57:20 +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
Fabio Bas	696ae7e85f	Add gear icon to settings menu entry	2015-12-19 11:48:54 +01:00
Fabio Bas	5093ea4170	Small typos + reextracted strings	2015-12-15 16:31:58 +01:00
Fabio Bas	2712dd4248	Extracted new translation strings	2015-12-15 15:59:20 +01:00
Fabio Bas	ed4149fa7b	Add .txt to the common deck file types ... fix #1683	2015-12-13 12:00:39 +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
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
tooomm	bc44f8ce2a	link renaming ... -`Linking FAQ` --> `How to set a custom picture url` -updated define accordingly	2015-11-17 16:04:29 +01:00
Brandon Griffin	813a0c2070	Added set focus to description anytime a create dialong is opened	2015-10-27 08:58:29 -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	bab4a51ebb	CPack: Debian package	2015-10-13 22:16:00 +02:00
Fabio Bas	7fe60279de	Fix PR #1600	2015-10-09 14:59:42 +02:00
Gavin Bisesi	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
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
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
Fabio Bas	a9f2cd73de	Fix volume control ... fix #1528	2015-09-28 12:24:22 +02: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
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
Fabio Bas	7a4bf9a313	Fix crash on loading invalid cards.xml ... Additionally, move the custom database load after the LoadStatus check, so that they don't bring up the “fix your card database path” settings dialog	2015-09-22 21:56:02 +02:00
Zach	aacbe93d04	Merge pull request #1540 from ctrlaltca/remove_unused_sounds ... Removed unused sound names	2015-09-22 15:51:05 -04:00
woogerboy21	cd7b25f712	Fix #1542 ... This should fix #1542 (please test)	2015-09-22 01:19:31 -04:00
Fabio Bas	2df50f5766	Removed unused sound names	2015-09-20 12:08:55 +02:00
marco	599ef0ae62	Confirmation to clear/restore shortcuts	2015-09-20 00:21:07 +02:00
Zach	1409b97490	Merge pull request #1530 from ZeldaZach/fix_1527 ... Minors Fixes for #1527	2015-09-18 10:18:12 -04:00
Zach H	ccc8ac4826	minor fixes	2015-09-18 09:56:32 -04:00
Fabio Bas	2a20b6028e	Changed problematic shortcuts	2015-09-18 08:38:54 +02:00
woogerboy21	b0693299c7	Added server private message functionality to allow server based PM notifications. ... Ban based notification to other online moderators is the first form implemented by this PR.	2015-09-17 22:40:29 -04:00
marco	0ce38ea88e	Reset & Clear all shortcuts ... This closes #1517	2015-09-16 13:35:26 +02:00
marco	8eacd85d68	Link to wiki: how to set shortcuts	2015-09-16 12:30:32 +02:00
ctrlaltca	c7c84bca8f	Merge pull request #1521 from tooomm/patch-2 ... remove debug code; fix #1520	2015-09-16 08:42:48 +02:00
tooomm	1bec6dc37a	shortcut tabs adjustments ... - `|` over `/` to make `P/T` better readable - Game play --> Gameplay - Player - Playing Area	2015-09-15 18:56:53 +02:00
tooomm	814553dae6	remove debug code ... fixes #1520	2015-09-15 18:53:06 +02:00
Zach	385455e77c	Merge pull request #1510 from woogerboy21/room_message_history ... Added chat history to a room that is displayed on join	2015-09-15 12:10:37 -04:00
woogerboy21	87a64da1bc	Added chat history to a room that is displayed on join. ... With this update a new chat history definition is added on a per room bases which allows operators to specify the number of chat messages to store and present to the user on join. Please see the sample ini for room definitions.	2015-09-14 17:54:04 -04:00
Zach	3412ce2f7d	Merge pull request #1501 from marcofernandezheras/Fix-Shortcut-Detection ... Fix shortcuts detection on settings & game	2015-09-14 16:02:45 -04:00
marco	4c6b543cbe	Fix shortcuts detection on settings & game ... Fix #1499, Fix #1493, Fix #1477 Fix typo	2015-09-14 16:56:51 +02:00
Fabio Bas	a6bc709583	merged master	2015-09-13 19:39:42 +02:00
Fabio Bas	5aaae5279c	revert to using QAudioOutput	2015-09-13 19:37:49 +02:00
Zach	f2864ce569	Merge pull request #1511 from ctrlaltca/theme_extensions ... Themes: don't use hardcoded extensions on images	2015-09-13 13:26:12 -04:00
Fabio Bas	f78c01fa88	Avoid multiple sounds playing at the same time	2015-09-13 17:22:58 +02:00
woogerboy21	46f78fcead	Fix server crash on banning	2015-09-13 00:52:52 -04:00
Fabio Bas	85aa866e02	sound themes	2015-09-13 02:01:50 +02:00
Fabio Bas	28df389ea6	Fixed flags size: they're not squared	2015-09-13 00:53:11 +02:00
Fabio Bas	dfe9719637	Removed unused parameter	2015-09-13 00:26:28 +02:00
Fabio Bas	00e3e63f41	Themes: remove all hardcoded extensions	2015-09-13 00:14:36 +02:00
Jeff	32df2c29ed	Fix library, grave, exile crash on windows	2015-09-12 17:24:36 -04:00
Zach	226a8cc017	Merge pull request #1498 from ctrlaltca/sound_whatever ... Reworked SoundEngine overhaul	2015-09-12 00:35:20 -04:00
Zach	4c9555bb59	Merge pull request #1496 from ctrlaltca/clamp_zoneview ... Clamp zone view widget's titlebar inside the viewable area	2015-09-12 00:34:12 -04:00
Zach	29446d80d4	Merge pull request #1469 from woogerboy21/request_ban ... Added the ability or moderation staff to request user ban history	2015-09-10 21:34:16 -04:00
Fabio Bas	a06c7b2f9d	Rework the sound engine to use QSound ... plus misc fixes	2015-09-11 00:43:22 +02:00
Fabio Bas	0b072e2d60	Remove dependency to qt multimedia/mobility under qt4 and unused phonon plugins	2015-09-11 00:42:37 +02:00
Fabio Bas	b2f855aeb0	fix settings icon spacing	2015-09-10 23:37:16 +02:00
Fabio Bas	a7616835e3	Clamp zone view widget's titlebar inside the viewable area	2015-09-10 23:29:01 +02:00
woogerboy21	90cb890cc2	Added the ability or moderation staff to request user ban history	2015-09-10 16:02:45 -04:00
Jeff	badbcf2753	Fix sound test button	2015-09-09 16:47:09 -04:00
Jeff	d6398477ae	SoundEngine overhaul	2015-09-09 02:24:02 -04:00
Zach	05aa8b2c92	Merge pull request #1474 from woogerboy21/no_tab_close ... Do not close message tabs on disconnect	2015-09-09 00:04:06 -04:00
woogerboy21	7bfea03af8	Do not close message tabs on disconnect	2015-09-08 14:38:48 -04:00
ctrlaltca	c984a7c962	Merge pull request #1488 from ctrlaltca/translations ... Translations update	2015-09-08 19:25:34 +02:00
Fabio Bas	fcc5370082	Fetched new translations	2015-09-08 19:12:41 +02:00
Fabio Bas	5951c95e81	extracted new translatable strings	2015-09-08 19:10:57 +02:00
Fabio Bas	c214234bb2	fix typo	2015-09-08 19:08:34 +02:00
Zach	aac980a8cb	Merge pull request #1485 from ctrlaltca/fix_notification_click ... Don't change window maximized state when clicking a notification	2015-09-08 12:49:00 -04:00
Zach	601ada8473	Merge pull request #1484 from ctrlaltca/fix_f12 ... Fix loading of "increase life counter" shortcut in settings	2015-09-08 12:43:27 -04:00
Zach	b47aa86c84	Merge pull request #1483 from ctrlaltca/deckeditor_filter_buttons ... Add back "remove" buttons to deck editor's filter	2015-09-08 12:33:15 -04:00
Zach	73f2d2b0e5	Merge pull request #1478 from ctrlaltca/fix_replay_crash ... Fix replay crash due to completer	2015-09-08 12:31:59 -04:00
Fabio Bas	4ee12f0b69	Don't change window maximized state when clicking a notification	2015-09-08 17:49:31 +02:00
Fabio Bas	db18c7da10	Fix loading of "increase life counter" shortcut in settings	2015-09-08 17:13:47 +02:00
Fabio Bas	3be1bcd356	Add back "remove" buttons to deck editor's filter	2015-09-08 10:25:33 +02:00
Fabio Bas	50aa6e3a4d	Fix autoconnect	2015-09-08 08:37:19 +02:00
Fabio Bas	f14ebb0028	Fix replay crash due to completer	2015-09-08 08:12:00 +02:00
marco	36f19be06a	Fix thememanager on portable build	2015-09-06 18:29:48 +02:00
Fabio Bas	e50d0c6db2	get cardback image from theme	2015-09-06 11:44:19 +02:00
woogerboy21	9dc77d674f	Fix older gcc nested pre-def with portable builds	2015-09-05 17:44:51 -04:00
Zach	60ed9fd1ff	Add slash	2015-09-03 14:56:23 -04:00
marco	44fefc20c2	Fix portable on OSX	2015-09-03 19:47:07 +02:00
marco	b4c5729bf5	fix Decks, Pics replays & sounds paths on Portable build	2015-09-03 18:31:11 +02: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
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
woogerboy21	66c19ab727	Detect if a use is trying to place an invalid ban	2015-08-31 01:00:13 -04:00
Fabio Bas	fcff6301ed	Fetched new translations. Arrr!	2015-08-27 18:32:14 +02:00
tooomm	83e9f9deba	typos resolved ... @marcofernandezheras ok?	2015-08-26 15:33:05 +02: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	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
woogerboy21	b0630b81ca	Log old session out of server if logging in from a second location	2015-08-22 13:41:02 -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
Zach	e9156ecd62	Merge pull request #1391 from woogerboy21/admin_adjustmods ... Allows admins to promote users to mod and demote mod to user	2015-08-22 00:03:46 -04:00
Gavin Bisesi	66f14c1168	Address PR feedback	2015-08-21 23:03:15 -04:00
Zach	a6a62b3334	Merge pull request #1354 from Cockatrice/fix-1351 ... Fix #1351 - Server ignores only-reg if in "none" auth mode.	2015-08-21 22:15:32 -04:00
Daenyth	6170c9037f	Fix #1351 - Server ignores only-reg if in "none" auth mode. ... When in none auth mode, registered users don't exist; hence the setting makes the game impossible to join. Normally the setting would be greyed out when the user is unregistered, but commit 475c54bf introduced a new edge case where the stored setting would apply to the field even if the user is unregistered, making the setting possible to apply in no-reg mode. Regardless, any client could have done this, not just the default cockatrice. The server side fix should prevent all issues in the future.	2015-08-21 20:30:46 -04:00
Zach H	41b10308ba	country to lower (fix win bug)	2015-08-21 20:05:49 -04:00
marco	c8d59eec5e	Refactred settings to use settingscache & ini files	2015-08-22 01:05:15 +02:00
Jeff	50e0b6dd35	Merge lines	2015-08-20 23:33:06 -04:00
Jeff	97d0cfa3d9	Fix first word completion	2015-08-20 23:01:32 -04:00
woogerboy21	39fcabe921	Allows moderators to promote users to mod and demote mod to user	2015-08-20 22:42:10 -04:00
Jeff	05f2bc8392	Fix Conflicts	2015-08-20 22:27:46 -04:00
Jeff	e9bad2cacb	Merge branch 'master' into fix_1387 ... Conflicts: cockatrice/CMakeLists.txt cockatrice/src/tab_game.h cockatrice/src/tab_room.cpp	2015-08-20 22:23:47 -04:00
Zach	b2ab2c6eba	Merge pull request #1382 from marcofernandezheras/Customizable-shortcuts ... Customizable shortcuts	2015-08-20 21:44:05 -04:00
marco	c6aba5a6d0	Renamed file + reduced window size + resfresh on change	2015-08-20 20:23:08 +02:00
Jeff	a64ea17357	Add LineEditCompleter to Tab_Game	2015-08-19 18:46:08 -04:00
Zach	8c0722953f	Merge pull request #1386 from Fizztastic/fix_1383 ... Fix linked cardwidget not showing PT/Loyalty	2015-08-17 17:14:30 -04:00
Jeff	f3c43cb50f	Fix linked cardwidget not showing PT/Loyalty	2015-08-16 19:02:55 -04:00
marco	d3d6f70496	Removed 2nd arg from ShortcutsSettings::getShortcut	2015-08-16 21:53:59 +02:00
marco	1ca89e0b09	Moved counters to a new tab	2015-08-16 15:38:23 +02:00
marco	713a8148d3	Customizable shorcuts	2015-08-16 14:24:04 +02:00
marco	be82472f35	Merge branch 'master' into Customizable-shortcuts	2015-08-16 14:01:48 +02:00
marco	4cb53ccaed	Merge branch 'master' into Customizable-shortcuts	2015-08-16 13:52:34 +02:00
marco	beaa4e9383	Configurable shortcuts	2015-08-16 13:46:57 +02:00
woogerboy21	702f949196	Updated response block to look better	2015-08-15 21:17:32 -04:00
woogerboy21	3e94c9d283	Define permission levels for rooms	2015-08-15 21:00:51 -04:00
Zach	98fa9eb159	Merge pull request #1356 from Fizztastic/ChatRoomCompleter ... Username Completer in server room	2015-08-15 20:08:34 -04:00
woogerboy21	0f4dc18074	Merge pull request #1374 from woogerboy21/ban_by_clientid ... Ban by client ID	2015-08-14 11:25:01 -04:00
woogerboy21	b102a05a36	Add ability to ban by client id	2015-08-14 00:06:37 -04:00
Jeff	386716b8db	Add option to open customsets folder	2015-08-13 23:52:38 -04:00
Jeff	50d67467dc	Username Completer in server room ... Adds QCompleter in server room and a setting to enable/disable it.	2015-08-13 23:51:39 -04:00
poixen	9bf3178b2f	Merge pull request #1307 from poixen/hostselection ... Previous server connection history	2015-08-12 12:59:23 +02:00
Zach H	b57a316bfd	remove max screen default	2015-08-11 17:10:05 -04:00
Gavin Bisesi	59568bf13c	Revert "#1351 Fix"	2015-08-09 15:52:32 -04:00
woogerboy21	5fc0da6ab9	#1351 Fix ... This update address's the issue were a server with no db has only non-registered users but when creating a game will cause the dialogue to only allow the check box of "registered users only" resulting in a game that no user will ever be able to join.	2015-08-09 15:07:30 -04:00
woogerboy21	3f78e0bec3	Update Error 11 Clarity	2015-08-09 12:56:09 -04:00
marco	b0bf94e378	Shorcut read from settings	2015-08-09 12:16:52 +02:00
woogerboy21	afa2c67e87	Actually pass the generated client id.	2015-08-08 17:22:59 -04:00
woogerboy21	567c1a148d	Fix local game due to clientid check in response container.	2015-08-08 17:08:43 -04:00
Gavin Bisesi	481a57edf6	Show more informative error on registration failure	2015-08-08 09:55:23 -04:00
Gavin Bisesi	bf7cf61b85	Add more informative message on unrecognized login response ... When logging in and receiving a reply that isn't understood, show a more informative error message. `tr() + tr()` for better translation flexibility.	2015-08-08 09:48:18 -04:00
woogerboy21	bc99024e4f	Added server side setting to allow the requirement of a client id from clients.	2015-08-08 08:52:19 -04:00
woogerboy21	94942e1a92	Commit to resolve requests made by @Daenyth discussed after the commit. ... See https://github.com/Cockatrice/Cockatrice/pull/1340 for details.	2015-08-08 08:52:19 -04:00
marco	e9e75961f4	Redesigning deck editor to work with docks ... Moved setting files & Added code for a future portable build	2015-08-07 23:44:40 +02:00
woogerboy21	ba90d84a13	Merge pull request #1340 from woogerboy21/clientid ... Client ID Generation	2015-08-06 14:17:06 -04:00
tooomm	94d4ff8c1b	removed space	2015-08-06 10:11:00 +02:00
woogerboy21	52db13a1ca	Initial release of client ID generation.	2015-08-05 10:15:49 -04:00
Zach	44d757f691	Merge pull request #1328 from marcofernandezheras/FixBug#1296 ... Ctrl + Double Click: Add card to SB	2015-08-03 22:47:32 -04:00
marco	0d10d6f85d	Fixes issue #1296	2015-08-04 00:17:44 +02:00
woogerboy21	13011180f7	Merge pull request #1313 from woogerboy21/update_pingtime ... Update Client & Server ping time	2015-08-03 12:31:20 -04:00
ctrlaltca	4b5fb30248	Merge pull request #1318 from ctrlaltca/fix_linking_faq_url ... Fix "Linking FAQ" url	2015-08-01 11:18:16 +02:00
ctrlaltca	622e018cd4	Merge pull request #1320 from ctrlaltca/translations ... Updated translations	2015-08-01 11:18:04 +02:00
Fabio Bas	7e7c0ef4d2	Updated translations	2015-08-01 10:55:06 +02:00
Fabio Bas	6dfd2e65f6	Fix "Linking FAQ" url	2015-08-01 08:07:47 +02:00
woogerboy21	8c7301b19f	Updated server and client ping to 5 seconds. Also changed hard set 1 second value on the ping timers to read values from the settings cache.	2015-07-29 23:44:00 -04:00
Matt Lowe	1ca24b2597	Previous server connection history ... This adds the ability to select previous servers from a list to connect to. You can remove items from the drop down by selecting them and pressing delete. If you connect to a new host it will be added to the previous hosts. It will remember the last host connected to in the dropdown.	2015-07-28 20:04:01 +02:00
Zach H	8a86165890	allow URL redirects	2015-07-28 02:41:08 -04:00
Matt Lowe	46f28f92b6	Changed app title when logged in ... As seen in this image, you cant see where you are logged in. How it looks now:	2015-07-27 16:19:19 +02:00
Zach H	475c54bfe1	fix 1032 merge conflicts	2015-07-27 00:01:05 -04:00
Zach	e318b70329	Merge pull request #1286 from ctrlaltca/disabled_sets ... Prefer enabled sets when loading images	2015-07-26 12:10:00 -07:00
Zach	bd92f18e9d	Merge pull request #1293 from ctrlaltca/fix_1289 ... Force black text color on deck list	2015-07-26 12:05:52 -07:00
Fabio Bas	a001238b74	Force cache clear on sets database save.	2015-07-26 11:46:09 +02:00
Zach	ac4c745521	Merge pull request #1294 from mildmongrel/tablezone_refactor_001 ... tablezone refactor and cleanup	2015-07-25 22:45:06 -07:00
Zach	387137fbc7	Merge pull request #1292 from ctrlaltca/fix_compile_debug ... fix compilation with gcc in paranoic mode	2015-07-25 22:37:18 -07:00
Zach	c675cf4010	Merge pull request #1272 from Fizztastic/fix_577 ... Joining a full game joins you as spectator	2015-07-25 22:16:00 -07:00
mildmongrel	ba50025e80	tablezone refactor and cleanup	2015-07-24 16:15:08 -07:00
Fabio Bas	800a17e483	Force black text color on deck list; fix #1289	2015-07-24 19:35:31 +02:00
Fabio Bas	119871d114	fix compilation with gcc in paranoic mode ... deckview.cpp:244:6: warning: no previous declaration for 'bool sortCardsByName(DeckViewCard*, DeckViewCard*)' [-Wmissing-declarations]	2015-07-24 19:29:06 +02:00
Fabio Bas	90655ff631	Prefer enabled sets when loading images; fix #1235	2015-07-22 17:35:44 +02:00
Jeff	3f22024281	Joining a full game joins you as spectator	2015-07-18 01:33:15 -04:00
ctrlaltca	0d5e169648	Merge pull request #1270 from ctrlaltca/fix_1269 ... Fix change flag in edit account; Fix #1269	2015-07-16 18:01:40 +02:00
Fabio Bas	c9e1585322	Fix change flag in edit account; Fix #1269	2015-07-16 17:59:28 +02:00
ctrlaltca	9b9db297b3	Revert "Confirmation dialog on close"	2015-07-16 14:30:12 +02:00
Zach	e0b71d3b05	Merge pull request #1257 from ctrlaltca/messageparser ... Chatview: split message parser and add "highlight words"	2015-07-15 20:00:08 -04:00
Zach H	ebd516fbf3	confirmation dialog on close	2015-07-15 18:34:21 -04:00
Fabio Bas	ef831d2749	Reworded settings sentence	2015-07-15 22:44:24 +02:00
Zach H	d956a1d309	add colors to popup	2015-07-15 16:38:29 -04:00
Fabio Bas	efe388bddd	Fix server message color; try to detect words inside parentheses, punctuation, etc..	2015-07-15 11:52:04 +02:00
Zach H	c29bf1ae17	require pass & email confirmation	2015-07-14 14:12:49 -04:00
Fabio Bas	2e3e6c55ff	Updated with latest changes from #1243	2015-07-14 09:19:07 +02:00
woogerboy21	a9acb3f1cc	Total Max User Restriction ... Syntax correction.	2015-07-13 17:54:03 -04:00
Zach	7ebf817b17	Merge pull request #1197 from Cockatrice/cpp11	2015-07-13 13:23:18 -04:00
Zach H	29aecc4eb8	Green kick msg	2015-07-13 03:05:03 -04:00
Fabio Bas	87c70466a4	Rework message parser	2015-07-12 23:56:32 +02:00
Zach H	97f298452e	first fixes	2015-07-12 11:00:11 -04:00
Zach H	dc05a14f4c	Highlight Custom Words	2015-07-11 22:46:00 -04:00
Zach	9edacd7b3e	Merge pull request #1236 from Fizztastic/fix_574 ... Double Click to open replays	2015-07-09 23:36:33 -04:00
Jeff	8bc885c3f1	Double Click to open replays	2015-07-09 00:42:02 -04:00
Zach	f733daf18a	Merge pull request #1179 from mildmongrel/feature-player-rotation ... Added ability to rotate player positions in the local game view.	2015-07-08 18:23:10 -04:00
Zach	091ca9fc12	Merge pull request #1230 from ZeldaZach/fix_97 ... add shortcut for filter delete	2015-07-08 18:11:08 -04:00
Zach	2837a4c010	Merge pull request #1232 from ZeldaZach/fix_242 ... show colors of cards	2015-07-08 18:10:23 -04:00
Zach	2bd0133055	Merge pull request #1233 from Fizztastic/fix_340 ... Play cards only with double left click	2015-07-08 18:09:31 -04:00
Jeff	6470e1fd10	Remove unneeded if	2015-07-08 16:25:25 -04:00
mildmongrel	124788d217	Added ability to rotate player positions in the local game view.	2015-07-08 09:16:37 -07:00
Jeff	438aacb9c4	Play cards only with double left click ... Fix #340	2015-07-08 00:55:35 -04:00
Zach H	afa8b53870	show colors of cards	2015-07-07 23:50:37 -04:00
Zach H	ce42d56a2d	add shortcut for filter delete	2015-07-07 22:42:05 -04:00
Zach	f199e20740	Merge pull request #1216 from ZeldaZach/fix_morphs ... Fix Morphs from Sharing Information	2015-07-07 22:00:32 -04:00
Zach	955cc3920f	Merge pull request #1189 from mildmongrel/fix_col_layout ... Fixed horizontal positioning in multicolumn layout.	2015-07-07 21:40:17 -04:00
Zach	f0efab5142	Merge pull request #1226 from ctrlaltca/fix_241 ... Add an option to annotate tokens from card text (default off)	2015-07-07 21:12:59 -04:00
Zach	9b87f9e7e7	Merge pull request #1225 from ctrlaltca/fix_247 ... Order cards by name in deck-load screen	2015-07-07 20:42:44 -04:00
Zach	db604bce03	Merge pull request #1219 from poixen/pic_fix	2015-07-07 13:41:06 -04:00
Fabio Bas	68e176cc00	Add an option to annotate tokens from card text (default off); fix #241	2015-07-07 19:19:58 +02:00
Fabio Bas	1c2ddccb46	Order cards by name in deck-load screen; fix #247	2015-07-07 17:56:11 +02:00
Zach	685aa99ad6	Merge pull request #1224 from ctrlaltca/profile_edit ... Integrate #1210 changing "Gender" to "Pronouns"	2015-07-07 10:47:37 -04:00
Fabio Bas	6013974b5e	Gender => Pronouns	2015-07-07 14:10:15 +02:00
Zach	1c69288f0e	Merge pull request #1222 from Fizztastic/fix_740 ... Added 2 shortcuts to game deck screen	2015-07-07 02:43:04 -04:00
Zach	6bf421cc31	Merge pull request #1210 from ctrlaltca/profile_edit ... Profile management	2015-07-07 02:01:27 -04:00
Fizztastic	4d6a405d01	Added 2 shortcuts to game deck screen ... - Ctrl+O (Load Deck) - Ctrl+Alt+O (Load Remote Deck)	2015-07-07 01:14:06 -04:00
Zach	2b484aa9ee	Merge pull request #1221 from Fizztastic/fix_818 ... Load .cod files from clipboard in deck editor	2015-07-07 00:36:49 -04:00
Zach	29b83c3700	Merge pull request #1215 from ZeldaZach/fix_1208 ... Mod Global Messaging	2015-07-06 23:48:46 -04:00
Fizztastic	0b8fab4721	Load .cod files from clipboard	2015-07-06 23:46:11 -04:00
Fizztastic	680332a708	keep consistent ordering	2015-07-06 19:18:27 -04:00
Fizztastic	19bd6cc381	Adds Move To... Hand context menu for cards	2015-07-06 19:10:13 -04:00
Matt Lowe	c260a8a1d4	Fixed image centering	2015-07-06 20:34:38 +02:00
Zach H	ae4436ade7	mod global msg overrides settings	2015-07-06 12:45:08 -04:00
Zach H	cf09aeccfd	local user sees orange too	2015-07-05 23:21:46 -04:00
Zach H	1bda6e53b2	allow mod global msg	2015-07-05 22:06:35 -04:00
Zach H	e20c06b639	troubleshooting&faq	2015-07-05 20:11:42 -04:00
Fabio Bas	15998fb3e6	Misc fixes	2015-07-05 22:44:35 +02:00
Fabio Bas	7f5f290c93	Profile management	2015-07-05 22:44:35 +02:00
mildmongrel	75d0d5f66b	Fixed horizontal positioning in multicolumn layout.	2015-07-05 10:12:01 -07:00
Zach	31890450dc	Merge pull request #1205 from ZeldaZach/fix_1173 ... Server Name Rules Information	2015-07-04 19:37:50 -04:00
Zach H	1f9b3ed28f	minor fix	2015-07-04 18:52:50 -04:00
Zach H	24e54fd291	fix crash on mention	2015-07-04 18:26:54 -04:00
Zach H	1d210e57bd	show all rules	2015-07-03 23:54:14 -04:00
Zach	360498c83f	Merge pull request #1194 from ZeldaZach/fix_1192 ... Fix local mention crash	2015-07-03 18:41:48 -04:00
Gavin Bises	8ed9d35724	Update project to C++11 compilation.	2015-07-03 10:02:31 -04:00
Zach H	cc3e4edfd9	rename function	2015-07-03 00:37:30 -04:00
Zach H	e2be1cd897	fix local mention crash	2015-07-03 00:30:59 -04:00
Fabio Bas	6cf3db7e6b	Servatrice: refactor signal handling and permit config reloading	2015-06-30 22:21:26 +02:00
Fabio Bas	6b54d8cbfd	Fixed issues	2015-06-30 21:40:39 +02:00
Fabio Bas	02dcaff356	Publish username rules in login failure, too	2015-06-30 18:44:40 +02:00
Fabio Bas	4c27304047	publish username rules in registration failure	2015-06-29 23:35:27 +02:00
Fabio Bas	56db6cd060	Updated translations	2015-06-28 15:17:46 +02:00
Zach	36d0a13fc9	Merge pull request #1153 from ctrlaltca/issue_1144 ... Fix windows size growing out of screen; fix #1144	2015-06-27 21:20:57 -04:00
Zach	d2b71a15fa	Merge pull request #1166 from ctrlaltca/fix_232 ... Support <tablerow> for tokens; fix #232	2015-06-27 20:49:14 -04:00
Fabio Bas	f84d6fec1b	Never send wrong row numbers	2015-06-25 15:39:03 +02:00
Fabio Bas	fa6e9c7344	updated translations	2015-06-24 13:26:02 +02:00
Fabio Bas	d0c0531bfc	extracted new translatable strings	2015-06-24 13:01:23 +02:00
ctrlaltca	78a53f0691	Merge pull request #1151 from ZeldaZach/fix_1050 ... Fix False Notifications	2015-06-24 12:55:13 +02:00
Fabio Bas	ed24b38add	support <tablerow> for tokens; fix #232	2015-06-24 10:31:00 +02:00
Fabio Bas	872177a5ed	Card images blacklist; changed fallback urls	2015-06-23 15:44:43 +02:00
Zach H	27fa6eb642	Fix False Notifications	2015-06-22 22:43:59 -04:00
Fabio Bas	ec45a099e1	Made items not collapsible; changed players widget's min height from 60 to 40 px	2015-06-22 18:24:05 +02:00
ctrlaltca	0c24f48aa2	Merge pull request #1145 from ZeldaZach/fix_182 ... Fix Moved From Error	2015-06-22 17:29:15 +02:00
ctrlaltca	2415ba2605	Merge pull request #1134 from ctrlaltca/related_cards ... Related cards	2015-06-22 17:22:47 +02:00
poixen	d7c81a07c6	Merge pull request #1155 from poixen/solid_counters ... Solid counters	2015-06-21 08:39:38 +02:00
Matt Lowe	4cc959396f	Reduced min table width ... The initial table width is too high. The table starts to scale down far too soon, meaning you have to play in a letterbox ratio.	2015-06-19 23:40:55 +02:00
Matt Lowe	5c526f6c07	Solid counters ... Removed gradient to give counters a more solid look	2015-06-19 23:26:36 +02:00
Fabio Bas	c400d6d4ec	use the new card frame in game; mitigates #1144	2015-06-19 14:57:20 +02:00
Fabio Bas	1ae79fbcaa	Removed double margin around chatbox in game	2015-06-19 14:42:13 +02:00
Fabio Bas	1251338619	enforce max size for user avatar on userinfobox; refs #1144	2015-06-19 14:33:23 +02:00
Fabio Bas	d6ce1852a1	Fix deckeditor jitter problem; fix #1143	2015-06-18 23:13:12 +02:00
Zach H	045da30546	fix wording	2015-06-18 00:16:09 -04:00
Zach	853342463a	Merge pull request #1138 from ZeldaZach/chatview_www ... Fix WWW link error	2015-06-16 20:57:46 -04:00
ctrlaltca	8cf0c3beed	Merge pull request #1141 from ZeldaZach/hq_options2 ... Allow Custom Download URL	2015-06-16 09:02:20 +02:00
Zach H	89f1298a48	change wording	2015-06-15 16:47:02 -04:00
Fabio Bas	38486b2248	updated	2015-06-15 15:01:17 +02:00
Fabio Bas	f17dec29f6	Reorganized images in subfolders ... As per @daenyth’s comment: https://github.com/Cockatrice/Cockatrice/pull/792#issuecomment-76593730	2015-06-15 14:37:19 +02:00
Fabio Bas	6b8ebe54e9	Theme manager ... This is the first implementation of a theme manager. It’s a rebased and revisited version of #792.	2015-06-15 14:35:58 +02:00
ctrlaltca	48c3e64ef5	Merge pull request #1137 from ctrlaltca/deck_editor ... Reworked deck editor	2015-06-15 12:51:51 +02:00
Fabio Bas	fac44966fd	Reworked to use a qtabwidget: better cross-os look	2015-06-15 12:27:54 +02:00
Zach H	45c2e6f646	Allow Custom HQ URL	2015-06-15 01:03:41 -04:00
Zach H	be4a581f7c	remove autoclear	2015-06-14 20:53:20 -04:00
Zach H	5d5eb05857	fix www error	2015-06-14 20:35:17 -04:00
Fabio Bas	3af5804073	Reworked deck editor	2015-06-13 20:37:51 +02:00
Fabio Bas	518bda8c09	Rotate 180 degrees the art of flipped cards	2015-06-13 16:10:06 +02:00
Fabio Bas	8826908923	Automatically attach related cards to the original card	2015-06-13 15:40:59 +02:00
Fabio Bas	9ca1329cac	Fix for gcc compilation (-Werror=reorder)	2015-06-11 13:01:05 +02:00
Fabio Bas	946598375f	Expose related cards in card menu	2015-06-11 12:45:25 +02:00
Fabio Bas	da84bb33e1	Import related cards in the card database	2015-06-11 10:48:50 +02:00
Fabio Bas	7ff318bd04	Fix "welcome" popup appearing more than once	2015-05-31 16:32:46 +02:00
Zach	dd16ea78ac	Merge pull request #1115 from poixen/text_highlight ... Highlight text after adding card	2015-05-30 18:51:25 -04:00
woogerboy21	28ccec711e	Merge pull request #1101 from ctrlaltca/registration ... [WIP] In-client Registration support	2015-05-30 13:49:04 -04:00
Matt Lowe	7d2ad9ee3b	Highlight text after adding card ... After adding a card to the main or side, the search text will become selected to easily start the next search	2015-05-30 16:50:52 +02:00
ctrlaltca	fab0a0ee4e	Merge pull request #1110 from tooomm/text-works2 ... text works	2015-05-30 14:23:48 +02:00
ctrlaltca	595d70cf23	Merge pull request #1088 from ctrlaltca/customsets ... Load additional xml sets from $userprofile/customsets/	2015-05-30 14:23:01 +02:00
tooomm	3767d49407	resolved typo	2015-05-25 03:27:27 +02:00
Fabio Bas	471f6371b5	More work ... * Refactored code out of common/ into servatrice/ * added smtp client library * disable registration when connected * validate email address * send activation token via email	2015-05-24 23:02:51 +02:00
Fabio Bas	d6cee242e3	Another gcc warning-as error removal	2015-05-24 00:53:08 +02:00
Fabio Bas	ff1aed717e	Added token generation, user activation command and response.	2015-05-24 00:37:45 +02:00
tooomm	8f64fd4a0b	text works ... fixed welcome msg added some articles added database phrase to card updater cosmetic changes to the description in edit sets	2015-05-23 23:13:45 +02:00