aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2609 commits 1 branch 0 tags 51 MiB
Commit graph

1667 commits

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