Commit graph

2543 commits

Author SHA1 Message Date
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
poixen
8ce5c5a276 Merge pull request #847 from poixen/pm_toolbar_alert
Desktop Notifications
2015-03-26 20:22:29 +01:00
Matt Lowe
81a8141fe5 Added system tray icon
+ Can be used for setting client size and closing the client.

Will expand on by sending client alerts to the tray.

Updated to push message notifactions to the toolbar

Preview image:

Added setting to enable/disable message popups

Added functionality

+ updated popup message and translation
+ Double clicking tray icon will now bring up the app/minimize it
+ can now be alerted of mentions
+ added setting to set if you want mentions on desktop
+ clicking mention message will take you to the main chat
+ added translations for icon menu
+ removed maximize/minimize/restore from menu, not needed.

Added disconnect

+ Disconnects any previous message slots/signals from the system icon
message bubble
2015-03-26 18:37:57 +01:00
poixen
b2e032b365 Merge pull request #860 from poixen/italic_card_names
Updated chatview texts
2015-03-26 18:35:43 +01:00
poixen
cd9f4e9856 Merge pull request #845 from poixen/card_boarder
Updated card borders
2015-03-26 17:48:44 +01:00
Matt Lowe
686b215910 Updated settings chat settings cog
+ Cog was grey and always looked like it was inactive.
2015-03-26 15:40:09 +01:00
ctrlaltca
719e625cd5 Merge pull request #877 from ctrlaltca/translations
Fetch updated translations from transifex
2015-03-26 15:17:03 +01:00
Fabio Bas
c3e5679604 Fetch updated translations from transifex 2015-03-26 15:13:57 +01:00
Matt Lowe
e0839db648 Updated chatview texts
This is enforcing a new client wide color scheme.
RULES
+ Green = Major server message (Welcome to chat room, change phase...)
+ Red = Minor server message (timestamps, game actions...)
+ Blue = Key word
+ Blue with modifier (underline/italics) = Keyword that can be
interacted with.
+ Black = User text

+ key numbers are now blue. player drew X cards, looks at the top X
cards, places X counters on . . . and so on.
+ card names are now italic (different from urls now)

I did have the player names set to blue also, but it felt like too much.

Player names in phase change are blue

Updates

+ Updated username colors in phases to match other areas of client

Small update

+ Made server message in chat room bold
+ made User names in chat/pm match the weight of in-game (consistancy)
2015-03-25 13:16:22 +01:00
Gavin Bisesi
98c92733ac Merge pull request #871 from tooomm/readme-ts
readme - match new ts handling
2015-03-23 19:26:48 -04:00
tooomm
36558388c5 adjust to match new ts handling /2 2015-03-24 00:24:28 +01:00
tooomm
9e93fe77ca adjust to match new ts handling 2015-03-23 21:04:54 +01:00
Fabio Bas
4cd98483ba Reworked a bit mentions/tags support in chat view; fix #791 2015-03-23 00:03:31 +01:00
ctrlaltca
88b242b34d Merge pull request #829 from ctrlaltca/antiflood
Anti flood for game commands; fix #753
2015-03-22 22:08:25 +01:00
Fabio Bas
7c2db752a5 Revert "Updated translation file"
This reverts commit 4568adb498.
2015-03-22 21:51:38 +01:00
Gavin Bisesi
16f4e00486 Merge pull request #866 from Cockatrice/fix-#681
Update translations bits in CONTRIBUTING.md; fix #861
2015-03-22 09:19:14 -04:00
ctrlaltca
09778535e8 Update CONTRIBUTING.md 2015-03-21 22:26:10 +01:00
Gavin Bisesi
b96604d85d Merge pull request #854 from ctrlaltca/pvtmsg_tab_name
Private Chat Tab Update
2015-03-21 08:54:59 -04:00
ctrlaltca
894a4316d3 Merge pull request #864 from tooomm/cleanup-git-links
Cleanup git links
2015-03-20 14:48:15 +01:00
tooomm
e0d0b0dae4 updated git links 2015-03-20 14:01:06 +01:00
tooomm
d8fb99908e removed one slash 2015-03-20 13:12:09 +01:00
tooomm
99a5a04373 updated git links 2015-03-20 13:10:41 +01:00
Fabio Bas
1f33e34d8f Add tooltips to tabs 2015-03-19 16:43:27 +01:00
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