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

2356 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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