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

1273 commits

Author SHA1 Message Date
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
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
Matt Lowe
44d4a534bf Added () for || && logic handling 2015-04-10 13:31:44 +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
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