2333 commits

Author	SHA1	Message	Date
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
ctrlaltca	88b242b34d	Merge pull request #829 from ctrlaltca/antiflood ... Anti flood for game commands; fix #753	2015-03-22 22:08:25 +01:00
Fabio Bas	7c2db752a5	Revert "Updated translation file" ... This reverts commit 4568adb498.	2015-03-22 21:51:38 +01:00
Fabio Bas	1f33e34d8f	Add tooltips to tabs	2015-03-19 16:43:27 +01:00
Fabio Bas	31635d2ae8	Remove "talking to" prefix from private chats ... Additionally, use the same name for “private chat“ in all menus (we had “personal talk” and “direct chat“ before)	2015-03-19 16:32:59 +01:00
Fabio Bas	dafa7c6fe1	fix #811	2015-03-19 16:08:46 +01:00
Fabio Bas	4568adb498	Updated translation file	2015-03-19 10:54:01 +01:00
Fabio Bas	8be5563563	Added user notification for RespChatFlood	2015-03-19 10:10:19 +01:00
Gavin Bisesi	20123b2c7a	Merge pull request #721 from poixen/kick_message ... Kick message no longer takes you to kicked tab	2015-03-18 20:54:27 -04:00
Matt Lowe	5218e2f710	Fix for filter ... fix for #749 + You can now search for sets using lower case: "frf", "dtk", "rtr" and so on. + You now need exact matches on set short and full names. "rtr" and "return to ravnica" will work. "return" will not work.	2015-03-19 00:55:50 +01:00
Zach	adcae59eb0	Merge pull request #846 from poixen/optional_card_scaling ... Added optional card scaling setting	2015-03-18 18:44:58 -04:00
poixen	fead9f31f3	Merge pull request #839 from poixen/resize_columns ... Resized game view columns	2015-03-18 16:57:14 +01:00
Matt Lowe	441cb4447a	Added optional card scaling setting ... + Users can now enable/disable the mouse over card scaling.	2015-03-18 13:37:06 +01:00
Matt Lowe	c05f75438b	Updated card borders ... + refactored code + improved card border lines (black) + cards no longer have curved edges, this prevents card image corners showing behind. + tapped cards now have better border lines	2015-03-18 13:11:30 +01:00
Zach	0df227ec46	Merge pull request #840 from poixen/user_games_window_size ... Updated user games window size	2015-03-16 22:16:25 -04:00
Matt Lowe	9205ef2912	Updated user games window size	2015-03-16 15:36:51 +01:00
Matt Lowe	39482534c0	Resized game view columns ... Previously all columns were the same width, making it cramped. I have resized them to give a better initial width.	2015-03-16 11:21:15 +01:00
Matt Lowe	697358e484	Added shortcut to clear chat ... F12 will now clear the chat in the main chat.	2015-03-15 21:13:41 +01:00
Fabio Bas	2da43b8155	fetched updated translations from transifex	2015-03-14 18:49:00 +01:00
Zach	b1736c7599	Merge pull request #809 from poixen/search_new_fix ... Re-added some search and filter code	2015-03-11 10:54:46 -04:00
Matt Lowe	bf0750db20	Set download hq images to false by default ... Due to mtgimage being taken down we I have made a one time check that will uncheck the hq image option.	2015-03-10 22:10:50 +01:00
Matt Lowe	b91bab8356	Re-added some search and filter code ... I had previously removed some filtering code that would allow users to filter cards using our filtering tools. This functionality has now been re-added.	2015-03-10 21:54:02 +01:00
ctrlaltca	29ddd44334	Merge pull request #805 from ctrlaltca/translations ... Fetched new translations from transifex	2015-03-07 14:47:36 +01:00
Fabio Bas	38ad972d03	Fetched new translations (bis)	2015-03-07 12:45:50 +01:00
Fabio Bas	ec8382cbb5	Fetched new translations from transifex	2015-03-07 12:45:27 +01:00
Zach	5df7f61360	Merge pull request #800 from poixen/dice_roll ... Changed color of server maessges in-game	2015-03-06 23:57:43 -05:00
Zach	5f05c0be91	Merge pull request #775 from Cockatrice/fix-331 ... Cards played face down always go untapped to main row.	2015-03-06 23:57:05 -05:00
Matt Lowe	71e794c0c6	Changed color of server maessges in-game ... Due to an exploit of being able to mimic a die roll in a message: "Hi all gl, hf ! username rolls a 20 with a 20-sided die." I have changed all server messages to be colored.	2015-03-06 15:20:14 +01:00
poixen	fd4f76289c	Merge pull request #798 from poixen/window_title_username ... Updated english, reverted spanish	2015-03-04 18:45:52 +01:00
Matt Lowe	afe33be229	Updated english, reverted spanish	2015-03-04 18:05:35 +01:00
Zach	5f7d0fe7c2	Merge pull request #796 from poixen/search_improvement ... Fixed card search	2015-03-03 18:53:09 -05:00
poixen	cc6b826cad	Removed comments	2015-03-03 16:53:48 +01:00
Matt Lowe	b5dd7a42ce	Fixed card search ... Card search will now order the following way: 1. Exact match at top 2. Exact match with preceding values sorted lexically. 3. Match contained in word sorted lexically	2015-03-03 13:32:51 +01:00
Matt Lowe	8f732325b2	Updated english translations	2015-03-03 13:29:43 +01:00
Matt Lowe	4cbffc3f6d	Added username to window title ... While having more than 1 client open I found it hard to know which user was which. I have added the user name to the title bar so you know who you are logged in as.	2015-03-03 13:09:41 +01:00
Zach	90880c8b7e	Merge pull request #763 from poixen/pixmap_fix ... One time pixmap cache update	2015-02-28 20:39:02 -05:00
Matt Lowe	9cea8e0229	Added faint black line, tilted tick more	2015-02-27 00:00:49 +01:00
Matt Lowe	e4f8a499f4	Updated ready/not ready	2015-02-26 23:26:36 +01:00
Zach	b0fe2ef9d3	Merge pull request #772 from ctrlaltca/trice_saveonclose_2ndtry ... cockatrice: ask to save modified decks on close; fix #759	2015-02-25 17:09:53 -05:00
Fabio Bas	061fd5a830	Workaround for duplicated dialogs on close	2015-02-25 18:32:33 +01:00
Jaeic Lee	e6bf3b783c	Updating source language file	2015-02-24 11:37:30 +09:00
Fabio Bas	def4d50e97	Fetched new translations from transifex	2015-02-23 22:40:07 +01:00
Fabio Bas	a7b8934a1b	Fix remaining issues	2015-02-22 20:02:58 +01:00
Gavin Bisesi	a984a9ea69	Merge pull request #773 from ctrlaltca/fix_754 ... Clamp the zoneviewwidget's topleft point to the scene view area; fix #754	2015-02-22 06:16:39 -05:00
Gavin Bises	e423fb2a39	Readability tweak	2015-02-21 21:31:17 -05:00
Gavin Bises	779a400de4	Fix #331	2015-02-21 15:18:32 -05:00
Zach	66678e95dc	Merge pull request #765 from Cockatrice/no-spec-alerts ... Game events do not notify taskbar while spectating.	2015-02-21 13:32:09 -05:00
Fabio Bas	b9f0212c9b	Clamp the zoneviewwidget's topleft point to the scene view area; fix #754	2015-02-21 16:43:38 +01:00
Fabio Bas	399d4bf516	cockatrice: ask to save modified decks on close; fix #759	2015-02-21 15:21:26 +01:00
Gavin Bises	5ff6693c9c	Fix #632. Url and mentions work together	2015-02-21 08:13:59 -05:00
Gavin Bises	5fc28e31a6	Disable spec notification toggle if notifications are off on dlg create	2015-02-20 21:36:18 -05:00
Gavin Bises	1562c234ca	Add spec notification toggle to UI settings.	2015-02-20 20:57:22 -05:00
Gavin Bises	11bd2444d8	Do not alert the application for game events when spectating. ... Add a configuration toggle to enable alerts when spectating. Default behavior is to not alert.	2015-02-20 20:29:36 -05:00
Matt Lowe	6a91f3a976	Added hq image to check	2015-02-20 21:50:16 +01:00
Matt Lowe	c5bc3ea4dd	One time pixmap cache update ... Code will now perform a one time check on starting to see if the cache has been updated to the new 2048 default. If the update has not been set we update. After this time if the user lowers the level, it will not reset back to 2048 by default.	2015-02-20 21:43:02 +01:00
Gavin Bisesi	06e5327595	Merge pull request #748 from kaiserfro/jo-full-word-card-color-filter ... Add full and short name for card color filters.	2015-02-19 20:44:29 -05:00
Gavin Bisesi	648c5c488b	Merge pull request #751 from ctrlaltca/img_loading ... Avoid loading the same card's picture twice; Fix #745	2015-02-19 20:44:00 -05:00
Gavin Bisesi	9d9ffd8a9a	Merge pull request #760 from poixen/updated_spec_svg ... Updated spectator eye image	2015-02-19 20:43:50 -05:00
Matt Lowe	f28a8b5ad1	Updated player fighting svg ... + Changed to be black + Made a little thicker	2015-02-19 18:09:38 +01:00
Matt Lowe	1b8c1ab9cd	Updated image ... Bolder outline More defined shape	2015-02-19 17:35:12 +01:00
Matt Lowe	28aed657b3	Fixed 5+ hour issue for new games ... The problem was converting a negative int to an unsigned int. This was resulting in a value of: (2^32) - n. Meaning that the room age was extreamly old. After 48s the delay from the server will catch up and the time diff will be 0 rather than negative, which is why after 48s the room will change from 5+ hours to <1 min.	2015-02-19 12:45:33 +01:00
Fabio Bas	70b047adcb	Fix #745	2015-02-16 21:25:56 +01:00
Jeffrey Oliver	8c187eff1b	Use qstring replace. ... Iterate through the filter to see if everything matches the card.	2015-02-16 09:45:15 -08:00
Jeffrey Oliver	65d62b98a0	Add full and short name for card color filters.	2015-02-15 10:55:56 -08:00
Gavin Bisesi	ef654341fa	Merge pull request #733 from poixen/alert_icon ... New logo for changed tab	2015-02-14 17:18:10 -05:00
Gavin Bisesi	126c64d5f9	Merge pull request #735 from kaiserfro/jo-ctrl-add-to-selection ... ctrl-click to add a card to a selection.	2015-02-14 08:10:15 -05:00
Gavin Bisesi	96af5bd09c	Merge pull request #726 from kaiserfro/jo-add-play-face-down-menu-item ... Add a play face down context menu item when in the hand zone.	2015-02-14 08:09:44 -05:00
Jeffrey Oliver	08166f7d24	Use !isSelected()	2015-02-13 21:48:37 -08:00
Gavin Bisesi	e0450d45c2	Merge pull request #732 from poixen/hq_images_default ... Increased default pixmap cache	2015-02-13 20:12:03 -05:00
Fabio Bas	798dc09fe6	Translation updates to support Transifex ... * ignore .tx folder * cmake: when UPDATE_TRANSLATIONS=ON, extract new strings only to the english translation file. * added info in CONTRIBUTING.md * updated english translations	2015-02-13 15:56:17 +01:00
Jeffrey Oliver	180108e6f9	ctrl-click to add a card to a selection.	2015-02-12 22:44:17 -08:00
Matt Lowe	b3df978722	New logo for changed tab	2015-02-12 14:39:44 +01:00
Matt Lowe	64b8ed1e21	Increased default pixmap cache	2015-02-12 14:07:21 +01:00
Jeffrey Oliver	4bd161ab06	Put back the new action.	2015-02-11 20:31:00 -08:00
Jeffrey Oliver	5add56d850	Fixed up whitespace.	2015-02-11 20:25:34 -08:00
Gavin Bisesi	12fe0f5380	Merge pull request #727 from poixen/pm_macro ... Added modifier key to quick PM	2015-02-11 22:19:09 -05:00
Matt Lowe	3c60ac6114	Set to download HQ images by default	2015-02-11 21:38:34 +01:00
Matt Lowe	92474479e4	Added modifier key to quick PM ... Ctrl + click on a user name to PM	2015-02-11 18:56:28 +01:00
Jeffrey Oliver	cc32e8c86e	Add a play face down context menu item when in the hand zone.	2015-02-10 22:58:32 -08:00
Matt Lowe	9a5f6bf8e8	Updated icons to be solid color	2015-02-10 14:47:47 +01:00
Matt Lowe	959b516cb8	Kick message no longer takes you to kicked tab	2015-02-10 11:25:27 +01:00
Zach H	f0338118af	minor fix	2015-02-09 16:07:23 -05:00
Zach H	7a1fb45ebc	feedback change	2015-02-09 16:04:39 -05:00
Zach	ce2541af1e	Allow for shortcuts on hand viewing ... Based on feedback, allow for shortcut for specs to view hands	2015-02-09 15:52:04 -05:00
Zach H	43d34bb825	spectator preferences	2015-02-09 15:35:16 -05:00
Zach	b7cb16da07	Merge pull request #713 from poixen/sepc_info ... Spectator viewing options	2015-02-09 15:17:45 -05:00
Matt Lowe	616f8439ae	Changed text to match room creation ... "see hands" -> "see everything"	2015-02-09 17:41:38 +01:00
Matt Lowe	d420fc89a5	Spectator viewing options ... Its now easy to see which games you can chat/see hands in.	2015-02-09 17:11:13 +01:00
Matt Lowe	2b0c5da8ac	Updated tab alert icon	2015-02-09 15:25:32 +01:00
Jaeic Lee	64a436be6c	Slightly updated Korean Translation ... Consistency for certain affixes	2015-02-09 16:54:36 +09:00
Jaeic Lee	c94e5f1186	Updated Korean translation ... Added new strings for Cockatrice New Oracle translation Cleaned up vanished strings	2015-02-09 16:38:52 +09:00
Gavin Bisesi	5f3f767178	Merge pull request #710 from ctrlaltca/pvt_filters ... Disable filters in "show user's games" dialog	2015-02-08 17:28:18 -05:00
Fabio Bas	0d974914a3	Disable filters in "show user's games" dialog ... Hide filters-related buttons Bypass the proxy model	2015-02-08 22:35:37 +01:00
Zach	a813dcb803	Merge pull request #708 from poixen/local_chat_focus ... Local chat focus	2015-02-08 15:34:18 -05:00
Gavin Bisesi	43a9ac61fb	Merge pull request #702 from ctrlaltca/osx_menubar ... Osx menubar improvements; fix #659	2015-02-08 15:05:35 -05:00
Matt Lowe	f91de7e1f1	Local chat focus ... Games with only 1 player will now not focus on the chat when starting the game. This helps with goldfishing.	2015-02-08 20:56:16 +01:00
Zach	25747a0964	Merge pull request #704 from ctrlaltca/fix_683 ... Fix #683 and #684	2015-02-07 19:15:44 -05:00
Fabio Bas	ae674e54b0	Merge patch for #684	2015-02-08 00:40:28 +01:00
Fabio Bas	cbd391b1b8	Second attempt based on feedback ... re-split the menus, but rename the cockatrice one to “actions”	2015-02-08 00:38:04 +01:00
Matt Lowe	3b0a8c2aa8	Updated ... + Added room name + takes you to kicked game tab	2015-02-08 00:36:35 +01:00
Fabio Bas	9c6784a1c0	Fix #683 ... Two regressions; depends on the fix for #684, too	2015-02-08 00:26:16 +01:00
Fabio Bas	32fb532ad3	OSX: Test the ability to translate application menu entries	2015-02-07 23:17:26 +01:00
Fabio Bas	508c444453	Regenerated translations to pick up new string from OS X menubar	2015-02-07 23:14:37 +01:00
Fabio Bas	5646a76ee7	OSX: merge the duplicate cockatrice menu in the main one	2015-02-07 23:13:32 +01:00
Matt Lowe	7de110306f	You have been kicked message box ... Its easy to not see that you have been kicked right now. This makes it more apparent.	2015-02-06 23:14:55 +01:00
Gavin Bises	86b92a25de	Merge remote-tracking branch 'origin/master' into show-password-games-by-default	2015-02-05 21:46:29 -05:00
Zach H	296e31b510	flag fix	2015-02-05 17:24:09 -05:00
Zach H	ad8e47a35d	flag fix	2015-02-05 17:23:11 -05:00
Zach	059a62a00d	Merge pull request #689 from Cockatrice/fix-688 ... Fix #688. Reuse chat tabs when user opens more chat with same user	2015-02-04 20:54:26 -05:00
Gavin Bises	f22e42428c	Fix #688. Reuse chat tabs when user opens more chat with same user	2015-02-04 20:34:11 -05:00
Gavin Bises	6e5f4d1f06	Merge remote-tracking branch 'origin/master' into jo-remove-name-filters-from-settings	2015-02-04 20:15:41 -05:00
Gavin Bisesi	78aa291734	Merge pull request #687 from poixen/base_mention_color ... Changed default mention/username color	2015-02-04 19:10:10 -05:00
Matt Lowe	cf26127dc4	Changed default mention/username color ... #A6120D Dark blood red, less "pink" that the current.	2015-02-05 00:28:22 +01:00
Gavin Bisesi	6d499bdad2	Merge pull request #685 from poixen/mentions_in_om ... Added click mentions to PMs	2015-02-04 18:18:08 -05:00
Matt Lowe	ef607eeb4c	Added mentions to PMs ... + adds client wide continuity + one day we might have multiuser pms + I use it when greeting users who pm me: "hello @username!"	2015-02-04 17:13:52 +01:00
Gavin Bisesi	37a05eb731	Merge pull request #671 from kaiserfro/jo-reduce-whitespace-from-game-description ... Reduce the game descriptions whitespace.	2015-02-04 10:18:23 -05:00
Matt Lowe	f7f651338b	Updated deck editor buttons	2015-02-03 23:35:18 +01:00
Gavin Bisesi	25cc695190	Merge pull request #672 from ctrlaltca/deckstats ... Fixed "analyze on deckstats"; Fix #662	2015-02-03 10:30:28 -05:00
Matt Lowe	787773e949	Chat has focus when starting game ... When the game starts the line edit now has focus immediately.	2015-02-03 13:53:18 +01:00
Fabio Bas	7ce9d3749e	Fixed "analyze on deckstats"; Fix #662 ... Plus: added support for deck name	2015-02-03 08:48:20 +01:00
Jeffrey Oliver	bd39d60388	Reduce the game descriptions whitespace.	2015-02-02 20:59:46 -08:00
Gavin Bises	975c5e0db3	Show password protected games by default	2015-02-02 19:14:23 -05:00
poixen	b7521bad8b	Merge pull request #620 from poixen/mention_punctuation ... Check for non-characters	2015-02-02 21:45:02 +01:00
poixen	4c418bc9b4	Merge pull request #654 from poixen/chat_buddy_stars ... Buddy stars	2015-02-02 17:55:14 +01:00
Gavin Bises	82ca261ec8	Merge remote-tracking branch 'origin/master' into mention_color ... Conflicts: cockatrice/src/dlg_settings.cpp cockatrice/src/dlg_settings.h	2015-02-01 13:29:50 -05:00
Zach	a08fc0461f	Merge pull request #660 from Cockatrice/ignore-unreg-pm ... Ignore unreg pm	2015-02-01 13:17:03 -05:00
Gavin Bises	26fa936347	Add settings page option to ignore unreg user pm	2015-02-01 12:14:25 -05:00
Gavin Bises	5222183ff3	Don't open new PM windows from unreg when ignoring unreg pm	2015-02-01 12:05:29 -05:00
Gavin Bises	32c6635137	Add settings interface for ignoring unreg pm	2015-02-01 12:05:04 -05:00
Matt Lowe	42c4f4a08c	Fixed pile view bug ... When sorting a view which has the last column the longest an error happens where the view is squashed.	2015-02-01 00:31:25 +01:00
Matt Lowe	d57a6111aa	Buddy stars ... Buddies will now be seen as stars in the chat	2015-01-31 17:11:17 +01:00
Matt Lowe	3f2c570075	fixed conflict	2015-01-30 19:23:04 +01:00
Matt Lowe	d065236ce9	Added separator ... Its been annoying me for a long time.	2015-01-30 13:57:16 +01:00
Matt Lowe	75f8ecd6e9	Added label	2015-01-30 13:06:09 +01:00
Zach H	b608d81037	Merge branch 'fix-deck-shuffle-check'	2015-01-29 21:10:34 -05:00
Gavin Bisesi	a8fcd9ec26	Merge pull request #623 from Cockatrice/country-code ... Add country code to user info box.	2015-01-29 20:27:19 -05:00
Gavin Bises	d0f4d96d17	Don't store shuffle zone check - always check it ... It doesn't make any sense to store that particular setting	2015-01-29 20:06:15 -05:00
Gavin Bises	6f50266931	Uppercase country code for text display, not flag filename generation	2015-01-29 20:01:48 -05:00
Matt Lowe	de38a294b5	Updated color setting ... + live preview added + will now only store the color if valid	2015-01-30 01:54:57 +01:00
Matt Lowe	ec8a2de2eb	Chat mention color ... +Chat mention / username color can now be set via hex in the settings + Users can invert the color of the mention text black/white + if an invalid color is provided, the default will be used	2015-01-30 00:48:50 +01:00
Gavin Bises	6fa34c6c04	Add cmc to card db filter model	2015-01-29 13:33:06 -05:00
Gavin Bises	7893ab086f	Fix broken cmc parsing from cards.xml ... I don't know why this even compiled	2015-01-29 13:32:17 -05:00
ctrlaltca	a31c15c752	Merge pull request #637 from ctrlaltca/fix_cache_size ... Refix #558, Fix #631	2015-01-29 14:27:36 +01:00
Fabio Bas	29190708c3	Fix merge botch	2015-01-29 14:11:15 +01:00
Gavin Bisesi	dd426cbac9	Merge pull request #634 from Cockatrice/oracle-cmc ... Parse cmc from json and store in cards.xml	2015-01-29 05:48:32 -05:00
Matt Lowe	2a78d15792	Taskbar attention when mentioned	2015-01-29 10:27:16 +01:00
Jeffrey Oliver	763d8a7919	Merge branch 'master' into jo-remove-name-filters-from-settings	2015-01-28 20:28:36 -08:00
Gavin Bises	e2fe25735b	Parse cmc from json and store in cards.xml	2015-01-28 20:28:38 -05:00
Gavin Bises	1af6486d74	Capitalize country code in user info box	2015-01-28 19:03:08 -05:00
Gavin Bises	b5fbebc883	Add country code to user info box. ... People might not know all the flags	2015-01-28 11:57:17 -05:00
Matt Lowe	78edb8c661	Check for non-characters ... now checks for non characters, so a mention s like "@username!" will now work. Requires some testing though, there are a lot of scenarios to check for.	2015-01-28 13:27:45 +01:00
Gavin Bisesi	739ca6a02e	Merge pull request #607 from poixen/osx_fix ... Refactor pileview sorting code	2015-01-27 20:10:54 -05:00
Jeffrey Oliver	223b38c27b	Add a bool to the gameselector constructor to choose whether or not we should ... load settings from saved values or use defaults.	2015-01-27 12:40:13 -08:00
Gavin Bisesi	8be659ba47	Merge pull request #616 from ideocl4st/korean-translation-150128 ... Updated Korean Translation	2015-01-27 13:17:04 -05:00
Gavin Bisesi	c20b1747bd	Merge pull request #615 from ideocl4st/249-country-flags-svg ... New flag images for 249 countries with ISO 3166 codes	2015-01-27 12:24:04 -05:00
Jaeic Lee	a94cc1c77c	Updated Korean Translation ... Added new strings Changed all instances of ‘zone’ based on oracle text of Torrent Elemental Changed all instances of ‘registered users’ into more commonly used term	2015-01-28 01:57:10 +09:00
Jaeic Lee	b7dd64d333	Flag images for 249 countries with ISO 3166 codes ... From https://github.com/joielechong/iso-country-flags-svg-collection. (States that flag images are public domain)	2015-01-28 00:08:14 +09:00
Gavin Bisesi	93cf7dbaaf	Merge pull request #609 from poixen/chat_mention_fixes ... Chat mention fixes	2015-01-27 06:30:20 -05:00
Matt Lowe	3c0aca70e0	Updated method name ... + updated method name + added some doc	2015-01-27 10:55:52 +01:00
Gavin Bisesi	62c4c0f4eb	Merge pull request #597 from ideocl4st/tweak-hand-context-menu ... Submenus for moving all cards in a zone to another	2015-01-26 20:33:17 -05:00
Jaeic Lee	bfc1bd04b5	Added separators ... Looks better imo.	2015-01-27 09:54:11 +09:00
Matt Lowe	639cbefee0	Chat mention fixes ... + fixed some issues with highlighting entire line + added case insensative mentions	2015-01-27 00:43:11 +01:00
Matt Lowe	b89535f7ff	Refactored code	2015-01-26 22:19:00 +01:00
Jaeic Lee	c6800c48d2	More ellipsis ... Should be the last of them	2015-01-27 03:32:58 +09:00
Jaeic Lee	46fb5f820e	Tweaked some texts ... Per Daenyth’s request	2015-01-27 03:14:52 +09:00
Zach H	627624a9c9	adding more flags	2015-01-26 11:57:28 -05:00
Zach	613f7717ab	Merge pull request #595 from poixen/shufflefix ... Fixed shuffle issue	2015-01-26 10:24:55 -05:00
Gavin Bisesi	ceead6b9e3	Merge pull request #593 from poixen/other_user_mention_option ... Removed other user mention BG	2015-01-26 07:18:24 -05:00
Gavin Bisesi	ffb5ac6b9a	Merge pull request #599 from poixen/removed_unused_connect ... Removed a connection	2015-01-25 15:31:26 -05:00
Matt Lowe	c0aafec907	Removed a connection ... This isnt being used anymore	2015-01-25 12:15:53 +01:00
Matt Lowe	02277b2442	Removed other user mention BG ... Due to feedback, I have removed the background color for other user mentions. I think this looks cleaner, and doesnt require an additional option.	2015-01-25 09:44:07 +01:00
Jaeic Lee	cc14e3cfc6	Submenus for moving all cards in a zone to another	2015-01-25 11:34:51 +09:00
Gavin Bisesi	2a6291dcde	Merge pull request #592 from poixen/tap_animation ... Faster tapping speed	2015-01-24 21:21:31 -05:00
Matt Lowe	ec198c33ca	Fixed shuffle issue ... when closing a view we save the current settings. I added a check to only update the shuffle settings if the zone we are closing can be shuffled.	2015-01-25 00:34:41 +01:00
Matt Lowe	359391acba	Fix for #557	2015-01-24 23:59:53 +01:00
Matt Lowe	e409d96bb9	Faster tapping speed ... + Feels better with a little more speed	2015-01-24 23:01:10 +01:00
Jeffrey Oliver	d96e566411	Add back in the games description filter storage.	2015-01-23 20:53:21 -08:00
Zach	712f12a7a6	Merge pull request #587 from ZeldaZach/return_align_fix ... adding return	2015-01-23 12:08:18 -05:00
Zach H	22a1bcdf60	adding return	2015-01-23 12:07:53 -05:00
Zach	dac5726dab	Merge pull request #504 from ctrlaltca/local_scry_and_move ... Specify the player when triggering a move on a revealed card	2015-01-23 10:14:05 -05:00
Jeffrey Oliver	cc75210ac6	Removed the loading and saving of the user name and game description ... from the persistent filter settings.	2015-01-22 20:39:28 -08:00
poixen	b06b81895b	Merge pull request #580 from poixen/room_user_level ... Updated game view	2015-01-22 23:26:14 +01:00
Matt Lowe	8fdaadf462	refactorings #3 ... removed const from enum	2015-01-22 22:37:49 +01:00
Matt Lowe	86bbf75ddd	refactorings #2 ... + removed static from enum + removed condition check for user level	2015-01-22 22:23:21 +01:00
Matt Lowe	8ac58259b4	Refactorings	2015-01-22 22:05:08 +01:00
Matt Lowe	1406a27775	Updated game view ... + removed password column + added a lock svg to restrictions if pw is needed + added "password" to restrictions if pw is needed + added user pawn to creator tab + reformatted code for easy adaptation later	2015-01-22 21:35:52 +01:00
poixen	71a067030d	Merge pull request #578 from poixen/user_chat_mentions ... User chat mentions	2015-01-22 21:04:30 +01:00
Matt Lowe	497fed6b15	Updated colors	2015-01-22 12:39:24 +01:00
Matt Lowe	0334fe3c8f	Other mentions -- DRAFT -- ... Mentions about other players currently in the room will be highlighted. They are also clickable for mentions and right clickable for context options.	2015-01-22 09:32:56 +01:00
Jaeic Lee	7128f481b9	Small tweak due to fixing spelling mistake ... cleaned up vanished transitions in the mean time.	2015-01-21 16:50:59 +09:00
Jaeic Lee	5c7ce8ffb7	Merge remote-tracking branch 'upstream/master' into korean-translation	2015-01-21 16:46:32 +09:00
Matt Lowe	fd2b34278f	Fixed spelling mistake	2015-01-21 07:50:20 +01:00
Jaeic Lee	31ad9b779a	Updated Korean Translation	2015-01-21 12:38:51 +09:00
Matt Lowe	b9c537bf47	Moved "Ignore messages from unregistered users" ... Relocated to the chat settings tab.	2015-01-20 20:02:36 +01:00
Gavin Bisesi	6dfaa81a53	Merge pull request #561 from poixen/chatnamehighlight ... Username block highlighting	2015-01-20 12:35:41 -05:00
Gavin Bisesi	fa8bcccaaa	Merge pull request #549 from poixen/cardviewlist ... Sortable card views can now be split into pile types	2015-01-20 12:15:19 -05:00
Gavin Bisesi	931b420323	Merge pull request #556 from poixen/settings_dlg_refactorings ... Refactored Settings Tab	2015-01-20 11:39:25 -05:00
Gavin Bisesi	10aa137475	Merge pull request #562 from poixen/chat_click_mentions ... Click tag mentions	2015-01-20 10:06:04 -05:00
Matt Lowe	b41d64615d	Added "Chat settings..." shortcut to chat cog	2015-01-20 15:35:16 +01:00
Matt Lowe	222105be61	Added functionality in game	2015-01-19 21:29:15 +01:00
Matt Lowe	041e91412d	Switch Statement	2015-01-19 08:33:28 +01:00
Matt Lowe	f0c661a0df	Added seperator ... Added a separator	2015-01-18 00:33:42 +01:00
Matt Lowe	54a1a28619	Added ratio scaling ... Previously was adding pixels, rather than using ratios. this was cutting off cards on higher res screens	2015-01-18 00:18:23 +01:00
Matt Lowe	d59e1f135d	Refactored Chat Settings tab ... - removed heap alloc	2015-01-17 18:04:06 +01:00
Matt Lowe	d02d3ed521	Refactored Deck Editor tab ... - removed heap allocation	2015-01-17 17:55:13 +01:00
Matt Lowe	5cf801eb94	Refactored User Interface tab ... - removed heap allocs	2015-01-17 17:50:04 +01:00
Matt Lowe	a599fa1a63	Removed manual sizing ... replaced the resize(x, y) to "pack" the widgets. It saves space and makes the settings tighter.	2015-01-17 17:30:24 +01:00
Matt Lowe	98e84f0d63	Fixed some merge issues	2015-01-17 17:11:14 +01:00
Matt Lowe	4b45ba46f4	Refactored General Settings Tab ... ~ Removed some heap allocs ~ Remaining heap allocs are needed. ~ Unrolled "one line" declarations in header ~ restructured logic in GeneralSettingsPage Refactored Appearance Tab - removed some heap allocs - removed setting of zone view, its not needed here, its configurable in real time, in game.	2015-01-17 16:59:00 +01:00
Matt Lowe	ece56ff3f2	Added @ back in ... Added the @ back to the chat, this will help if a user does not have the newest version of the client.	2015-01-17 15:03:41 +01:00
Matt Lowe	8bc2adb70b	Set focus ... The line edit now gets focus for faster typing.	2015-01-17 14:53:41 +01:00
Matt Lowe	45112e49b1	Click tag mentions ... You can now click on a username in the main chat to add a "@username" tag to the chat. Makes communication with other users using tags faster.	2015-01-17 14:47:16 +01:00
Matt Lowe	49d3ad73d5	Uername block highlighting ... I was able to find a simple way to achive the block highlighting.	2015-01-17 13:23:30 +01:00
poixen	9b7f488bd7	Merge pull request #559 from poixen/chatnamehighlight ... Fixed #557	2015-01-17 00:43:49 +01:00
Matt Lowe	e4afd9fa4d	Fixed #557	2015-01-17 00:08:54 +01:00
Fabio Bas	24c6e4a81d	Limit pixmap cache size to 2047MB; fix #555 ... also, fix any invalid values loaded from config	2015-01-16 17:11:38 +01:00
Matt Lowe	aad98756d1	Refactorings ... + added comments + refactored optimumRect	2015-01-15 23:52:19 +01:00
Gavin Bisesi	8e396cadc2	Merge pull request #554 from poixen/chatsettingstab ... Updated chat setting tab	2015-01-15 08:39:30 -05:00
Matt Lowe	a794112b1d	Updated chat setting tab ... + Renamed "Messages" to "Chat Settings" + Moved the chat mentions to this tab + Added boarder round macro settings	2015-01-15 00:47:10 +01:00
Matt Lowe	0454f9c24b	Added title for sound settings	2015-01-15 00:01:12 +01:00
Matt Lowe	e4e3a1d2e5	Sorting views ... + When viewing a sorted view (like revealing hand, or looking at library), the cards will now be sorted in columns based on the main card type. + Settings are now saved.	2015-01-14 23:19:22 +01:00
Gavin Bisesi	06ac74ec6b	Merge pull request #546 from ideocl4st/master ... Added Korean flag and newly added strings' translations	2015-01-14 14:29:39 -05:00
Gavin Bisesi	ce2520d74f	Merge pull request #538 from poixen/settingscleanup ... Realigned Icons	2015-01-14 07:38:23 -05:00
poixen	8fee9c6c4b	Merge pull request #535 from poixen/chatnamehighlight ... Chat highlighting when username is mentioned	2015-01-13 19:11:52 +01:00
Matt Lowe	f1a9401416	Changed color	2015-01-13 18:06:49 +01:00
Jaeic Lee	ab2aeee138	Added Korean flag and some translated strings ... Added translation of some new strings and svg file of South Korean flag. Flag of South Korea is from http://commons.wikimedia.org/wiki/File:Flag_of_South_Korea.svg	2015-01-13 13:36:07 +09:00
Gavin Bisesi	2ae9cd2c37	Merge pull request #543 from poixen/clearchat ... Clear chat	2015-01-12 21:15:55 -05:00
Matt Lowe	2e342361a5	Clear chat ... Users can now clear the chat in the main lobby. This removes unwanted text and clears up memory when the client has been open a long time.	2015-01-13 00:39:19 +01:00
Matt Lowe	5452d0ceae	Chat highlighting when mentioned ... When being mentioned in a post with '@username' you will now see the entry highlighted. This helps to see when someone is talking to you. It work across the main chat, in game and in private chat.	2015-01-12 15:15:15 +01:00
Gavin Bisesi	69e6aa355f	Merge pull request #534 from poixen/accountage ... Added account age to user info window	2015-01-11 21:37:07 -05:00
Matt Lowe	0445e570d7	Realigned Icons ... + Moved Icons to the top. You can now see all options. + All SVGs now have a background (GO! was missing one). + All SVGs now have the same background (General had one of its own)	2015-01-11 11:55:48 +01:00
Matt Lowe	02043ad4f9	Added Account Age ... + Added the ability to see the account age of registered users. Changes are both in server and client. The server will now send back the registration date along with the user data. The client will then use this to calculate the account age and display it in the user details window.	2015-01-11 00:45:12 +01:00
Gavin Bisesi	37a4c0d0e6	Merge pull request #531 from mcallahan/resizing2 ... Resize player names in playerlistwidget properly.	2015-01-07 15:42:03 -05:00
Michael Callahan	eac6e41de7	Resize player names in playerlistwidget properly.	2015-01-06 22:20:45 -07:00
Fabio Bas	2101ed7096	Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt ... Conflicts: cockatrice/src/dlg_settings.cpp cockatrice/src/dlg_settings.h	2015-01-05 22:46:12 +01:00
Gavin Bisesi	c98a146746	Merge pull request #520 from mcallahan/always-reveal-top-master-master ... Reset Always reveal top card when starting a new game.	2015-01-05 16:36:07 -05:00
Gavin Bisesi	fba60c20c0	Merge pull request #523 from kaiserfro/apply-filters-at-start2 ... Apply filters at start	2015-01-05 11:26:54 -05:00
Fabio Bas	2671d6abdc	Merge remote-tracking branch 'upstream/master' into local_scry_and_move	2015-01-05 11:08:11 +01:00
Jeffrey Oliver	4a2a61ef46	Replace the 99 with a const int.	2015-01-04 15:32:29 -08:00
Jeffrey Oliver	8eb0e2dbef	Remove reminder.	2015-01-04 15:31:59 -08:00
Matt Lowe	a1a021c99c	Added timestamps to in game chat ... + added time stamps to the in game chat	2015-01-04 18:01:46 +01:00
Jaeic Lee	0e250a7d80	Fixed a non-standard word in Korean Translation ... Fixed a non-standard word (손패) into the word that is used in official translation (손)	2015-01-03 11:24:10 +09:00
Jeffrey Oliver	bb317003b4	Save filters after a filter clear. ... Remove some duplicated code.	2015-01-02 17:23:15 -08:00
Jeffrey Oliver	f01d26bf96	Enable the clear filter button by default.	2015-01-02 17:10:55 -08:00
Jeffrey Oliver	1e78596dfa	Remove unused function.	2015-01-02 17:07:30 -08:00
Jeffrey Oliver	f1803fe879	Remove some debug.	2015-01-02 17:06:30 -08:00
Jeffrey Oliver	b1e5153ea5	Should be a const ptr.	2015-01-02 17:03:17 -08:00
Jeffrey Oliver	dbfbfcc837	WIP: refactor filters to save to persistence from within model.	2015-01-02 15:19:36 -08:00
Jeffrey Oliver	6a4384f903	WIP: Refactor gamesproxymodel to own the persistence layer.	2015-01-02 15:05:33 -08:00
Fabio Bas	0abd1fb299	Rework patch for "move to.." menu; fix "P/T"-related menus	2015-01-02 17:10:19 +01:00
Jaeic Lee	7dc58355c9	Added line breaks in Korean translation ... Added line breaks in Korean translation for better readability.	2015-01-02 11:35:50 +09:00
Michael Callahan	142b42e095	Reset Always reveal top card when starting a new game.	2015-01-01 09:53:29 -07:00
Jaeic Lee	9c0faf8a9c	Edited Korean Translation ... Edited several sentences after a third-party review	2015-01-02 01:30:27 +09:00
Jaeic Lee	93d6bfed65	Merge branch 'master' into korean-translation ... Updating to sync with origin	2015-01-01 23:25:29 +09:00
Jaeic Lee	be973879d0	Added Korean Translation	2015-01-01 22:58:35 +09:00
ctrlaltca	16bbc5e8c0	Merge pull request #516 from mcallahan/compilation-warnings ... Clean up a small pile of compiler warnings.	2015-01-01 14:32:53 +01:00
Gavin Bisesi	0f1c8c59ac	Merge pull request #508 from Blitzmerker/master ... Fixes the "Card preview window gets stuck and can't be removed" issue by...	2015-01-01 08:08:29 -05:00
Gavin Bisesi	a6c750668a	Merge pull request #496 from ctrlaltca/set_extinfo ... Remove branch decoration	2015-01-01 08:07:19 -05:00
Gavin Bisesi	b38cd7833f	Merge pull request #500 from ctrlaltca/translation_fixes ... Translation fixes	2015-01-01 08:07:06 -05:00
ctrlaltca	37dd99ea5e	Merge pull request #507 from ctrlaltca/osx_plugins_debug ... Optimize qt plugins installation	2015-01-01 13:56:31 +01:00
Michael Callahan	3a0c86938c	Clean up a small pile of compiler warnings.	2014-12-30 15:54:38 -07:00
Michael Callahan	3c9ddd780e	Better icon packing in PlayerListWidget.	2014-12-30 15:27:21 -07:00
Blitzmerker	6af8a49aae	Fixes the "Card preview window gets stuck and can't be removed" issue by saving the cardname, instead of getting it back from the popup (with possible issues with case sensitivity). Also closes an old popup when a new is created.	2014-12-29 19:00:28 +01:00
Fabio Bas	54ce135e0c	Optimize qt plugins installation ... * Always install “release” plugins * install only plugins actually used	2014-12-28 22:21:45 +01:00
Fabio Bas	ea1067189d	Specify the player when triggering a move on a revealed card ... Fixes #72, #493	2014-12-27 17:12:21 +01:00
Fabio Bas	dd88476796	Changed parameter name to something more meaningful	2014-12-27 15:02:20 +01:00
Gavin Bisesi	f52935791c	Merge pull request #501 from ctrlaltca/crash_on_exit ... Fix crash on close #255	2014-12-26 20:05:54 -05:00
Fabio Bas	390a8f1985	Fix #484 ... Missing tooltip	2014-12-26 16:09:56 +01:00
Fabio Bas	15e4c852dd	Fix crash on close #255	2014-12-26 16:03:59 +01:00
Fabio Bas	2d932c68de	Fixed translation for "clear downloaded pictures" button	2014-12-26 14:48:58 +01:00
Fabio Bas	499f148783	Regnerate translations	2014-12-26 14:45:41 +01:00
Fabio Bas	72ba5a1683	Parse header files for translatable strings ... We previously parsed only .cpp files, but some strings are inlined in header files.	2014-12-26 14:45:31 +01:00
Fabio Bas	f88621fd97	Use QPixmapCache for card images ... Drop CardInfo’s own pixmap caches; use QPixmapCache instead. Use QPixmap references instead of pointers. Being stored in QPixmapCache, all card images are now subjected to QPixmapCache’s size limit	2014-12-24 16:18:55 +01:00
Fabio Bas	b96104bed4	Expose QPixmapCache's cache limit size as an user preference	2014-12-24 16:16:34 +01:00
Fabio Bas	a5a92e0a7d	Remove branch decoration	2014-12-18 17:39:07 +01:00
Gavin Bisesi	776d809f2f	Merge pull request #483 from ZeldaZach/how_many_cards ... How Many Cards	2014-12-09 11:39:40 -05:00
Zach H	b738428941	Adding a way to see how many of each type	2014-12-08 17:18:21 -05:00
Gavin Bisesi	8670bc674f	Merge pull request #471 from ctrlaltca/set_extinfo ... More sets handling improvements	2014-12-08 10:38:54 -05:00
Zach H	a44b7367be	removing blp pricing	2014-12-05 21:26:41 -05:00
Fabio Bas	9cc8d8b86c	Misc fixes ... ucfirst(setCode): requires oracle re-run reorder columns rename the “short name“ column as “set code“ ensure proper casting for releaseDate and sortKey fields (refs 00a5ed0)	2014-12-05 08:48:33 +01:00
Fabio Bas	0ba351c955	Add "saved" msgbox	2014-12-04 21:09:50 +01:00
Fabio Bas	00a5ed0b79	Fix compilation with qt <= 5.2	2014-12-04 18:29:06 +01:00
Fabio Bas	2745cb2c62	Removed debug	2014-12-02 14:43:39 +01:00
Fabio Bas	36ed4480c2	Re-added save and restore buttons	2014-12-02 14:38:36 +01:00
Gavin Bisesi	ef8bd60a32	Merge pull request #465 from poixen/urlchat ... Added more space between chat	2014-12-01 12:45:08 -05:00
Gavin Bisesi	0be45e3969	Merge pull request #463 from poixen/chatlinkunderline ... Added underline to links in chat	2014-12-01 09:27:42 -05:00
Fabio Bas	e48a815d25	Add move buttons, misc improvements	2014-11-30 21:37:06 +01:00
Matt Lowe	0cb1dde8c8	Added more space between chat ... Added a couple extra pixels in the chat. Make it look a little less squished. Before: http://imgur.com/7U6oe82 After: http://imgur.com/C8gGpDY	2014-11-29 02:49:22 +01:00
Matt Lowe	52cadd75f3	Added underline to links in chat ... [REVIEW] Links now have a blue underline to better indicate they are clickable. Preview: http://imgur.com/gQZEv4I	2014-11-29 01:18:52 +01:00
Gavin Bisesi	9e1f8a0892	Merge pull request #449 from ctrlaltca/set_extinfo ... Sets handling improvements	2014-11-27 06:13:29 -05:00
Matt Lowe	0f6dc6be6c	Fix for #460	2014-11-27 09:52:27 +01:00
Fabio Bas	c8aeff0b0c	Port #436 to QDateTime	2014-11-26 12:34:26 +01:00
Fabio Bas	2704523c73	Merge branch 'master' into set_extinfo	2014-11-26 11:45:51 +01:00
Gavin Bisesi	f71cfb1240	Merge pull request #436 from mitchellwrosen/master ... Add 'Start time' column to game list	2014-11-25 09:01:24 -05:00
Gavin Bisesi	19de7cbc03	Merge pull request #428 from woogerboy21/static_reveal_library ... Don't remove card images from revealed decks	2014-11-25 08:41:08 -05:00
Gavin Bisesi	9d62c578e6	Merge pull request #435 from poixen/bottomdeck ... Action: Move Bottom Card to Graveyard	2014-11-25 08:40:45 -05:00
Matt Lowe	bbcfe84d08	Added double click/Enter for Server tab ... Added the same functionality to the server tab	2014-11-23 20:01:09 +01:00
Matt Lowe	9e349d8b88	Added "ENTER" to join a room ... Can now join a room by highlighting a room and pressing ENTER. Works nice with arrow navigation.	2014-11-23 00:46:54 +01:00
Matt Lowe	6a44855a5c	Added double click to join a room ... Can now double click on a room in the lobby to join	2014-11-23 00:36:50 +01:00
Mitchell Rosen	cab37b3945	Capitalize game columns	2014-11-22 00:08:47 -08:00
Mitchell Rosen	03bdbe2c7a	Added '<1m ago'	2014-11-22 00:08:00 -08:00
Mitchell Rosen	0af70883a8	0s-5m displayed as '<5m ago'	2014-11-22 00:06:13 -08:00
Mitchell Rosen	d0969c10c6	Show hours and minutes between 60 and 90 minutes	2014-11-22 00:06:13 -08:00
Mitchell Rosen	da145bdd7b	fix localization in time strings	2014-11-22 00:06:13 -08:00
Mitchell Rosen	7aff20b4ee	Fix the build	2014-11-22 00:06:13 -08:00
Mitchell Rosen	a3dc403f75	Translate, change 'Start time' to 'Game created', add debug log	2014-11-22 00:06:13 -08:00
Mitchell Rosen	93ab9f9691	Add 'Start time' column to game list	2014-11-22 00:06:13 -08:00
ctrlaltca	a28eb053c5	Merge pull request #450 from poixen/ghostcards ... Added fade to card drag items	2014-11-21 08:24:14 +01:00
Matt Lowe	141d0c7618	Added fade to card drag items ... [REVIEW] Added a white mask to cards that are being dragged. Preview: http://webmup.com/1we4W/	2014-11-21 00:09:38 +01:00
Gavin Bisesi	68bc67cde5	Merge pull request #433 from poixen/scalecards ... Cards Scale with mouse over action	2014-11-20 16:41:04 -05:00
Fabio Bas	ee3731717c	Fixed button labels	2014-11-20 09:15:58 +01:00
Matt Lowe	916735d613	Merge branch 'master' into newsearchbar	2014-11-19 22:21:43 +01:00
Fabio Bas	f48f386f35	Sets window: implemented save and restore buttons	2014-11-19 22:18:41 +01:00
Fabio Bas	ac43fa23b9	Better handle the TK set used for tokens ... Let oracle add a basic TK set in cards.xml Unify all the code previously using the string literal “TK”	2014-11-19 19:44:54 +01:00
Fabio Bas	8542d875d3	Sets dialog: new columns and sorting ... Added "order key", "set type" and "release date" columns Use a proxy model to sort the table made the dialog wider accordingly	2014-11-19 18:09:37 +01:00
Matt Lowe	d467cc8b01	QT_VERSION check now checks for correct version ... Feature is only included in Qt 5.3+	2014-11-18 18:14:47 +01:00
Matt Lowe	a2c4a1e537	Action: Move Bottom Card to Graveyard ... Created menu action to move card from the bottom of the library to the graveyard. Qt accelerator key is "i". #125	2014-11-15 16:35:30 +01:00
Gavin Bisesi	438d4e4661	Merge pull request #417 from poixen/newsearchbar ... Updated Search Bar Style	2014-11-14 10:19:24 -05:00
woogerboy21	6811819161	Don't remove card images from revealed decks ... Revealed library had write access, which meant that the user would see cards being removed from the zone as the other player drew cards. The cards were not the actual ones drawn, just the ones at the same index, so no information was leaked. Fix #297	2014-11-13 20:31:55 -05:00
Matt Lowe	62b7890e59	Cards Scale with mouse over action ... Cards now scale up by 10% when mouse over.	2014-11-12 23:26:24 +01:00
Matt Lowe	f58cc32ef4	Added version check ... Added version check, to only include the new Searchbar icon for Users running Qt 5+	2014-11-10 22:14:27 +01:00
Gavin Bisesi	277c050d76	Merge pull request #421 from ctrlaltca/even_more_pictures ... Add fallback urls for cards without a muId set	2014-11-10 10:27:47 -05:00
Fabio Bas	cb37073828	Oracle: fetch release date and set type ... and save them in cards.xml	2014-11-10 16:22:46 +01:00
Matt Lowe	33a6e3c5c0	Removed hard coded CSS ... Hard coded CSS might have a slight chance of not rendering the same across all platforms. More research needs to be performed. Until then I have removed the hard coded search bar customization.	2014-11-10 08:49:24 +01:00
Fabio Bas	fc1d06e13b	Add fallback urls for cards without a muId set ... We only have a good HQ source for them; any idea on a low-quality source?	2014-11-10 00:23:41 +01:00
Gavin Bisesi	a320af70da	Merge pull request #418 from ctrlaltca/osx_info_plist ... OSX: Add proper infos to info.plist	2014-11-09 17:34:35 -05:00
Gavin Bisesi	6b1df247d1	Merge pull request #415 from ctrlaltca/no_pictures_yet ... Rework the picture download behavior	2014-11-09 17:16:00 -05:00
Fabio Bas	c0ee060af4	Fixed vendor name	2014-11-09 23:14:36 +01:00
Gavin Bisesi	b3715c5da2	Merge pull request #416 from poixen/partialsearch ... Partial Card Name Search	2014-11-09 17:08:02 -05:00
Fabio Bas	da46996294	Fix #408 ... Gray out "only buddies/only reg users" in the “create game” dialog if the user is unregistered	2014-11-09 22:12:55 +01:00
Fabio Bas	a716d73a42	OSX: Add proper infos to info.plist ... fixes #411	2014-11-09 21:03:10 +01:00
Matt Lowe	eef4a621b3	Updated Search Bar Style ... Please note that I don't feel that the search bar needs to be skinned by users, hence why it is not part of the large css-skinning project. I also feel that given the PR #416 a new search bar with highlight the new search functionality. Updated the look of the search bar: + larger, curved edges + changes color when has focus + search icon built into search - removed "Search For" text in lieu of search icon	2014-11-09 12:04:09 +01:00
Matt Lowe	0589f02ca2	Partial Card Name Search ... + Card searches now do partial string matches, rather than needing to match the beginning of the string.	2014-11-09 11:23:45 +01:00
Fabio Bas	4b8ac99370	Corrected spacing	2014-11-08 15:52:04 +01:00
Fabio Bas	8ca0b96d10	Rework the picture download behavior ... Should fix #412	2014-11-08 15:08:49 +01:00
Gavin Bisesi	8d2e5d3c43	Merge pull request #306 from Mawu3n4/translation ... French translation	2014-11-07 10:11:53 -05:00
Gavin Bisesi	8f801825a9	Merge pull request #379 from poixen/uicolors ... Changed UI colors	2014-11-05 15:45:53 -05:00
Gavin Bisesi	5ad869c636	Merge pull request #378 from poixen/animation ... Card Animation performance improvement	2014-11-05 15:45:24 -05:00
Gavin Bisesi	67db347d12	Merge pull request #366 from poixen/removeoldimages ... Resource cleanup	2014-11-05 15:31:17 -05:00
poixen	967e1a469e	Removed comments ... - Removed comments as-per request	2014-11-05 14:10:30 +01:00
poixen	accd3ecca1	Removed commented line ... - removed unused commented out code	2014-11-05 14:03:43 +01:00
Matt Lowe	332d69a1a5	Removed comment ... + removed getters and setters comment	2014-11-03 17:19:12 +01:00
Matt Lowe	097090ac1c	Updated static variable name ... + Updated DELTA variable to more suitable name: ROTATION_DEGREES_PER_FRAME	2014-11-03 16:33:48 +01:00
Matt Lowe	c130ee92fa	Additional comment ... + Added additional comment explaining what DELTA is.	2014-11-03 14:39:51 +01:00
Zack	66aba2eec7	Merge remote-tracking branch 'upstream/master' into translation	2014-10-22 11:18:54 +02:00
Gavin Bisesi	07cccda17b	Merge pull request #377 from poixen/newhandsvg ... Updated hand.svg	2014-10-20 10:28:58 -04:00
Matt Lowe	80fd0fbcf3	Removed inline logic ... Removed inline logic to static variable, slight performance increase.	2014-10-17 00:17:44 +02:00
Matt Lowe	41478800ef	Updated Sideboard gradient colors ... Wasnt happy with the first gradient, too much white. Now uses 2 shades or purple.	2014-10-16 18:15:07 +02:00
Matt Lowe	a1c013a893	Updated UI features ... + Added a fade to inactive players TableZone + Refreshed TableZone, HandZone and DeckView default background colors	2014-10-16 18:14:51 +02:00
Matt Lowe	2193d247d0	Improved card animation performance ... + Cards now animate smoother and faster + removed redundant computations performed each frame	2014-10-16 18:06:30 +02:00
Matt Lowe	dc58d1a61e	Shortened animation time between phases ... + changed from 50ms to 25ms between update calls.	2014-10-16 18:05:49 +02:00
Matt Lowe	03f79887c4	Updated Hand image ... Looking at the client I saw the cockatrice was still on the card back. I have now removed it.	2014-10-14 22:43:14 +02:00
Fabio Bas	e0d76b60d0	Change button label and made it translatable	2014-10-14 22:02:42 +02:00
Fabio Bas	82a3deec30	Add a button in the sounds settings to play a test sound	2014-10-14 21:13:16 +02:00
Fabio Bas	9ef4d79c33	Install the audio/* plugins under windows and osx	2014-10-14 21:13:04 +02:00
Gavin Bisesi	8dbb2d8e6f	Merge pull request #364 from ctrlaltca/win32_openssl_cmake ... Deploy openssl libraries under win32	2014-10-14 14:03:32 -04:00
Gavin Bisesi	a26d4078cc	Revert "Find cards by prefix"	2014-10-14 11:28:30 -04:00
Zack	2c74524f59	fix: missing message closing tag	2014-10-12 16:43:35 +02:00
Matt Lowe	299283aa2e	Resource cleanup ... Removed some unused resource files.	2014-10-10 23:00:05 +02:00
Fabio Bas	dfb8be79cf	Fix installation of libeay32.dll, ssleay32.dll while compiling the PACKAGE target	2014-10-10 17:22:29 +02:00
Zack	9169d3a804	fix: conflicts && add: new translation	2014-10-10 14:56:05 +02:00
Fabio Bas	6f25e09132	Deploy openssl libraries under win32 ... They are needed to fetch prices from deckbrew and possibly, in the future, for ssl server connections	2014-10-10 14:12:30 +02:00
Gavin Bisesi	6810ae46d6	Merge pull request #260 from Mawu3n4/master ... Find cards by prefix	2014-10-09 11:29:02 -04:00
Gavin Bisesi	4070ba8e26	Merge pull request #352 from poixen/image-refresh ... Image refresh	2014-10-09 11:27:47 -04:00
Gavin Bisesi	006451f402	Merge pull request #238 from arxanas/no-overwrite-tokens-xml ... Fix #231: tokens.xml no longer overwritten by cards.xml.	2014-10-06 11:34:58 -04:00
Matt Lowe	e240e47d2f	Fixed svg for icon ... For some reason there was an issue with making the creature image white, i found a workaround. Icon should now display correctly.	2014-10-03 19:02:40 +02:00
Matt Lowe	7cdd2a26f6	Icon changes ... + added updated mac icon that was missing ~ resized cockatrice.png	2014-10-03 19:02:27 +02:00
Matt Lowe	294edb3295	Logo and card back refresh ... ~ Updated the back of the card, cleaner lines, slightly more modern. ~ Updated game icon/logo	2014-10-03 19:02:12 +02:00
Gavin Bisesi	277aba79dc	Merge pull request #336 from poixen/master ... Tokens use PT levels from cards.xml if available	2014-10-02 15:00:17 -04:00
Antony Woods	1f58f7d848	Changed 'value' to 'setValue' on line 275	2014-10-02 08:48:04 +01:00
Gavin Bisesi	b32aeb2211	Merge pull request #280 from pliu037/remove-.full-req ... Support images without .full suffix	2014-10-01 13:50:02 -04:00
Matt Lowe	e3a94ecca3	Token PT is now set to DB values if not defined in event.	2014-10-01 19:20:42 +02:00
Gavin Bisesi	7eed007f14	Merge pull request #281 from ctrlaltca/fix_202 ... Fix crash #202	2014-09-30 20:35:11 -04:00
Matt Lowe	a80ccd882c	Tokens use PT levels from cards.xml if available ... I added a check to see if the event PT is empty, if it is, we try and use the PT from the cards.xml. In resp to issue #330.	2014-10-01 00:57:07 +02:00
Fabio Bas	eaad8de8d0	Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers	2014-09-29 18:25:10 +02:00
Gavin Bisesi	b5de708756	Merge pull request #289 from acron0/auto-connect ... Added 'auto connect' checkbox to connect dialog.	2014-09-29 10:24:06 -04:00
Jan Martin	6f97e59c03	Change default scry to 1.	2014-09-19 21:41:57 +10:00
Zack Dibe	8928a699f9	fix: grammar in french translation	2014-09-11 23:44:52 +02:00
Mawu3n4	54e3867c72	finish fr translation	2014-09-11 15:18:40 +02:00
Mawu3n4	466f5ae5e1	add: FR translations and fix bad grammar	2014-09-11 15:17:35 +02:00
Yuki Izumi	fefb6fc612	Add sideboard helpers.	2014-09-11 12:56:27 +10:00
Antony Woods	f1b012c83d	Adding modified translation files	2014-09-09 17:30:37 +01:00
Antony Woods	dbe46084ac	Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect	2014-09-09 17:22:55 +01:00
Fabio Bas	d6b97976f9	Refreshed all translation files	2014-09-06 10:40:23 +02:00
Fabio Bas	a0b35ee60b	Cockatrice - CMake: Include all existing translation files using a glob	2014-09-06 10:38:59 +02:00
Fabio Bas	e5eda9f172	Add a UPDATE_TRANSLATIONS options that actually updates translations!	2014-09-04 16:15:01 +02:00
Antony Woods	ab83d6185a	Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog	2014-08-29 16:53:30 +01:00
Antony Woods	b381298981	Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point.	2014-08-27 21:25:11 +01:00
James Turner	f06d2123fc	Remove invalid character	2014-08-19 17:39:05 -04:00
Peng Liu	a83e6cdf48	Removed unused variable, bool stripped, from classes and functions.	2014-08-11 13:47:47 -04:00
Gavin Bisesi	134810b979	Merge pull request #279 from ctrlaltca/valgrind_unified ... Fixed Valgrind warnings	2014-08-11 09:11:12 -04:00
Fabio Bas	23a3b8364c	Merge remote-tracking branch 'upstream/master' into fix_202	2014-08-11 15:07:43 +02:00
Gavin Bisesi	5c46cfc169	Merge pull request #179 from woogerboy21/registered-user-only-server ... Registered Only Server	2014-08-11 09:03:57 -04:00
Fabio Bas	484a6e8bdc	Fix crash #202	2014-08-11 10:50:55 +02:00
Peng Liu	781460d6ac	Cockatrice can now load images both with and without .full. Will need to clean-up bool stripped (used to determine .full suffix inclusion).	2014-08-11 04:37:00 -04:00
Fabio Bas	1da2e7154c	Fixed Valgrind warnings ... Running cockatrice in valgrind i didn't found any bad memory leak (good!), but only a few jumps depending on uninitialized variables. Even if the possibility of crashes are remote, it's nice to sort them out.	2014-08-11 10:08:33 +02:00
Gavin Bisesi	8b32a1010a	Merge pull request #265 from pliu037/clear-downloaded-pics ... Clear downloaded images from settings	2014-08-10 13:34:14 -04:00
Mawu3n4	d55f6fdec1	fix: show card only found once by prefix	2014-08-08 14:24:29 +02:00
Daenyth	765e865aa2	Continue downloading card images after failing url on one. ... I should probably bust this out to a method.	2014-08-08 09:33:38 +02:00
Daenyth	42f1c6938f	Merged: First draft of better pic url error handling ... Cherry-picked b9cb61abd05f83c67740aafa5e1e6939143547e4	2014-08-08 09:33:35 +02:00
Fabio Bas	bba8184d37	Fix off by one	2014-08-07 23:14:57 +02:00
Fabio Bas	88dfea8ece	Don't save card pictures if we don't have a proper set name for it	2014-08-07 23:14:50 +02:00
Fabio Bas	3bce98e3a9	Fix crashes trying to load the picture of a card with no <set>	2014-08-07 23:14:41 +02:00
Peng Liu	d3459aabf9	Moved the button from the paths section to be below the "Download high-quality card pictures" checkbox. Button now reads "Reset/Clear Downloaded Pictures". Removed "Path to"s from card/token database, hand/stack/table/player info background, and card back labels.	2014-08-07 14:35:18 -04:00
Peng Liu	ae80752497	Added notification messages informing users of the success or failure of clearing downloaded images.	2014-08-07 14:00:59 -04:00
Waleed Khan	ffc5b59fec	Fix #258: Dashes to spaces.	2014-08-07 12:29:20 -04:00
Peng Liu	674005383b	Added a button and the functionality to clear all downloaded images (all images within subfolders at picsPath/downloadedPics) under Settings.	2014-08-07 12:09:42 -04:00
Mawu3n4	10ab53c4ac	fix: find by prefix if card not found only	2014-08-07 17:43:14 +02:00
Waleed Khan	c0d4669088	Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml ... Conflicts: cockatrice/src/carddatabase.cpp	2014-08-07 11:06:41 -04:00
Dibe Zackaria	9092f2298b	fix: remove auto	2014-08-06 20:27:04 +02:00
Dibe Zackaria	e8abd6eb63	fix: typo	2014-08-06 20:13:59 +02:00
Mawu3n4	7d190ddaf7	fix: pushed old version	2014-08-06 18:01:47 +02:00
Mawu3n4	621a47de9c	add: find token cards by prefix	2014-08-06 17:54:47 +02:00
Gavin Bisesi	ef1fbc0db9	Merge pull request #256 from pliu037/handle-PNGs-2 ... Handle PNGs (and other image formats)	2014-08-06 10:42:15 -04:00
Fabio Bas	6502a182e8	Support loading of files with wrong extension ... Like M15’s .png that cockatrice wrongly saved as .jpg Additionally, move the QImageReader declaration outside of the inner loop	2014-08-06 09:31:22 +02:00
Peng Liu	4bb1d28ae7	Removed the QLists for determining image format. Instead, using QImageReader, both when downloading/saving and when loading, to determine the correct format (Cockatrice now supports all QImageReader-supported formats). ... Image loading still uses one for loop to iterate through the QList of paths to folders in which to search for images.	2014-08-05 14:54:40 -04:00
Peng Liu	8587b8c349	Refactored the magic bytes into two QLists: one containing a list of QStrings representing the supported extensions, the other containing a list of QByteArrays representing the magic bytes in hex. ... Refactored the image loading loop to be two nested for loops: the outer loop iterating through the QList of paths to folders in which to search for images and the inner loop iterating through the QList of supported extensions.	2014-08-05 03:48:30 -04:00
Peng Liu	75122c3c9d	Switched back to using QFile instead of QImage for saving as QImage's save function adds overhead to the file size, leaving me unsure whether the original image is affected.	2014-08-04 17:01:58 -04:00
Peng Liu	387086cb4c	Added support for PNG images (both for downloading/saving and loading).	2014-08-04 16:43:57 -04:00
Fabio Bas	3667ab504c	Fix compilation warning introduced in #246 ... /cockatrice/src/main.cpp:162:16: warning: format string is not a string literal (potentially insecure) [-Wformat-security] qDebug("Could not create " + settingsCache->getPicsPath().toUtf8() + "/CUSTOM. Will fall back on default card images.");	2014-08-04 20:09:53 +02:00
Gavin Bisesi	8d482245ff	Merge pull request #251 from arxanas/case-insensitive-tokens ... Fix #248: the token dialog generates cards irrespective of their case and punctuation	2014-08-04 10:50:25 -04:00
Peng Liu	a9eaf65a82	Changed .toLatin1() to .toUtf8().	2014-08-02 23:44:31 -04:00
Waleed Khan	309494111c	Fix #248: the token dialog generates cards irrespective of their case and punctation.	2014-08-02 19:32:24 -04:00
Peng Liu	b3fa99ef36	I was too hasty and forgot a + and to toLatin1() a QString in the qDebug arg.	2014-07-31 23:24:25 -04:00
Peng Liu	077d9f2745	Checks if CUSTOM folder was successfully created. If not, prints qDebug message and proceeds as normal except uses default card images instead of custom ones.	2014-07-31 22:42:13 -04:00
Gavin Bisesi	ffed0e00fe	Merge pull request #214 from pliu037/master ... Added better support for custom card images	2014-07-31 13:42:57 -04:00
Gavin Bisesi	ca6bd669ce	Merge pull request #233 from ctrlaltca/regression_card_picurl ... Add back support for custom picture urls in cards.xml	2014-07-31 11:30:26 -04:00
Gavin Bisesi	7d5ce6f0ef	Merge pull request #235 from ctrlaltca/offline_users_menu ... Disable some usercontextmenu actions if the user is offline; fix #234	2014-07-30 15:49:43 -04:00
Gavin Bisesi	1e5a00d100	Merge pull request #228 from ctrlaltca/error_suppression ... Fix building with debug	2014-07-30 15:44:08 -04:00
Waleed Khan	9ba5d7968e	Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml.	2014-07-29 23:46:04 -04:00
Waleed Khan	8df7e9f164	Fix #231: tokens.xml no longer overwritten by cards.xml.	2014-07-27 20:55:47 -04:00
Fabio Bas	9e12c5b2d4	Use custom picUrl if picUrlHq is not defined	2014-07-27 22:06:35 +02:00
Fabio Bas	6b9daf3d15	Enable Show this user's games" for offline users	2014-07-27 21:29:27 +02:00
pliu037	c3a68fcbd3	Cleaned up some lines of code	2014-07-27 12:47:05 -04:00
Waleed Khan	689acc1e32	Fix #110: Price column is removed when the setting is disabled.	2014-07-26 21:13:30 -04:00
Fabio Bas	fe12f71b93	Disable some usercontextmenu actions if the user is offline; fix #234	2014-07-27 00:29:23 +02:00
Fabio Bas	aa225f8df7	Add back support for custom picture urls in cards.xml	2014-07-26 23:36:51 +02:00
Waleed Khan	fe9f7a22b1	Fix issue mentioned in #152: price updater loads all cards now.	2014-07-24 19:53:05 -04:00
Fabio Bas	3fda31073f	Declare useless virtual dtor for polymorphic classes	2014-07-24 18:54:45 +02:00
Fabio Bas	0f501762e0	Reorder items initialization to match the order in class declaration	2014-07-24 18:44:19 +02:00
Fabio Bas	bd97d7b933	Fix signed/unsigned comparision	2014-07-24 18:40:25 +02:00
Fabio Bas	d9577f0d6c	Hide unused parameters in cockatrice/ to avoid warnings	2014-07-24 18:27:02 +02:00
Fabio Bas	f32a999b4e	Remove unused variable	2014-07-24 15:38:36 +02:00
Gavin Bisesi	abdaa610ee	Merge pull request #152 from ctrlaltca/master_feature_prices ... Add pricing from deckbrew.com (refs #147)	2014-07-24 07:45:37 -04:00
Fabio Bas	49b3568b53	small fix: moving the url length check in the inner loop	2014-07-23 23:10:48 +02:00
Fabio Bas	b40abfa1ad	Split price retrieval on multiple request	2014-07-23 23:00:58 +02:00
Fabio Bas	bf92e67002	Ensure the whole table gets refreshed when updating prices	2014-07-23 22:11:26 +02:00
Gavin Bisesi	a8031321c6	Merge pull request #226 from arxanas/deckstats-multiple-cards ... Fix #225: Multiples of cards are now sent to deckstats.	2014-07-23 15:38:09 -04:00
Fabio Bas	b0ee2e6d4b	Merge branch 'master' into master_feature_prices	2014-07-23 21:37:37 +02:00
Waleed Khan	68ac8d1a33	Fix #225: Multiples of cards are now sent to deckstats.	2014-07-23 15:21:46 -04:00
Gavin Bisesi	a50e7ba936	Merge pull request #156 from arxanas/master ... Fix #45: don't send tokens to deckstats.	2014-07-23 08:41:15 -04:00
Waleed Khan	40e97140d6	Merge remote-tracking branch 'upstream/master' ... Conflicts: cockatrice/src/carddatabase.cpp	2014-07-23 00:49:13 -04:00
Waleed Khan	2a5aa06881	Æ now actually works with the case-insensitive tags.	2014-07-22 20:58:38 -04:00
Waleed Khan	aff32e0f56	Ignore diacritics as well. ... So [card]jotun grunt[/card] works as well as [card]Jötun Grunt[/card]. Also I removed some debugging information I accidentally left in.	2014-07-20 21:20:50 -04:00
Waleed Khan	e5be082714	Merge remote-tracking branch 'upstream/master' into case-insensitive-card-tag	2014-07-20 15:06:51 -04:00
Waleed Khan	359882917a	Merge remote-tracking branch 'upstream/master' ... Some tabs to spaces, and maybe fixed to work with Qt 5. Conflicts: cockatrice/src/deckstats_interface.cpp common/decklist.cpp common/decklist.h oracle/src/oracleimporter.cpp	2014-07-20 14:40:18 -04:00
woogerboy21	021f0911c4	Merge remote-tracking branch 'upstream/master' into registered-user-only-server ... Conflicts: common/server.cpp common/server_protocolhandler.cpp servatrice/src/servatrice.cpp	2014-07-18 23:46:56 -04:00
Fabio Bas	534b223545	Merge remote-tracking branch 'upstream/master' into master_regression_180_tab	2014-07-10 19:50:38 +02:00
Fabio Bas	b5d8e7da10	Merge remote-tracking branch 'upstream/master' into master_feature_prices	2014-07-10 19:48:50 +02:00
Gavin Bisesi	f83d58309b	Merge pull request #126 from ctrlaltca/cmake_qt5 ... Qt5 support	2014-07-10 13:13:51 -04:00
Gavin Bisesi	86fa8f304d	Change client send-ping timer back to 1sec ... 9sec was causing too many timeout issues. Timeout from both client and server perspective needs to be revisited	2014-07-09 19:06:31 -04:00
Fabio Bas	ea8c55b2c9	Merge remote-tracking branch 'upstream/master' into cmake_qt5	2014-07-09 17:44:21 +02:00
Fabio Bas	a6f299b247	fix #203	2014-07-09 17:42:35 +02:00
Fabio Bas	106e9d1538	Updated for new API ... * Use the new, shortest API m= * for a card, grab prices for all sets * use the lower price for a card from all sets, but avoid prices=0 (e.g.: some M15 cards have no price yet)	2014-07-09 09:43:35 +02:00
pliu037	1a601d9509	Added better support for custom card images by prioritizing a check for card images in <Pictures path>/<CUSTOM> before all other checks.	2014-07-08 16:24:51 -04:00
Gavin Bisesi	73e5e12c24	Merge pull request #199 from arxanas/remember-game-filter-preferences ... Fix #137: Game filter preferences are saved.	2014-07-08 12:49:45 -04:00
arxanas	1217689ed6	Hash the game type.	2014-07-07 19:04:01 -04:00
arxanas	8141901679	Fix #137: Game filter preferences are saved.	2014-07-07 17:41:16 -04:00
arxanas	810029ce15	Fix #117: Card tags now match disregarding case and punctuation.	2014-07-06 20:04:09 -04:00
Fabio Bas	aead0843af	Room and Message tabs: focus input line when convenient; Fix #180 ... As suggest by Daenyth in #185	2014-07-06 14:28:48 +02:00
Fabio Bas	e9895d643f	Merge remote-tracking branch 'upstream/master' into cmake_qt5	2014-07-03 16:40:04 +02:00
Gavin Bisesi	7f77082466	Merge pull request #151 from ctrlaltca/master_input_focus ... Focus the Input line in chat when convenient (fixes #113)	2014-07-03 10:34:21 -04:00
Fabio Bas	6f18e3692d	Chat room: ensure the line input has focus when the window gets created	2014-07-03 15:57:40 +02:00
woogerboy21	00ec84db2a	Stale Comment Removal ... Removed stale commented lines from about window code.	2014-07-02 23:30:12 -04:00
woogerboy21	0a1fe7f5a8	Requested Cleanup ... Corrected tab to 4 space (per request) Moved regonly option under authentication ini location (per request)	2014-07-02 22:27:05 -04:00
woogerboy21	d246fa39fe	Registered Only Server ... Implemented the ability to set the server to only allow registered users. Also updated client to reflect the log-in rejection as well as put a check in place for the server to not start if db connection is not available yet registration is required.	2014-07-02 20:52:22 -04:00
Fabio Bas	06def7f46a	Ensure all card prices are retrieved correctly ... Query card database to get a multiverseis for a card. Get card price using that id instead of card name. Tested Aether, split cards, question elemental?, _____	2014-07-02 21:42:29 +02:00
Fabio Bas	d102733826	Added default cases to switch	2014-07-02 21:42:17 +02:00
Fabio Bas	9ca5908de5	Create an enum for price sources ... Probably settingscache would have been the correct place for the enum, but keeping it in the same class/file where price sources are defined sounds cleaner to me	2014-07-02 21:42:04 +02:00
Fabio Bas	a9ffbf5d2d	use a signal instead of calling QMetaObject::invokeMethod	2014-07-02 21:41:52 +02:00
Gavin Bisesi	fb4a7b3274	Give more friendly login error message	2014-07-01 12:04:33 -04:00
arxanas	7cbe410172	Fix #45: don't send tokens to deckstats.	2014-06-30 03:08:55 -04:00
Fabio Bas	922e98af67	Add pricing from deckbrew.com ... * the previous PriceUpdater class has become abstract * BLPPriceUpdater inherits the old code for blacklotusproject.com * DBPriceUpdater is a new implementation for deckbrew.com * add a setting to choose between the two	2014-06-29 23:33:03 +02:00
Daenyth	4d6f46b06e	Change client ping send interval to 9 sec	2014-06-29 14:46:06 -04:00
Fabio Bas	d86fa410df	Chat room: ensure focus on the input line	2014-06-29 19:32:03 +02:00
Fabio Bas	27bd00bec8	Direct chat: ensure focus is on the input line; fixes #113	2014-06-29 19:29:45 +02:00
Fabio Bas	fc24ffdec2	Cmake reorganization ... * Move all cmake-related files in a new “cmake” folder * move nsis files in there, too, since they are templates parsed by cake * retrieve git version once when cmake is run, and use it for both creating version_string.h/cpp and for package naming	2014-06-28 19:39:26 +02:00
Daenyth	09d6d26fb2	Merge branch 'master' into cmake_qt5 ... Conflicts: cockatrice/src/main.cpp	2014-06-28 09:13:10 -04:00
Daenyth	8d31fe6cbc	Clean up deck load chat message	2014-06-28 09:04:45 -04:00
Daenyth	4c2a553f03	Have servatrice inform players of sideboard size ... Ref #142	2014-06-28 00:36:43 -04:00
Daenyth	6d3fe428e7	Fix some warnings ... Ref #127	2014-06-27 22:19:23 -04:00
Daenyth	1d02e0d5ec	Clarify comment about typedef for OSX compiling	2014-06-27 20:00:29 -04:00
Fabio Bas	096f200eb9	Install libraries and plugins automatically under windows ... You won’t have to copy manually all the dlls in the release directory anymore	2014-06-27 17:40:29 +02:00
Fabio Bas	34772cccab	Compilation fix for MSVC+Qt5	2014-06-27 17:09:09 +02:00
Fabio Bas	54805fb14e	Merge remote-tracking branch 'upstream/master' into cmake_qt5	2014-06-27 15:21:01 +02:00
arxanas	080fd326ed	Fixed #131: Compiles on OS X now.	2014-06-26 16:57:47 -04:00
Daenyth	144bb7fa89	Merge remote-tracking branch 'origin/invalid-windows-paths'	2014-06-25 20:26:46 -04:00
Gavin Bisesi	fcc62a1e1f	Use defined(Q_OS_WIN) in #elif to satisfy MSVC ... It's always windows.	2014-06-25 17:09:17 -04:00
Fabio Bas	2354ed6909	Require Qt4 >=4.8.0; remove some ifdefs on qt version	2014-06-25 16:00:48 +02:00
Fabio Bas	c4458b16b2	Qt5: fix plugin installation	2014-06-25 15:53:25 +02:00
Fabio Bas	809f390e2f	Merge remote-tracking branch 'upstream/master' into cmake_qt5	2014-06-25 15:46:50 +02:00
Fabio Bas	7035150351	Deckstats: move QUrl handling into its own function; better separation of qt4/qt5 code	2014-06-25 09:07:02 +02:00
Daenyth	aee86ce45a	Mark QGraphicsItem for AbstractGraphicsItem	2014-06-25 01:53:19 -04:00
Daenyth	1c9540befa	Set cmake module path to local for findqtmobility	2014-06-25 01:48:30 -04:00
Daenyth	d811fee2f3	Include missing qdebug ... Dunno how I missed that. Fix #128	2014-06-25 00:11:55 -04:00
Gavin Bisesi	65f59747c9	Merge pull request #116 from ctrlaltca/feature-cpack ... Use cpack to create osx's dmg	2014-06-24 21:08:57 -04:00
Daenyth	df659e58fe	Mask set shortcodes for windows illegal filenames ... Ref #122	2014-06-24 20:49:03 -04:00
Fabio Bas	6dbdaafb33	Ported cockatrice	2014-06-24 19:13:47 +02:00
Fabio Bas	5c13c06982	Merge remote-tracking branch 'upstream/master' into cmake_qt5	2014-06-24 18:13:26 +02:00
Daenyth	e5d9692d78	Fall back to plain text load when xml load fails	2014-06-24 00:14:59 -04:00
Daenyth	0420f4f7af	Log download failures	2014-06-23 23:44:13 -04:00
Daenyth	e925403bc5	Log cardname when downloading	2014-06-23 22:18:40 -04:00
Daenyth	ea08fe168c	Fix Q_INTERFACES warnings ... Fix #88	2014-06-22 22:32:53 -04:00
Daenyth	e5d15e8dbc	Notify deck editor when price feature setting is changed ... Ref #112	2014-06-22 21:20:14 -04:00
Daenyth	c54f7b9245	Log on failed path copy	2014-06-22 20:14:22 -04:00
Fabio Bas	66c87a1ee6	OSX: Handle sounds for first time installations ... If the sounds path is unset in the settings and a “sounds” directory doesn’t exists in the user’s data directory, install the sounds files and set the settings value accordingly	2014-06-22 23:42:12 +02:00
Fabio Bas	0b4701c42f	OSX: Handle zonebg for first time installations ... If none of the gameboard images is set and and the user’s data directory doesn’t contain a “zonebg” directory, create the directory, copy contents from cockatrice’s app bundle and sets the config accordingly.	2014-06-22 23:42:12 +02:00
Fabio Bas	55c4c464e4	OSX: get translation path from qt.conf instead of hardcoding it	2014-06-22 23:41:15 +02:00
Fabio Bas	2eebddea9a	Port "make package" fix to oracle and servatrice	2014-06-22 23:41:15 +02:00
Fabio Bas	2a5f6181aa	Osx: removed plugins path detection and fixed translation path detection	2014-06-22 23:41:15 +02:00
Fabio Bas	b44365b73c	This finally fixes both make install and make package	2014-06-22 23:41:15 +02:00
Fabio Bas	6d1de0c617	Partially revert previous commits; ensure the bundle is fixed up correctly	2014-06-22 23:41:15 +02:00
Fabio Bas	41c7ce8022	Fix qt.conf file creation for "make package"	2014-06-22 23:41:15 +02:00
Fabio Bas	99f3519da5	Workaround permission problem in ixup_bundle ... Without this change, make install and make package would require “sudo” under osx	2014-06-22 23:41:15 +02:00
Gavin Bisesi	1260ccc531	Merge pull request #111 from Daenyth/better-invalid-db-ux ... Don't be a jerk when card database isn't usable.	2014-06-22 15:28:45 -04:00
Daenyth	68c0932a2f	Don't have decklist sort behavior rely on column order	2014-06-22 08:36:35 -04:00
Daenyth	e99c1bbe6d	Merge remote-tracking branch 'origin/master' into editor-sorting-v5	2014-06-22 08:10:22 -04:00
Daenyth	27847e1551	Don't be a jerk when card database isn't usable. ... Better error message and allow the user to still connect Ref: #102	2014-06-21 15:53:13 -04:00
Daenyth	38b83acae0	Fix #105 - remove emdash from card type when getting main type	2014-06-21 12:42:46 -04:00
Fabio Bas	d7a962c055	CMake: support fir linking against qt5	2014-06-21 14:12:55 +02:00
Daenyth	53d2b82e61	Use picUrl templates to download cards. ... Add HQ card option	2014-06-21 01:12:47 -04:00
Daenyth	8281f63134	Add settings fields for pic urls	2014-06-20 22:10:26 -04:00
Daenyth	fa52ed00a3	Merge branch 'master' into mtgjson-importer	2014-06-20 20:43:19 -04:00
Mark Morschhäuser	6fa94dd475	Qt5: toAscii() and fromAscii() Methods are deprecated	2014-06-20 16:55:26 +02:00
Mark Morschhäuser	a903c231f2	Qt5: QDesktopServices::storageLocation deprecated	2014-06-20 16:54:46 +02:00
Mark Morschhäuser	648a6a3884	Qt5: QUrl addQueryItem moved to QUrlQuery	2014-06-20 16:53:45 +02:00
Gavin Bisesi	da4c25597e	Merge pull request #61 from VanNostrand/win32 ... Windows MSVC support	2014-06-19 22:56:18 -04:00
Daenyth	3401098e63	Revert "Merge pull request #89 from dylan/master" ... This reverts commit 552a8e0c23, reversing changes made to d0f3ae6c80.	2014-06-19 22:11:20 -04:00
Mark Morschhäuser	391e480d7a	Restored MSVC linkflags after cmake update.	2014-06-18 12:11:58 +02:00
Mark Morschhäuser	929bcb55da	Fixed bug in filtertree.cpp	2014-06-18 12:10:15 +02:00
Mark Morschhäuser	8708c96695	Merge remote-tracking branch 'origin/master' into win32 ... Conflicts: cockatrice/CMakeLists.txt oracle/CMakeLists.txt	2014-06-18 12:09:32 +02:00
Gavin Bisesi	552a8e0c23	Merge pull request #89 from dylan/master ... Added new app icons, SVG icon not replaced however...	2014-06-17 19:48:12 -04:00
Fabio Bas	f3a57d5506	Import data from mtgjson's allsets.xml ... * add multiverse id to cards.xml * remove pictures urls from cards.xml TBD: * fix/clean oracle’s gui * add support in cockatrice	2014-06-16 00:27:33 +02:00
Daenyth	b749ddbc45	Add the ability to friend/ignore an offline user	2014-06-15 14:59:54 -04:00
Fabio Bas	dd768ba7bd	OSX: Move translations inside app bundle ... Additional: remove duplicate if(linux) and merge rules together	2014-06-12 23:42:20 +02:00
Fabio Bas	eca318c34d	Make install paths relative to prepare for CPack	2014-06-12 23:29:42 +02:00
Fabio Bas	721cf6fe4f	Re-indent CMakeLists.txt using spaces	2014-06-11 18:08:30 +02:00
Fabio Bas	62f756e698	Remove pthread detection and linking: it's unused	2014-06-11 01:20:19 +02:00
Fabio Bas	0dd6567583	cockatrice's CMakeLists.txt: major overhaul ... * Remove cockatrice_HEADERS (obsoleted by automoc) * Remove compilation flags definition and Qt4 finding calls * Make use of CMAKE_INSTALL_PREFIX * use INSTALL(TARGETS) in place of INSTALL(PROGRAM) * Osx: create a proper application bundle * Added comments	2014-06-10 23:32:52 +02:00
Fabio Bas	84503483eb	Added missing ifdefs around keysignals.h	2014-06-10 23:25:59 +02:00
Fabio Bas	39e2bf06f5	Merge branch 'master' into cmake-overhaul	2014-06-10 23:11:31 +02:00
Fabio Bas	20b9a538fa	Split PendingCommand 's implementation to its own cpp to permit automoc	2014-06-10 22:33:21 +02:00
Gavin Bisesi	50ac14e8ff	Merge pull request #82 from ctrlaltca/osx-compilation-fix ... Fix compiling on OSX	2014-06-10 14:06:23 -04:00
ctrlaltca	e2d17e983f	Restored whitespaces in CMakeLists.txt	2014-06-10 20:05:24 +02:00
Gavin Bisesi	2b7d5d0ef2	Merge pull request #47 from sylvan-basilisk/editor-redesign ... addition of advanced filtering features in deck editor	2014-06-10 10:37:35 -04:00
Fabio Bas	4fc6831784	Avoid using gcc-specific flags on not-gnu compilers	2014-06-10 11:42:41 +02:00
sylvanbasilisk	841847cda4	update to hotkey settings in deck editor tab ... removed LEFT/RIGHT increment/decrement while the card database/quicksearch edit have focus. LEFT/RIGHT increment/decrement remains while the deck view has focus. also, now the card database delegates focus the quicksearch editor so that any characters typed while the card database has focus will narrow the search down using the quicksearch filter. `control`+`alt`+`-`/`=` now increment/decrement the mainboard and `control`+`alt`+`[`/`]` now increment/decrement the sideboard (alt could not be used alone as OSX inserts special characters using alt.	2014-04-24 20:17:21 +00:00
sylvanbasilisk	040d9d15a3	bug fix: move isEnabled test out of acceptCardAttr ... in the case of AND'ed filter terms, returning true from acceptCardAttr will be equivalent to ignoring the disabled term, but in the case of OR'ed terms, returning true will incorrectly cause all cards to be accepted. the fix is to test for whether the term is enabled before calling acceptCardAttr and continue if disabled.	2014-04-24 19:49:50 +00:00
sylvanbasilisk	cd4d04be3e	change tabs into 4 spaces in new files	2014-03-25 02:29:45 +00:00
sylvanbasilisk	0770626270	Merge branch 'master' into editor-redesign ... Conflicts: cockatrice/src/carddatabasemodel.cpp cockatrice/src/carddatabasemodel.h cockatrice/src/decklistmodel.cpp cockatrice/src/decklistmodel.h cockatrice/src/tab_deck_editor.cpp cockatrice/src/tab_deck_editor.h	2014-03-25 02:10:52 +00:00
sylvanbasilisk	748aac7ee8	whitespace modifications in preparation for merge	2014-03-25 01:13:41 +00:00
sylvanbasilisk	378cc91c17	delete debug printf statements ... this should fix the compilation issue mentioned by mattkelly	2014-03-25 00:07:58 +00:00
sylvanbasilisk	610f0b6f6f	make sure filtertree stuff translates ... The logic types and attribute names were not previously being translated by the tr(...) function.	2014-03-24 23:52:30 +00:00
sylvanbasilisk	2b7ea0c983	refactored deck editor UI key shortcuts ... The global shortcuts were removed in favor of key events which are only triggered when a widget has focus. This is necessary to allow different widgets to react differently to the 'enter' key. The current key configuration is: search edit focused: * left/right: decrease/increase card count for selected database card * enter: add selected card to deck * ctrl-enter: add selected card to deck sideboard * ctrl-left/right: decrease/increase card count in sideboard for selected card database focused: the same as with search edit. deckview focused: * left/right: decrease/increase card count for selected deckview card * enter: increase count for selected deckview card * delete/backspace: delete selected card from deck	2014-03-24 21:03:26 +00:00
Mark Morschhäuser	d968f04b02	Improved file handling from commit e33debcb.	2014-03-18 12:10:46 +01:00
Matt Kelly	082ab73152	Add Tab shortcut for next phase	2014-03-13 01:08:49 -04:00
Mark Morschhäuser	e2615a0ff0	Fixed warning C4018 <,> signed/unsigned mismatch	2014-03-12 09:34:25 +01:00
Mark Morschhäuser	7c606af63e	Fixed warning regarding virtual function overrides. Using C++ standard. ... See http://msdn.microsoft.com/en-us/library/bb384874(v=vs.90).aspx	2014-03-12 09:11:01 +01:00
Mark Morschhäuser	a7c957dfca	Fixed CMake files for MSVC++ linker.	2014-03-11 17:15:51 +01:00
Mark Morschhäuser	32ad8ed24c	Fixed MSVC++ compile error due to sqrt() usage.	2014-03-11 16:57:54 +01:00
Mark Morschhäuser	80da61dcbb	Fix MSVC++ compile error caused by missing round() in math.h	2014-03-11 16:10:55 +01:00
Mark Morschhäuser	6e9f81461a	Fixed VC++ 'M_PI' : undeclared identifier error.	2014-03-11 15:19:29 +01:00
Mark Morschhäuser	49227ad44c	Fixed VC "'*/' found outside of comment" warning.	2014-03-11 15:04:26 +01:00
Mark Morschhäuser	e33debcbff	Changed C to Qt file handling. VC warns because fopen may be unsafe.	2014-03-11 15:02:15 +01:00
Buce	401b34d22c	Clean up DecklistModel::addCard() ... Split common functionality out of the if-else block.	2014-02-28 15:45:29 -06:00
Buce	875df01424	Fix GUI glitches when adding cards to a deck ... Since we no longer sort on just card names, we need to emit updates for the parent of the card we add.	2014-02-28 15:44:46 -06:00
Buce	b32374b453	Sort correctly when adding cards	2014-02-28 15:43:43 -06:00
Buce	6a5f2d2476	Allow sorting on different columns	2014-02-28 15:41:29 -06:00
Matt Kelly	1bc48a7849	Convert rest of source to 4-space indent	2014-02-11 11:14:19 -05:00
Matt Kelly	a171df744d	Convert to 4-space indents	2014-02-11 10:47:51 -05:00
Matt Kelly	96ec49936e	Resolve all compiler warnings	2014-02-11 01:52:06 -05:00
sylvanbasilisk	f6e9676c75	revert cardinfowidget to its original content ... reverted cardinfowidget to its original form at commit 95c6058dc3 before i messed with it. i didnt intend to make changes to it.	2014-01-29 07:15:44 +00:00
sylvanbasilisk	f77054f20d	refactor cardframe as a parent of a text card frame and a picture card frame ... cardframe is now a stacked widget that prefers to show the card picture only so that the screen can be more space efficient and the card pixel map can be displayed as a larger size. however if the card pixel map can not be loaded for some reason, the cardframe class will automatically switch to the text version of the card. a menu item was added under the database menu to allow for users to prefer card text only.	2014-01-29 00:19:34 +00:00
sylvanbasilisk	5d223b5917	clear the filter term text edit box appropriately ... clear the text box when the '+' button is pressed or when the filter attribute is changed. also changed the frame style to match the card frame style.	2014-01-28 23:51:18 +00:00
sylvanbasilisk	c786e180c3	reverted back to original deck editor layout but including filtertree ... the original layout is actually more space efficient if using CardFrame instead of CardInfoWidget and reducing the size of the deck editor toolbar. this commit also removes the old search feature by removing the search button and the clear search button. the clear search menu item is left in place, however it now clears the filtertree. finally, the stretch factor for the right frame in the main layout was reduced to zero so that the card database gets priority for extra space. this makes more sense because the deck editor does not actually need very much horizontal space.	2014-01-26 23:20:35 +00:00
sylvanbasilisk	16d30fb9e1	miscellaneous code cleanup ... renamed filter list modules to filter tree to more accurately reflect the nature of the data structure.	2014-01-22 20:52:52 +00:00
sylvanbasilisk	083005b8a9	implemented filter list enable/disable functionality ... also refactored much of the filter list code to be much cleaner and modular.	2014-01-22 08:32:00 +00:00
sylvanbasilisk	3202243ed0	connect filter list functionality to the CardDatabaseDisplayModel class ... enable/disable check boxes still not functional	2014-01-21 23:37:22 +00:00
arxanas	629668d7c0	Fix #34 ... This is @mcallahan's patch — see #35. I had to apply this diff by hand, because both `git` and `patch` refused to apply it and I didn't know how to resolve that. Consequently, there might be an error.	2014-01-17 20:30:06 -05:00
sylvanbasilisk	863e437d4c	added filter builder widget and filter tree ... filter builder takes filter options from user, then adds completed filters to the filter tree. the filter tree does not currently do anything. in the future it will filter the cards in the database view.	2014-01-17 10:06:45 +00:00
jfreake	67c4d089be	Deck Load Mods and Movable Tabs ... Changes: Deck Load - Default to all types *.* Decklist - Strip "|edition" from .dec formats that include a pipe and the edition after the card name Tab_Supervisor - Make tabs movable (able to rearrange tabs)	2014-01-08 11:54:02 -04:00
sylvanbasilisk	0b2231639f	initial experiment with editor layout	2014-01-05 09:47:50 +00:00
arxanas	b1af4237e7	Added setting to enable/disable notifications ... When something happens, the taskbar icon lights up/the dock icon bounces. This can be annoying, so here is a setting to disable that.	2013-12-06 21:04:00 -05:00
Daenyth	92ff503832	Merge pull request #7 from skoh-fley/play-to-stack-option ... Added a UI option to play all nonlands to the stack instead of the battlefield	2013-07-11 10:58:55 -07:00
Daenyth	db43a0609b	Merge branch 'master' of github.com:Daenyth/Cockatrice	2013-07-11 13:51:18 -04:00
Frederik Holden	c0fdbb2cca	Fix two bugs in the price tag feature ... "The price tag feature currently has two bugs. 1. The final price that a card ends up with is the one in the last set alphabetically, instead of the one from the set with the lowest price. 2. Black Lotus Project sometimes gets in prices for cards from Masters Edition, for some reason. This set only exists in Magic the Gathering: Online, i.e., not physically, and should not be considered. This might be considered a BLP bug and not a Cockatrice bug. This patch fixes those two bugs. I also changed the price value to be based on BLP's "price" value instead of the "average" value. Seems more logical." Signed-off-by: Daenyth <Daenyth+git@gmail.com>	2013-07-11 13:50:31 -04:00
Daenyth	6d69fe728a	Merge pull request #19 from VanNostrand/documentation ... Documentation-Branch v2	2013-05-15 13:13:35 -07:00
Mark Morschhäuser	562de0553f	Fixed compile warnings due to missing \n at EOF.	2013-05-15 21:31:47 +02:00
Daenyth	8ba6424e0d	Merge pull request #17 from VanNostrand/compilewarnings ... Compilewarnings	2013-05-11 11:34:27 -07:00
Mark Morschhäuser	0022425687	Fixed implicit conversions from double to int warnings regarding ... QPainter.drawRect()	2013-05-11 17:41:11 +02:00
Daenyth	a5ee926862	Merge pull request #14 from VanNostrand/smallfix ... Changed default server to woogerworks	2013-05-08 15:53:00 -07:00