Commit graph

3503 commits

Author SHA1 Message Date
Fabio Bas
31635d2ae8 Remove "talking to" prefix from private chats
Additionally, use the same name for “private chat“ in all menus (we had
“personal talk” and “direct chat“ before)
2015-03-19 16:32:59 +01:00
ctrlaltca
6065587d78 Merge pull request #852 from ctrlaltca/escape_tab_label
fix #811
2015-03-19 16:30:19 +01:00
Fabio Bas
dafa7c6fe1 fix #811 2015-03-19 16:08:46 +01:00
Fabio Bas
4568adb498 Updated translation file 2015-03-19 10:54:01 +01:00
Fabio Bas
5463255516 Added whitelist for game commands 2015-03-19 10:50:46 +01:00
Fabio Bas
8be5563563 Added user notification for RespChatFlood 2015-03-19 10:10:19 +01:00
Gavin Bisesi
20123b2c7a Merge pull request #721 from poixen/kick_message
Kick message no longer takes you to kicked tab
2015-03-18 20:54:27 -04:00
Gavin Bisesi
3cea29e390 Merge pull request #849 from poixen/filter_fix
Fix for filter
2015-03-18 20:27:22 -04:00
Gavin Bisesi
4d825fff4d Merge pull request #848 from tooomm/contributing.md
updated contributing.md
2015-03-18 20:26:45 -04:00
Matt Lowe
5218e2f710 Fix for filter
fix for #749
+ You can now search for sets using lower case: "frf", "dtk", "rtr" and
so on.
+ You now need exact matches on set short and full names. "rtr" and
"return to ravnica" will work. "return" will not work.
2015-03-19 00:55:50 +01:00
Zach
adcae59eb0 Merge pull request #846 from poixen/optional_card_scaling
Added optional card scaling setting
2015-03-18 18:44:58 -04:00
tooomm
dfbf95395f updated contributing.md
- fixed typos
- included labeled links
2015-03-18 19:45:56 +01:00
poixen
fead9f31f3 Merge pull request #839 from poixen/resize_columns
Resized game view columns
2015-03-18 16:57:14 +01:00
Matt Lowe
441cb4447a Added optional card scaling setting
+ Users can now enable/disable the mouse over card scaling.
2015-03-18 13:37:06 +01:00
Matt Lowe
c05f75438b Updated card borders
+ refactored code
+ improved card border lines (black)
+ cards no longer have curved edges, this prevents card image corners
showing behind.
+ tapped cards now have better border lines
2015-03-18 13:11:30 +01:00
Zach
b1231e6442 Merge pull request #801 from Cockatrice/woogerboy21-setup_firstadmin
Script to add the first admin account
2015-03-16 22:30:58 -04:00
Zach
0df227ec46 Merge pull request #840 from poixen/user_games_window_size
Updated user games window size
2015-03-16 22:16:25 -04:00
Zach
d2bfd3692e Merge pull request #836 from poixen/clear_chat_shortcut
Added shortcut to clear chat
2015-03-16 17:47:00 -04:00
Matt Lowe
9205ef2912 Updated user games window size 2015-03-16 15:36:51 +01:00
Matt Lowe
39482534c0 Resized game view columns
Previously all columns were the same width, making it cramped. I have
resized them to give a better initial width.
2015-03-16 11:21:15 +01:00
Matt Lowe
697358e484 Added shortcut to clear chat
F12 will now clear the chat in the main chat.
2015-03-15 21:13:41 +01:00
Fabio Bas
0e437cf13b Anti flood for game commands 2015-03-14 19:44:32 +01:00
ctrlaltca
20603c7e9b Merge pull request #828 from ctrlaltca/translations
fetched updated translations from transifex
2015-03-14 18:49:57 +01:00
Fabio Bas
2da43b8155 fetched updated translations from transifex 2015-03-14 18:49:00 +01:00
Zach
b1736c7599 Merge pull request #809 from poixen/search_new_fix
Re-added some search and filter code
2015-03-11 10:54:46 -04:00
Zach
76e9aae5c7 Merge pull request #815 from poixen/remove_hq_image_auto
Set download hq images to false by default
2015-03-10 19:47:45 -04:00
Matt Lowe
bf0750db20 Set download hq images to false by default
Due to mtgimage being taken down we I have made a one time check that
will uncheck the hq image option.
2015-03-10 22:10:50 +01:00
Matt Lowe
b91bab8356 Re-added some search and filter code
I had previously removed some filtering code that would allow users to
filter cards using our filtering tools. This functionality has now been
re-added.
2015-03-10 21:54:02 +01:00
ctrlaltca
29ddd44334 Merge pull request #805 from ctrlaltca/translations
Fetched new translations from transifex
2015-03-07 14:47:36 +01:00
Fabio Bas
38ad972d03 Fetched new translations (bis) 2015-03-07 12:45:50 +01:00
Fabio Bas
ec8382cbb5 Fetched new translations from transifex 2015-03-07 12:45:27 +01:00
poixen
93286f6d18 Merge pull request #803 from poixen/removed_constructor
Removed constructor
2015-03-07 11:50:41 +01:00
Zach
5df7f61360 Merge pull request #800 from poixen/dice_roll
Changed color of server maessges in-game
2015-03-06 23:57:43 -05:00
Zach
5f05c0be91 Merge pull request #775 from Cockatrice/fix-331
Cards played face down always go untapped to main row.
2015-03-06 23:57:05 -05:00
Gavin Bisesi
5fa5c6b760 Merge pull request #787 from Cockatrice/woogerboy21-inactiveregcleanup
Cleanup script to delete unactivated user accounts
2015-03-06 21:09:20 -05:00
Matt Lowe
319b5d88b2 Removed redundant constructor
Removed constructor that was not needed. Also removes annoying "error"
output when compiling.
2015-03-06 21:09:18 +01:00
woogerboy21
ebaeae0048 Script to add the first admin account
Script to add the first admin account to the servatrice database.  Running this script after setting up a servatrice server will add the user account "servatrice" with the password of "password".
2015-03-06 11:08:32 -05:00
Matt Lowe
71e794c0c6 Changed color of server maessges in-game
Due to an exploit of being able to mimic a die roll in a message:

