Matt Lowe
9a36ac8035
Added colored storm counter
2015-04-19 18:14:29 +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
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