Commit graph

2429 commits

Author SHA1 Message Date
Matt Lowe
f46d68b5c6 Server was using message limit for commands
Server was using getMaxMessageCountPerInterval over
getMaxCommandCountPerInterval.

Raised command limit from 10 to 20
2015-04-12 22:55:38 +02:00
poixen
1e06a971fa Merge pull request #951 from poixen/zone_view_crash_fix
Zone crash fix
2015-04-12 17:57:54 +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
Gavin Bisesi
dddaec1344 Merge pull request #948 from ctrlaltca/fix_947
fix #947 : typo in servatrice install path under linux
2015-04-11 12:45:04 -04:00
Fabio Bas
7bbb5dec52 fix #947 2015-04-11 15:19:16 +02:00
poixen
177c1b2f6a Merge pull request #945 from poixen/chat_lag_fix
Fixed main chat room lag
2015-04-11 01:37:14 +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
Zach
2a86cf572b Merge pull request #939 from poixen/pt_fix
Creatures can now have power less than -1
2015-04-10 16:10:35 -04:00
poixen
fbb7194a10 Merge pull request #942 from poixen/logic_order
Added () for || && logic handling
2015-04-10 15:01:28 +02:00
ctrlaltca
273f36ab63 Merge pull request #943 from ctrlaltca/translations
Fetch updated translations from transifex
2015-04-10 13:37:17 +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
ctrlaltca
1b30b2e4ce Merge pull request #941 from ctrlaltca/translations
extract new strings
2015-04-10 13:30:28 +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
Matt Lowe
be2a5f4720 Creatures can now have power less than -1
Addresses issue from #934
2015-04-10 12:39:41 +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
1fd75f4c52 Merge pull request #925 from tooomm/oracle_icons
oracle icon updates
2015-04-10 10:35:02 +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
Zach
ef09f45c57 Merge pull request #935 from poixen/menu_sep
added separator
2015-04-09 20:37:11 -04: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
ctrlaltca
7ea755ab5a Merge pull request #930 from poixen/server_timeout_dlg
👍
2015-04-08 21:26:22 +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
ctrlaltca
0b4b8e85e8 Merge pull request #928 from ctrlaltca/optimize_loop
Optimize loop; refers #910
2015-04-08 12:53:27 +02:00
ctrlaltca
c04055a44c Merge pull request #927 from pepi55/servatrice-warnings
Removed NULL conversion warnings caused by #926
2015-04-08 12:53:11 +02:00
Fabio Bas
8f3421204e Optimize loop; refers #910 2015-04-08 12:52:02 +02:00
pepi
05424a4c0e Removed NULL conversion warnings caused by #926 2015-04-08 10:36:33 +00:00
ctrlaltca
869d89dfdd Merge pull request #926 from pepi55/servatrice-warnings
Removed compile time ssize_t warnings
2015-04-08 12:01:44 +02:00
pepi
e136c11b65 Removed compile time ssize_t warnings 2015-04-08 09:39:32 +00: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
Zach
81e4e089d4 Merge pull request #921 from poixen/more_server_whitelist
Added more actions to server white list
2015-04-07 23:57:08 -04:00
tooomm
b8219ca82b oracle icon updates
- ico for win
- icns for mac
both now with several resolutions inside and high res support

mac version even included old+different logo
2015-04-08 01:23:20 +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
Matt Lowe
7680154395 Added more actions to server white list
I have added card moving to the white list. I was getting flood messages
when moving cards quickly in my side deck.
2015-04-07 21:49:49 +02:00
poixen
c07ec9aa23 Merge pull request #917 from Cockatrice/revert-721-kick_message
Revert "Kick message no longer takes you to kicked tab"
2015-04-07 16:21:38 +02:00
poixen
89bce3d649 Revert "Kick message no longer takes you to kicked tab" 2015-04-07 15:55:11 +02:00
Zach
6e2ea1e15b Merge pull request #912 from poixen/mention_popup_fix
Mention popup fix
2015-04-05 17:31:14 -04: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