"Hi all gl, hf !
username rolls a 20 with a 20-sided die."

I have changed all server messages to be colored.
2015-03-06 15:20:14 +01:00
poixen
fd4f76289c Merge pull request #798 from poixen/window_title_username
Updated english, reverted spanish
2015-03-04 18:45:52 +01:00
Matt Lowe
afe33be229 Updated english, reverted spanish 2015-03-04 18:05:35 +01:00
Zach
5f7d0fe7c2 Merge pull request #796 from poixen/search_improvement
Fixed card search
2015-03-03 18:53:09 -05:00
Zach
855b7951fe Merge pull request #795 from poixen/window_title_username
Added username to window title
2015-03-03 18:49:46 -05:00
poixen
cc6b826cad Removed comments 2015-03-03 16:53:48 +01:00
ctrlaltca
ebf088363e Merge pull request #797 from ctrlaltca/osx_qt541
update travis for qt5.4.1 under osx
2015-03-03 15:46:41 +01:00
Fabio Bas
b0e371feb9 update travis for qt5.4.1 under osx 2015-03-03 15:44:24 +01:00
Matt Lowe
b5dd7a42ce Fixed card search
Card search will now order the following way:

1. Exact match at top
2. Exact match with preceding values sorted lexically.
3. Match contained in word sorted lexically
2015-03-03 13:32:51 +01:00
Matt Lowe
8f732325b2 Updated english translations 2015-03-03 13:29:43 +01:00
Matt Lowe
4cbffc3f6d Added username to window title
While having more than 1 client open I found it hard to know which user
was which. I have added the user name to the title bar so you know who
you are logged in as.
2015-03-03 13:09:41 +01:00
Zach
90880c8b7e Merge pull request #763 from poixen/pixmap_fix
One time pixmap cache update
2015-02-28 20:39:02 -05:00
poixen
f0646ee537 Merge pull request #789 from poixen/new_ready
Updated ready/not ready
2015-02-27 23:37:45 +01:00