2333 commits

Author	SHA1	Message	Date
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
Fabio Bas	5ace0dd892	Almost completed registration ... * added missing bits of serverside code; * added fronted in client; * removed demo python scripts;	2015-05-23 20:13:03 +02:00
ctrlaltca	411fc38337	Merge pull request #1106 from ctrlaltca/fix_1105 ... Fix crash on server shutdown; fix #1105	2015-05-23 18:26:13 +02:00
Matt Lowe	ad6dc16f84	Fixed replay crash ... Game types are only available in online games. This is the fastest fix. Replays now work again.	2015-05-23 16:43:35 +02:00
Fabio Bas	323537d08d	Fix crash on server shutdown; fix #1105	2015-05-23 11:33:36 +02:00
poixen	43c9f4e123	Merge pull request #1100 from poixen/new_sounds ... Updated sounds	2015-05-22 21:03:14 +02:00
woogerboy21	3532c31d91	Merge pull request #1098 from poixen/gui_time_limit ... Increased server shutdown limit	2015-05-22 14:52:32 -04:00
Matt Lowe	4c1e24c214	fixed conflicts	2015-05-22 11:51:10 +02:00
poixen	d1b243481b	Merge pull request #1086 from poixen/sounds ... updated sounds	2015-05-22 11:19:50 +02:00
Matt Lowe	7ac0f6f420	Added game type to tab title ... + The game type(s) is now displayed in the tab + Reformatted tab title	2015-05-22 10:39:49 +02:00
Matt Lowe	085eb0f2fa	Increased server shutdown limit ... Added a max of 999 mins for the server shutdown to the gui.	2015-05-22 10:00:25 +02:00
Fabio Bas	227c18fc5a	Fix card update under windows ... It failed if the path contained spaces.	2015-05-21 21:39:51 +02:00
Fabio Bas	6af91b3d1c	Ignore filename case when loading custom sets	2015-05-21 19:58:35 +02:00
Fabio Bas	ff20e04842	fixed untranslatable string, regenerated translations	2015-05-21 19:40:17 +02:00
tooomm	7db7b7fb06	expanded wording of name conflicts for tokens /2 ... - removed space - fixed wording	2015-05-21 15:17:52 +02:00
Fabio Bas	4da1404a06	Translation updates	2015-05-20 19:43:52 +02:00
Fabio Bas	b566bf4a19	Load additional xml sets from $userprofile/customsets/	2015-05-20 18:27:50 +02:00
Matt Lowe	3ac2a69b8b	updated	2015-05-20 00:31:56 +02:00
Matt Lowe	5758ac685c	Added untap sound ... After more tinkering, it feels nice to have untap sound	2015-05-19 23:50:15 +02:00
Zach	292d730ca7	Merge pull request #1067 from tooomm/patch-1 ... expanded error msg for name conflicts (tokens)	2015-05-19 16:56:39 -04:00
poixen	5a516de26a	Merge pull request #1078 from poixen/url ... No need for [url][/url]	2015-05-19 22:43:37 +02:00
poixen	8209c59941	Merge pull request #1076 from poixen/sb_locked ... Disable SB button when ready	2015-05-19 11:15:04 +02:00
Matt Lowe	af29d4529c	Can now use more url types ... Can now use http:// https:// www.	2015-05-19 11:11:20 +02:00
ctrlaltca	15dd3471bc	Merge pull request #1075 from ctrlaltca/fix_1070 ... Ensure sounds are working at startup; Fix 1070	2015-05-16 18:21:08 +02:00
ctrlaltca	25f444a5af	Merge pull request #1051 from poixen/reveal_top_x ... Reveal top x cards	2015-05-16 18:20:56 +02:00
ctrlaltca	262ebe3bf7	Merge pull request #1039 from ctrlaltca/update_oracle ... Run oracle from inside cockatrice and improve sets handling;	2015-05-16 18:20:36 +02:00
Matt Lowe	9ce3aecd38	No need for [url][/url] ... No longer need to use the [url] tags to add **HTTPS** links. I want to only link to "secure" site by default, hence only https. Users can still use [url] tags if they want to. The ENTIRE chat code needs to be rewitten, as it is just packing more code upon code. It can be done in another PR though. This just gets the base working feature in place.	2015-05-16 09:49:28 +02:00
Matt Lowe	f2c3045a71	Disable SB button when ready ... Updated to trigger on receive rather than send	2015-05-16 08:49:38 +02:00
Fabio Bas	2299fa1ac4	Add backward compatibility for new client on old servers	2015-05-15 18:18:25 +02:00
Fabio Bas	8fba04397b	All platform: at startup, ensure that a proper directory for sounds is set	2015-05-14 15:47:57 +02:00
Fabio Bas	924337ee93	revert 0b4701c42f	2015-05-14 15:36:44 +02:00
ctrlaltca	9c20811a7a	Merge pull request #1071 from poixen/sounds ... Cleanup	2015-05-14 15:14:36 +02:00
Fabio Bas	44800df89c	Reworked the layout of "edit sets" window	2015-05-14 13:12:24 +02:00
Fabio Bas	58a5834f34	Implemented proposed changes to initial popup message	2015-05-14 12:38:30 +02:00
Matt Lowe	f1703ed0ad	Cleanup ... + Removed todo + linked test sound to the player joined sound	2015-05-12 19:25:49 +02:00
tooomm	c541944089	expanded wording of name conflicts for tokens ... added "Make sure to enable the 'token set' in 'Edit sets...' dialog to display them correctly."	2015-05-09 14:12:41 +02:00
Zach	07fcde038c	Merge pull request #1065 from poixen/die_roll_parent ... Connected die roll dlg to parent	2015-05-08 16:14:47 -04:00
Matt Lowe	80e53b334e	Connected die roll dlg to parent ... Die roll now has a logo as it is correctly connected to the parent.	2015-05-08 20:36:31 +02:00
poixen	a8c4e4439c	Merge pull request #1055 from poixen/sounds ... Refreshing Cockatrice Sound	2015-05-07 08:57:30 +02:00
poixen	df834183bd	Merge pull request #1053 from poixen/reveal_makeover ... Updated reveal zone	2015-05-07 08:54:35 +02:00
poixen	433412dee1	Merge pull request #1061 from poixen/filter_svgs ... Updated filter svgs	2015-05-07 08:54:28 +02:00
Matt Lowe	5f27050962	flipped svg	2015-05-06 21:29:53 +02:00
Matt Lowe	c34718fe99	updated clear svg	2015-05-06 15:38:30 +02:00
Matt Lowe	5dfef6215c	Added punctuation mark	2015-05-06 14:19:01 +02:00
Matt Lowe	6da6e5b562	Updated card loadout background	2015-05-06 14:09:27 +02:00
Matt Lowe	f2a53abcd8	Updated filter svgs ... Now uses the same as in the deck editor	2015-05-06 13:25:06 +02:00
Matt Lowe	c64eeb4ebe	Added sound settings page ... + added sound setting page + added sound setting icon + moved sound settings from interface settings Added master volume + added master volume slider. + volume can be changed by sliding bar or by using the spin box + Preview of volume will be played when dragging and releasing bar. Added checks for qt4 Qt4 does not have support for setting the volume without some lengthy work around, I have disabled volume control for qt4 users and have mentioned that "Master volume requires qt5". Updated sfx + removed all old sfx + added new end step and tap sound + tap/endstep sound has a timer on it to prevent spamming + test sound engine will now use endstep sound Made end step sfx softer end step felt too harsh Added player joined sound + added a sound for when a new player joins a room Updated Was missing a sound when a player joins Made end step softer Made end step even softer updated sound again	2015-05-06 12:47:48 +02:00
Matt Lowe	87d938e56b	Updated hand and table color ... Updated default colors, darker, more modern, slick. Great feedback from community.	2015-05-05 23:58:36 +02:00
Matt Lowe	1e0c4cbf87	Updated reveal zone check boxes ... I saw in some images from other platforms it can take up alot of space. Made the boxed horizontal, rather than vertical. WIP Remade reveal zone + darkened card area to eaisily see boundries + reverted back to using a window + window can be resized + removed fake title bar and "X" + moved all cards revealed slightly to the right, makes it easier to drag-select from the left Cleanup Changed style to use cockatrice icon Changed cast from static_cast to qstyleoption_cast	2015-05-05 10:14:27 +02:00
poixen	cf24f4aa04	Merge pull request #1045 from poixen/move_reveal_location ... Moved zone loactions	2015-05-04 17:09:23 +02:00
Zach	399122f49d	Merge pull request #1047 from poixen/move_filter_boxes ... Updated reveal zone check boxes	2015-05-04 10:47:44 -04:00
Matt Lowe	45d214aa19	Added deck size limit ... Updated to use the current deck size limit	2015-05-04 16:21:59 +02:00
Matt Lowe	b81ed893e1	Can now disable desktop mentions ... Was not checking if the setting was enabled	2015-05-04 12:40:51 +02:00
Matt Lowe	59c0834427	Reveal top x cards ... Updated reveal top card to reveal top x cards Sometimes you want to reveal more than only the top 1 card.	2015-05-04 10:49:49 +02:00
Matt Lowe	052ce72993	Updated reveal zone check boxes ... I saw in some images from other platforms it can take up alot of space. Made the boxed horizontal, rather than vertical.	2015-05-02 21:18:02 +02:00
ctrlaltca	53f63e2801	Merge pull request #1024 from tooomm/icon_works ... Icon works	2015-05-02 18:32:28 +02:00
Matt Lowe	7ccc23f902	Moved zone loactions ... I have moved the default opening positions of some of the reveal zones. Example: The sideboard will be in the same position as the scry and the random card from hand will be the same as the hand view.	2015-05-02 17:52:34 +02:00
Matt Lowe	95104df589	Reverted back to full punctuation ... Reverted back. Right now it feels strange to only have simple search. Really you would want both simple search AND accurate search on, though this requires twice the checks for each result.	2015-05-01 22:26:44 +02:00
Fabio Bas	66adeb6d75	Improve sets handling ... Move the “check unknown sets” method inside the cards database, so that it can be executed when the card database gets reloaded after a card database update. Additionally, show the user a welcome message the first time they run a new cockatrice version, so that they know why they get shown the “edit sets” window and how to hide/disable sets.	2015-05-01 18:55:14 +02:00
Fabio Bas	c356a6fc48	Run oracle from cockatrice	2015-05-01 16:38:31 +02:00
Zach	5410afbbb1	Merge pull request #1035 from ctrlaltca/fix_762 ... Add "play top card face down" menu entry to library; fix #762	2015-04-28 11:33:41 -04:00
tooomm	a6970d9624	svg+png updates ... -updated and cleaned up cockatrice+servatrice svg's -added old original svg's for future adjustments -updated cockatrice+servatrice png's ico+icns updates -see #925 for more details -updated svg's as source for new icon files bmp updates -updated svg's as source for new installer logos cleaned up oracle.svg cleaned up oracle.svg /2 svg updates /2 removed sensible data `inkscape:export-filename` removed removed sensible data inkscape:export-filename removed sensible data inkscape:export-filename removed sensible data inkscape:export-filename fix fix2	2015-04-28 16:06:36 +02:00
Fabio Bas	e649535211	Add "play top card face down" menu entry to library; fix #762	2015-04-27 23:02:45 +02:00
Zach H	425790e398	Fixed incorrect zone positioning	2015-04-27 16:26:57 -04:00
Zach	1ca561dec5	Merge pull request #1033 from poixen/token_pt_fix ... Only use local db if no pt is provided	2015-04-27 15:58:41 -04:00
Zach	c5ac3701ba	Merge pull request #1031 from ZeldaZach/update_about_menu	2015-04-27 12:21:15 -04:00
Zach H	a15a0c0385	gavin & translate update ... Add dev section add report section	2015-04-27 11:34:53 -04:00
Matt Lowe	6fd5c4dd27	Only use local db if no pt is provided ... Addresses issue #1032 If a token is created with no p/t then the local db value will be passed instead. If a value is provided then that will be used instead.	2015-04-27 10:17:46 +02:00
tooomm	f83ddf48fd	cleaned up translations ... removed tr() tag from hidden strings	2015-04-27 00:25:43 +02:00
Zach	f6d0b5216b	Merge pull request #1027 from ctrlaltca/osx_retina_ok ... Enable hidpi (retina) support under osx	2015-04-26 18:13:56 -04:00
poixen	ab28b45d68	Merge pull request #1029 from poixen/server_shutdown_fix ... Fixed server shutdown crash	2015-04-27 00:12:28 +02:00
Matt Lowe	a729bb076b	Fixed server shutdown crash ... `serverShutdownMessageBox` was not assigned to 0 in the ctor.	2015-04-26 23:39:20 +02:00
Zach	ecaaa9eeb8	Merge pull request #1022 from poixen/orange_pt ... Changed pt to orange	2015-04-26 17:25:16 -04:00
Fabio Bas	e88bad786f	Enable hidpi (retina) support under osx ... * add to the application bundle a custom info.plist * fix a graphic glitch on the life counter	2015-04-26 22:50:59 +02:00
Matt Lowe	ff1aec406b	Changed pt to orange ... After feedback, and also noticing myself, the blue requires a little more focus than should be nessesarry. I have updated to be orange, which feels more comfortable. I have polled the community and they also agree orange > blue.	2015-04-25 23:06:41 +02:00
ctrlaltca	54f0706b4a	Merge pull request #1019 from ctrlaltca/translations ... Fetched new translations from Transifex	2015-04-24 17:23:35 +02:00
Fabio Bas	9e281f70ae	Fetched new translations from Transifex	2015-04-24 17:19:46 +02:00
Matt Lowe	74f140ade8	removed qfont import	2015-04-23 23:06:21 +02:00
Matt Lowe	637bd767bb	Updated to use svgs	2015-04-23 22:43:24 +02:00
Matt Lowe	1ab2ba3f6f	Updated + / - buttons ... + moved to the left to make it easier to move from buttons to macros + changed buttons to + / - + made buttons a bit bigger	2015-04-23 18:42:49 +02:00
woogerboy21	924dd174e3	Merge pull request #1010 from poixen/server_shutdown_warnings ... Updated server shutdown timer logic	2015-04-23 10:59:32 -04:00
Matt Lowe	e646122f55	Updated server shutdown timer logic ... Will follow the following rules + send a message initially + send a message every 20 mins + send a message every min when time <= 5 Updated client popup Updated client to close any previous popups and bring up a new one. NEEDS TO BE TESTED added missing include Added delete on close	2015-04-22 19:14:14 +02:00
Matt Lowe	004a952cb4	Colored PT ... I compare the card pt, to the card with the same name in the db. if the card is found, we compare the pt, of the db item and the item in play. If there is not a match then we change the color of the PT. This is pretty much the same as mtgo does it. I looked into having only the P, or the T colored, though this is not posible, when you set a pen color you can not change it partway through painting a string. That would require 3 strings painted, one for p, / and t. Which is more effort than its worth. This does the job pretty well. I have also moved the pt slightly to the left so it lines up better. I have some images to compate.	2015-04-22 15:02:47 +02:00
Fabio Bas	7e56c5a9c6	Added translation fix missing from #1001	2015-04-22 11:10:14 +02:00
Fabio Bas	629f48e2ff	Permit translation in "game created" column; Fix #999 ... Also, extracted the 2 new strings	2015-04-22 09:12:38 +02:00
Fabio Bas	af3a3239fb	Updated translations	2015-04-21 14:49:50 +02:00
ctrlaltca	4a36be84a8	Merge pull request #985 from ctrlaltca/sets_rebased ... Rework the way sets selection/importing works; fix #539 (rebased)	2015-04-21 14:46:51 +02:00
poixen	2902d8575e	Merge pull request #983 from poixen/mention_fix ... Mentions will now work with all legal chars	2015-04-20 14:20:23 +02:00
Zach	118bc06ae8	Merge pull request #987 from poixen/storm ... Added colored storm counter	2015-04-19 14:21:05 -04:00
ctrlaltca	5f13f89d74	Merge pull request #986 from poixen/clear_chat_fix ... Added clear chat fix	2015-04-19 18:20:40 +02:00
Matt Lowe	9a36ac8035	Added colored storm counter	2015-04-19 18:14:29 +02:00
Matt Lowe	86fa02c6c5	Added clear chat fix ... When clearing the chat, we now clear the last sender. This fixes the issue where you clear the chat and a user continues to talk, you get no indication of who is talking. Now it will show the users name.	2015-04-18 22:23:51 +02:00
Fabio Bas	881cea27f4	Rework the way sets selection/importing works; fix #539 (rebased)	2015-04-18 18:47:09 +02:00
ctrlaltca	e69ca60164	Merge pull request #978 from tooomm/useronserver_rename ... clearly differentiate user lists	2015-04-18 18:17:55 +02:00
Matt Lowe	2d34bfeb1b	Mentions will now work with all legal chars ... As the server has been updated to enforce username rules, we can now check for the next position of whitespace. This allows ALL users to have a working mention system. Currently "-" is available for users, this will fix that.	2015-04-18 14:42:39 +02:00
woogerboy21	69a9484e45	Merge pull request #981 from ctrlaltca/servatrice_compilation_fix ... Quick compilation fix for debug mode	2015-04-17 13:44:26 -04:00
woogerboy21	1562d1efd1	Merge pull request #980 from poixen/server_period ... Updated server to support "."	2015-04-17 13:44:15 -04:00
Fabio Bas	3d0b132dae	yet another unused parameter	2015-04-17 18:57:37 +02:00
Fabio Bas	3969572d36	Fixed double variable declaration	2015-04-17 18:51:48 +02:00
Fabio Bas	2a9945ac6a	Reorder member initialization	2015-04-17 17:44:07 +02:00
ctrlaltca	6807fed02f	Merge pull request #976 from ctrlaltca/fix_643 ... Fix #643 (problem in deck editor's OR filter when no term is enabled)	2015-04-17 09:47:32 +02:00
ctrlaltca	b99a0a682e	Merge pull request #973 from poixen/filter_dlg ... Filter password games consistancy	2015-04-17 09:47:18 +02:00
Matt Lowe	d5a1264bcb	Updated server to support "." ... Now uses regex. Added "." Updated login message	2015-04-16 23:50:05 +02:00
Fabio Bas	c27735b09e	Simplified code	2015-04-16 22:20:40 +02:00
tooomm	5be3ec8068	clearly differentiate users lists ... users in room vs. users on server	2015-04-16 15:17:08 +02:00
Fabio Bas	9296e6007f	Fix #643	2015-04-16 12:44:10 +02:00
Fabio Bas	42c0b09fbd	Remove dependency on QtXml (unused)	2015-04-16 12:26:02 +02:00
ctrlaltca	2f35e86be9	Merge pull request #954 from ctrlaltca/deckeditor_cmc ... Minor deck editor fixes	2015-04-16 08:12:53 +02:00
ctrlaltca	997ca87377	Merge pull request #966 from ZeldaZach/remove_unnecessary_tr ... Fixing Shortcuts; Fix #476	2015-04-16 08:12:26 +02:00
Fabio Bas	eb6d067a21	Speed up deck editor filtering ... * card: cache simpleName for each card * deck editor: remove double comparation of searched term with card name when sorting	2015-04-15 23:21:44 +02:00
Matt Lowe	8938d291f8	Filter password games consistancy	2015-04-15 22:00:52 +02:00
poixen	feeaa9c9d1	Merge pull request #970 from poixen/updated_username_message ... updated second string	2015-04-15 20:23:24 +02:00
poixen	53d25e738d	Merge pull request #969 from poixen/game_created ... Game created code improvements	2015-04-15 20:22:45 +02:00
poixen	698e6ccee4	Merge pull request #950 from poixen/zone_grammar ... Updated grammar based on #932	2015-04-15 20:21:49 +02:00
Matt Lowe	751315a413	updated second string	2015-04-15 19:03:59 +02:00
poixen	aa95125fb2	Merge pull request #955 from poixen/custom_folder_link ... Added menu item to open custom image folder	2015-04-15 14:51:04 +02:00
poixen	82d2ac8c32	Merge pull request #965 from poixen/updated_username_message ... Updated invalid username dlg	2015-04-15 14:23:50 +02:00
Matt Lowe	386cbcec7f	Updated username dlg message ... updated	2015-04-15 14:22:56 +02:00
Matt Lowe	25dbfb37f4	Game created code improvements ... + No longer get "5hrs" and "5+ hrs" instead will be "4hrs" and "5+ hrs". + Refactored into an else-if with a single return. + removed comments + removed code from namespace and added to class	2015-04-15 14:18:16 +02:00
Matt Lowe	2e5ecd841c	Removed check ... When searching for a card the line edit will not be empty, so this check is not needed. The performance when the line edit IS empty will take a slight hit, but you really want additional performance when searching, not when the line edit is empty. Removing will increase performance.	2015-04-15 12:25:06 +02:00
Matt Lowe	778ad8dee1	Simple name searching on by default ... Previously would try to match the card name, if nothing is found, then we would try again with the simple name. I have now made it only the simple name version. We do not need to perform the first check. Should help a little with performance.	2015-04-14 23:30:29 +02:00
Zach H	9be29641b0	apply QKeySequence & remove unnecessary tr	2015-04-14 17:17:01 -04:00
Matt Lowe	2336ee4f84	Updated invalid username dlg ... Relates to #964. We want to give a the correct reason for failed logins and display the reason why.	2015-04-14 09:59:29 +02:00
Zach	cd49b2f785	Merge pull request #960 from poixen/capitalize_text ... Capitalized some text	2015-04-12 19:38:19 -04:00
Matt Lowe	b68cf51341	Added menu item to open custom image folder ... Needs to be tested on mac	2015-04-13 00:30:49 +02:00
Matt Lowe	bf0f3e0b44	Capitalized some text	2015-04-13 00:05:58 +02:00
Matt Lowe	1b165bde4c	Updated context menus ... + added more separators + swapped some actions from lib menu (scry action now higher) + Added capital letters to words	2015-04-12 22:36:48 +02:00
Matt Lowe	a2aad95ede	Added missing checks	2015-04-12 21:52:17 +02:00
Fabio Bas	25290227ca	Sort Mana cost using CMC	2015-04-12 18:54:00 +02:00
Fabio Bas	0e203b3ac2	CardDatabaseDisplayModel: sort cards by search term only when the current sort column is NameColumn ... When the list os sorted using another column, you don’t need to compare that column’s value with the searched term	2015-04-12 18:43:45 +02:00
Fabio Bas	013087a4eb	CardDatabaseModel: use an enum for columns	2015-04-12 18:42:10 +02:00
Matt Lowe	379ceeeca0	Zone crash fix ... Related to #808 When closing the app/game tab with a zone revealed the client will crash. This was due to the zones not being deleted.	2015-04-12 17:39:04 +02:00
Matt Lowe	6e39cc3823	Updated grammar based on #932 ... Based on #932 I have added pronouns the the graveyard and hand, and also changed "from play" to "from battlefield"	2015-04-12 17:00:43 +02:00
poixen	4c66ef03e2	Merge pull request #937 from poixen/create_token_dlg ... Updated token dlg	2015-04-12 16:36:45 +02:00
Matt Lowe	06accd519c	Fixed main chat room lag	2015-04-11 00:49:07 +02:00
Zach	19e86c61f0	Merge pull request #940 from poixen/token_pt_fix ... Fixed token PT issue for #931	2015-04-10 16:21:17 -04:00
poixen	fbb7194a10	Merge pull request #942 from poixen/logic_order ... Added () for || && logic handling	2015-04-10 15:01:28 +02:00
Fabio Bas	9f0b383036	Fetch updated translations from transfix	2015-04-10 13:35:23 +02:00
Matt Lowe	44d4a534bf	Added () for || && logic handling	2015-04-10 13:31:44 +02:00
Fabio Bas	bc7cb6279b	extract new strings	2015-04-10 13:29:05 +02:00
Matt Lowe	9689b8e56a	Fixed token PT issue for #931 ... The problem was that back when I added #336 I made it so that if YOU didnt recive the PT of the token, then it would be fetched from your tokens.xml, the issue is that we needed to send that value to the server. The server sees it as a 0/0 This fix will send the PT from the tokens.xml if available.	2015-04-10 13:26:38 +02:00
poixen	db23d3c9ec	Merge pull request #936 from poixen/replay_system ... Reworked replay buttons	2015-04-10 10:43:44 +02:00
poixen	3bf3c7e94e	Merge pull request #922 from poixen/sys_icon_fix ... Fixed double click sys icon	2015-04-10 10:36:36 +02:00
poixen	ebcee34e0d	Merge pull request #923 from poixen/popup_fix ... Fixed issue with clicking on PM/mention bubbles	2015-04-10 10:36:20 +02:00
poixen	2356788289	Merge pull request #929 from poixen/reveal_top_card_shortcut ... Added shortcut to reveal top card or lib	2015-04-10 10:33:04 +02:00
poixen	88da9ec815	Merge pull request #938 from poixen/load_token_fix ... Fixed deck tokens showing in token dlg	2015-04-10 10:29:13 +02:00
Matt Lowe	884579529d	Fixed deck tokens showing in token dlg ... Tokens from decks will now show in the token dlg window	2015-04-10 00:46:11 +02:00
Matt Lowe	4ca58eecb7	Updated token dlg ... Adjusted proportions to make the table fit better. Needs to be checked on UHD screens.	2015-04-09 18:34:21 +02:00
Matt Lowe	45542243b7	Reworked replay buttons ... + Removed unused buttons + remade button art + fixed crash with font colors/replays + removed unused timestamp label in replay	2015-04-09 16:05:12 +02:00
Matt Lowe	56cbae17ac	added separator ... Felt like areas different to the current zone should be segregated.	2015-04-09 14:44:29 +02:00
Matt Lowe	a7d41a322c	Added connection dlg popup on server timeout	2015-04-08 21:00:33 +02:00
poixen	86f6e911bd	Merge pull request #920 from poixen/card_search_punctuation ... Ignore punctuation in card search	2015-04-08 20:30:37 +02:00
Matt Lowe	b27854e440	Ignore punctuation in card search ... It is awkward to have to use precise punctuation when searching for cards. Planeswalkers and legendary creatures often have "," in the name and you have to enter it. This commit means you no longer need to do that. + Can use " " in place of "-" (example: Wilt-Leaf Liege) + Can use "" in place of non word chars (Example: Hero's Downfall and Ajani, Caller of the Pride)	2015-04-08 18:35:27 +02:00
Zach	6f69485f99	Merge pull request #911 from ctrlaltca/fix_67 ... Large decks (up to 8000-ish cards) no longer make client crash; Fix #67	2015-04-08 10:56:33 -04:00
Matt Lowe	fbbeb12413	Added shortcut to reveal top card or lib ... + Ctrl + N	2015-04-08 13:09:00 +02:00
Fabio Bas	8f3421204e	Optimize loop; refers #910	2015-04-08 12:52:02 +02:00
Matt Lowe	1c89b90cbb	Fixed double click sys icon ... Was an issue with double clicking the icon when the app was full screen/ fullscreen + minimized. Now works as expected.	2015-04-08 10:12:41 +02:00
Matt Lowe	6b307469fe	Fixed issue with clicking on PM bubbles ... Previously would not open the client if the window was minimized. Added the same popup fix for mentions	2015-04-07 23:32:13 +02:00
poixen	89bce3d649	Revert "Kick message no longer takes you to kicked tab"	2015-04-07 15:55:11 +02:00
Matt Lowe	b20ae9710c	Mention popup fix ... + will now only popup with a mention alert when you are not on the same tab/window. + will also no longer popup by mentioning yourself	2015-04-05 12:43:02 +02:00
Zach	8ca2135f08	Merge pull request #901 from poixen/left_justified_hand ... Left hand justification	2015-04-04 17:45:02 -04:00
poixen	7c6b6818f1	Merge pull request #907 from poixen/right_click_cast ... Right click cast	2015-04-04 23:38:53 +02:00
poixen	e96e2e4b04	Merge pull request #906 from poixen/rename_user_lists ... Renamed userlist tab to account	2015-04-04 23:38:44 +02:00
Fabio Bas	0a366d7564	Fix #67 ... Workaround the two remaining issues, mostly fixing the “load deck” screen in tab_game: * Only preload up to the first 300 cards of a deck; * don’t even bother trying to load card images if they’ll be shown with width <= 10 Trying a 17k cards deck like the one proposed in #67 is still a no go, mostly due to the cpu time used to create all the objects. Anyway, i tested decks up to 8k cards and they works fine now (if you like to wait while trice is loading them)..	2015-04-04 14:03:22 +02:00
Fabio Bas	cab1e096df	Fix #118 ... Fix selection problem when sorting the deck list	2015-04-04 12:49:28 +02:00
Matt Lowe	20bfb4d0a7	Fix for hand target casting ... if you have the setting to NOT play cards to the stack enabled, it meant that any spells (like Lightning Bolt) would be cast to the stack but no arrow would show. This was an edge case I missed.	2015-04-03 19:02:14 +02:00
Matt Lowe	725cb2f863	Renamed userlist tab to account	2015-04-02 23:02:54 +02:00
poixen	b8401592d4	Merge pull request #905 from poixen/socket_failure_dlg ... Reopen connection if socket failure	2015-04-02 19:22:18 +02:00
Matt Lowe	9e6be7459d	Reopen connection if socket failure ... Missed from #879	2015-04-02 18:33:35 +02:00
poixen	79e9b05a79	Merge pull request #904 from poixen/rounder_logo ... Rounder logo corner	2015-04-02 17:39:57 +02:00
Matt Lowe	aeb63cba87	Rounder logo corner ... Before: After:	2015-04-02 14:30:41 +02:00
Matt Lowe	986eab4d40	Default to one player ... I think the majority of players use this feature for goldfishing/practicing. Defaulting to one player for convenience.	2015-04-02 13:23:39 +02:00
Matt Lowe	a082fbcfef	Left hand justification ... Set to false by default, let me know if you think it should be true. As all cards are played to the left of the screen this feels more comfortable to use as you dont need to keep looking at different areas of the screen. Will auto rearrange when changed during game-play.	2015-04-02 12:49:06 +02:00
Zach	fb49a8867e	Merge pull request #897 from poixen/counter_issue ... Fixed accidental +/- of counters when using middle click menu	2015-04-01 15:54:41 -04:00
Matt Lowe	a0be18ca09	Removed dev code	2015-04-01 18:33:02 +02:00
Matt Lowe	e78747241d	Refactored code and made lines cleaner ... Before: After:	2015-04-01 17:24:50 +02:00
Zach	580927a50b	Merge pull request #870 from ctrlaltca/mentions ... Reworked a bit mentions/tags support in chat view; fix #791	2015-04-01 09:34:42 -04:00
Gavin Bisesi	48f88e117e	Merge pull request #895 from poixen/close_tray_icon ... tray icon is now hidden and then removed	2015-04-01 06:17:37 -04:00
Matt Lowe	a873a4efa4	Fixed accidental +/- of counters ... Previously if you middle click on a counter (life/mana) and then click away, depending on the button clicked, the counter would +/-. I have added a fix to make sure the mouse is over the counter to change it.	2015-03-31 23:07:24 +02:00
Matt Lowe	2684397a1e	Fixed order of the counters ... Previously had - numbers at the top and + at the bottom. This feels like it makes more sense.	2015-03-31 22:15:21 +02:00
Matt Lowe	5bd37e1d06	tray icon is now hidden and then removed ... I noticed that sometimes I would have lots of icons in the sys tray. I would have to mouse over them to make then be removed. This also happens with some other programs too. I have added some code to hide() the sys icon when the client is close, it seems to be helping with the issue. Hard to reproduce, might also only be a windows issue.	2015-03-31 22:05:02 +02:00
Zach H	2aadf09347	fix double popup on delete pics	2015-03-30 16:55:57 -04:00
Fabio Bas	399886c25c	Sound engine: don't open() inexistent files ... Avoid error “QIODevice::read: device not open”	2015-03-30 15:58:33 +02:00
Fabio Bas	757795f7cd	Deck editor: skip unnecessary card name comparison when no search term is defined	2015-03-30 15:41:28 +02:00
Fabio Bas	b5b7ad8958	Startup: fix resetting card database to default ... The check was inverted. LoadStatus::Ok = 0, so only when db->loadCardDatabase() returns 0 we know the card database path is correct	2015-03-30 12:28:13 +02:00
Gavin Bisesi	1cf7c71631	Merge pull request #881 from poixen/right_click_cast ... Cast to target from hand	2015-03-29 09:03:16 -04:00
Fabio Bas	c11d33540e	extracted new strings	2015-03-27 12:09:53 +01:00
Matt Lowe	5ee6229535	Cast to target from hand ... Users can now target from their hand. This will cast the card and point to the target.	2015-03-27 09:19:36 +01:00
Zach	4fdfed38d2	Merge pull request #878 from poixen/blue_cog ... Updated settings chat settings cog	2015-03-26 20:09:59 -04:00
Zach	2a6c08b9db	Merge pull request #882 from ctrlaltca/remove_deckbrewz ... Remove deck brew by ZeldaZach	2015-03-26 18:50:29 -04:00
Zach	c15bbee98a	Merge pull request #879 from poixen/login ... Failed logins reopen login dlg	2015-03-26 18:27:53 -04:00
Fabio Bas	839da83d2c	Remove deck brew by ZeldaZach	2015-03-26 23:08:53 +01:00
Matt Lowe	38f0977456	Removed icon ... Removed hidden layer from svg that could be seen as tm/copyrighted content.	2015-03-26 21:10:52 +01:00
Matt Lowe	12716e43d3	Failed logins reopen login dlg ... If you fail a login you are returned to the login dialog	2015-03-26 21:05:21 +01:00
Matt Lowe	81a8141fe5	Added system tray icon ... + Can be used for setting client size and closing the client. Will expand on by sending client alerts to the tray. Updated to push message notifactions to the toolbar Preview image: Added setting to enable/disable message popups Added functionality + updated popup message and translation + Double clicking tray icon will now bring up the app/minimize it + can now be alerted of mentions + added setting to set if you want mentions on desktop + clicking mention message will take you to the main chat + added translations for icon menu + removed maximize/minimize/restore from menu, not needed. Added disconnect + Disconnects any previous message slots/signals from the system icon message bubble	2015-03-26 18:37:57 +01:00
poixen	b2e032b365	Merge pull request #860 from poixen/italic_card_names ... Updated chatview texts	2015-03-26 18:35:43 +01:00
poixen	cd9f4e9856	Merge pull request #845 from poixen/card_boarder ... Updated card borders	2015-03-26 17:48:44 +01:00
Matt Lowe	686b215910	Updated settings chat settings cog ... + Cog was grey and always looked like it was inactive.	2015-03-26 15:40:09 +01:00
Fabio Bas	c3e5679604	Fetch updated translations from transifex	2015-03-26 15:13:57 +01:00
Matt Lowe	e0839db648	Updated chatview texts ... This is enforcing a new client wide color scheme. RULES + Green = Major server message (Welcome to chat room, change phase...) + Red = Minor server message (timestamps, game actions...) + Blue = Key word + Blue with modifier (underline/italics) = Keyword that can be interacted with. + Black = User text + key numbers are now blue. player drew X cards, looks at the top X cards, places X counters on . . . and so on. + card names are now italic (different from urls now) I did have the player names set to blue also, but it felt like too much. Player names in phase change are blue Updates + Updated username colors in phases to match other areas of client Small update + Made server message in chat room bold + made User names in chat/pm match the weight of in-game (consistancy)	2015-03-25 13:16:22 +01:00
Fabio Bas	4cd98483ba	Reworked a bit mentions/tags support in chat view; fix #791	2015-03-23 00:03:31 +01:00