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

2475 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
poixen
a84418bb91 Merge pull request #902 from poixen/default_one_player 
Default to one player
 2015-04-02 17:39:33 +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
bc8d9427e3 Merge pull request #899 from poixen/mull_flood 
Added Mull to the server whitelist
 2015-04-01 18:15:44 -04:00
Zach
e40a79d931 Merge pull request #900 from ctrlaltca/fix_884 
Reinstates hidden cards being hidden; fix #884
 2015-04-01 18:15:28 -04:00
Fabio Bas
dcc6677e8f fix #884 2015-04-01 23:04:10 +02:00
Matt Lowe
c039a3aa42 Added Mull to the whitelist 
Mullling through 2 hands will give a flood warning, a user thought this
should not happen. It is very similar to drawing cards, which is in the
white list.
 2015-04-01 22:08:46 +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
Zach
6c35253bcc Merge pull request #898 from poixen/sb_clean_lines 
Refactored code and made lines cleaner
 2015-04-01 15:52:58 -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
Zach
60757af5dc Merge pull request #896 from poixen/swap_life_order 
Fixed order of the counters
 2015-03-31 22:41:41 -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
11d1d22da5 Merge pull request #894 from ZeldaZach/fix_double_popup 
Fix double popup on delete pics
 2015-03-30 17:27:26 -04:00
Zach
a57ce5b337 Merge pull request #892 from ctrlaltca/fix_669 
Set cmc to 0 if not set; fix #669
 2015-03-30 17:08:55 -04:00
Zach H
2aadf09347 fix double popup on delete pics 2015-03-30 16:55:57 -04:00
ctrlaltca
83274f9855 Merge pull request #893 from ctrlaltca/startup_fixes 
Misc Startup fixes
 2015-03-30 18:03:34 +02: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
Fabio Bas
62d0a61717 Set cmc to 0 if not set; fix #669 2015-03-30 11:56:08 +02:00
Gavin Bisesi
0e3711723d Merge pull request #890 from ctrlaltca/fix_633 
Fix 633
 2015-03-29 16:45:19 -04:00
Gavin Bisesi
19cdc65cd8 Merge pull request #889 from ctrlaltca/fix_670 
Fix #670
 2015-03-29 16:43:39 -04:00
Fabio Bas
28ec1a7186 Fix #633 
Requires #889
 2015-03-29 18:55:15 +02:00
Fabio Bas
48d588f6cd Fix #670 
Additionally, remove an unneeded split() + join() call on every card
text
 2015-03-29 17:48:59 +02:00
Gavin Bisesi
49c1eec345 Merge pull request #886 from ctrlaltca/serverdeck 
fix server deck storage; fix #744
 2015-03-29 09:05:24 -04: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
a4cf7a71e3 fix server deck storage; fix #744 2015-03-27 15:47:38 +01:00
ctrlaltca
89d08693a6 Merge pull request #885 from ctrlaltca/translations 
extracted new strings
 2015-03-27 13:37:06 +01: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
Zach
1e3bbca40b Merge pull request #880 from poixen/remove_tm_material 
Removed icon
 2015-03-26 18:23:40 -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