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

2543 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach
5117c0e6c9 Merge pull request #956 from poixen/unreg_usernames 
Restricted unreg usernames
 2015-04-12 19:02:31 -04:00
poixen
a2f416bb51 Merge pull request #959 from poixen/server_command_limit 
Server was using message limit for commands
 2015-04-13 00:32:25 +02: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
b9cda5e36e Updated ini 2015-04-12 23:01:29 +02:00
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
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
poixen
2d2d038475 Merge pull request #953 from poixen/message_count 
Updated message limit from 10 -> 15
 2015-04-12 21:35:45 +02:00
Matt Lowe
70ef95931e Restricted unreg usernames 
Can now only be made up of [a-z][A-Z][0-9][-_]
 2015-04-12 21:29:40 +02:00
Matt Lowe
8e61fb0bae Updated message limit from 10 -> 15 
I have updated the `maxMessageCountPerInterval` from 10 to 15. This will
allow some faster play from exp users.

NOTE:
If you have an existing server and update to this version, you will need
to manually change the value in the ini file, or have no ini file to
begin with. Otherwise the old ini will load in 10.
 2015-04-12 19:01:16 +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
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
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
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