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

1558 commits

Author SHA1 Message Date
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
Matt Lowe
a873a4efa4 Fixed accidental +/- of counters 
Previously if you middle click on a counter (life/mana) and then click
away, depending on the button clicked, the counter would +/-.

I have added a fix to make sure the mouse is over the counter to change
it.
 2015-03-31 23:07:24 +02: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 H
2aadf09347 fix double popup on delete pics 2015-03-30 16:55:57 -04: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
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
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
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
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
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
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
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
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
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
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
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
0df227ec46 Merge pull request #840 from poixen/user_games_window_size 
Updated user games window size
 2015-03-16 22:16:25 -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
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
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
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
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
poixen
cc6b826cad Removed comments 2015-03-03 16:53:48 +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
Matt Lowe
9cea8e0229 Added faint black line, tilted tick more 2015-02-27 00:00:49 +01:00
Matt Lowe
e4f8a499f4 Updated ready/not ready 2015-02-26 23:26:36 +01:00
Zach
b0fe2ef9d3 Merge pull request #772 from ctrlaltca/trice_saveonclose_2ndtry 
cockatrice: ask to save modified decks on close; fix #759
 2015-02-25 17:09:53 -05:00
Fabio Bas
061fd5a830 Workaround for duplicated dialogs on close 2015-02-25 18:32:33 +01:00
Jaeic Lee
e6bf3b783c Updating source language file 2015-02-24 11:37:30 +09:00
Fabio Bas
def4d50e97 Fetched new translations from transifex 2015-02-23 22:40:07 +01:00
Fabio Bas
a7b8934a1b Fix remaining issues 2015-02-22 20:02:58 +01:00
Gavin Bisesi
a984a9ea69 Merge pull request #773 from ctrlaltca/fix_754 
Clamp the zoneviewwidget's topleft point to the scene view area; fix #754
 2015-02-22 06:16:39 -05:00
Gavin Bises
e423fb2a39 Readability tweak 2015-02-21 21:31:17 -05:00
Gavin Bises
779a400de4 Fix #331 2015-02-21 15:18:32 -05:00
Zach
66678e95dc Merge pull request #765 from Cockatrice/no-spec-alerts 
Game events do not notify taskbar while spectating.
 2015-02-21 13:32:09 -05:00
Fabio Bas
b9f0212c9b Clamp the zoneviewwidget's topleft point to the scene view area; fix #754 2015-02-21 16:43:38 +01:00
Fabio Bas
399d4bf516 cockatrice: ask to save modified decks on close; fix #759 2015-02-21 15:21:26 +01:00
Gavin Bises
5ff6693c9c Fix #632. Url and mentions work together 2015-02-21 08:13:59 -05:00
Gavin Bises
5fc28e31a6 Disable spec notification toggle if notifications are off on dlg create 2015-02-20 21:36:18 -05:00
Gavin Bises
1562c234ca Add spec notification toggle to UI settings. 2015-02-20 20:57:22 -05:00
Gavin Bises
11bd2444d8 Do not alert the application for game events when spectating. 
Add a configuration toggle to enable alerts when spectating.

Default behavior is to not alert.
 2015-02-20 20:29:36 -05:00
Matt Lowe
6a91f3a976 Added hq image to check 2015-02-20 21:50:16 +01:00
Matt Lowe
c5bc3ea4dd One time pixmap cache update 
Code will now perform a one time check on starting to see if the cache
has been updated to the new 2048 default. If the update has not been set
we update. After this time if the user lowers the level, it will not
reset back to 2048 by default.
 2015-02-20 21:43:02 +01:00
Gavin Bisesi
06e5327595 Merge pull request #748 from kaiserfro/jo-full-word-card-color-filter 
Add full and short name for card color filters.
 2015-02-19 20:44:29 -05:00
Gavin Bisesi
648c5c488b Merge pull request #751 from ctrlaltca/img_loading 
Avoid loading the same card's picture twice; Fix #745
 2015-02-19 20:44:00 -05:00
Gavin Bisesi
9d9ffd8a9a Merge pull request #760 from poixen/updated_spec_svg 
Updated spectator eye image
 2015-02-19 20:43:50 -05:00
Matt Lowe
f28a8b5ad1 Updated player fighting svg 
+ Changed to be black
+ Made a little thicker
 2015-02-19 18:09:38 +01:00
Matt Lowe
1b8c1ab9cd Updated image 
Bolder outline
More defined shape
 2015-02-19 17:35:12 +01:00
Matt Lowe
28aed657b3 Fixed 5+ hour issue for new games 
The problem was converting a negative int to an unsigned int. This was
resulting in a value of: (2^32) - n. Meaning that the room age was
extreamly old. After 48s the delay from the server will catch up and the
time diff will be 0 rather than negative, which is why after 48s the
room will change from 5+ hours to <1 min.
 2015-02-19 12:45:33 +01:00
Fabio Bas
70b047adcb Fix #745 2015-02-16 21:25:56 +01:00
Jeffrey Oliver
8c187eff1b Use qstring replace. 
Iterate through the filter to see if everything matches the card.
 2015-02-16 09:45:15 -08:00
Jeffrey Oliver
65d62b98a0 Add full and short name for card color filters. 2015-02-15 10:55:56 -08:00
Gavin Bisesi
ef654341fa Merge pull request #733 from poixen/alert_icon 
New logo for changed tab
 2015-02-14 17:18:10 -05:00
Gavin Bisesi
126c64d5f9 Merge pull request #735 from kaiserfro/jo-ctrl-add-to-selection 
ctrl-click to add a card to a selection.
 2015-02-14 08:10:15 -05:00
Gavin Bisesi
96af5bd09c Merge pull request #726 from kaiserfro/jo-add-play-face-down-menu-item 
Add a play face down context menu item when in the hand zone.
 2015-02-14 08:09:44 -05:00
Jeffrey Oliver
08166f7d24 Use !isSelected() 2015-02-13 21:48:37 -08:00
Gavin Bisesi
e0450d45c2 Merge pull request #732 from poixen/hq_images_default 
Increased default pixmap cache
 2015-02-13 20:12:03 -05:00
Fabio Bas
798dc09fe6 Translation updates to support Transifex 
* ignore .tx folder
 * cmake: when UPDATE_TRANSLATIONS=ON, extract new strings only to the
english translation file.
 * added info in CONTRIBUTING.md
 * updated english translations
 2015-02-13 15:56:17 +01:00
Jeffrey Oliver
180108e6f9 ctrl-click to add a card to a selection. 2015-02-12 22:44:17 -08:00
Matt Lowe
b3df978722 New logo for changed tab 2015-02-12 14:39:44 +01:00
Matt Lowe
64b8ed1e21 Increased default pixmap cache 2015-02-12 14:07:21 +01:00
Jeffrey Oliver
4bd161ab06 Put back the new action. 2015-02-11 20:31:00 -08:00
Jeffrey Oliver
5add56d850 Fixed up whitespace. 2015-02-11 20:25:34 -08:00
Gavin Bisesi
12fe0f5380 Merge pull request #727 from poixen/pm_macro 
Added modifier key to quick PM
 2015-02-11 22:19:09 -05:00