Commit graph

1609 commits

Author SHA1 Message Date
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