Commit graph

1526 commits

Author SHA1 Message Date
Matt Lowe
a2aad95ede Added missing checks 2015-04-12 21:52:17 +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
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
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
Matt Lowe
44d4a534bf Added () for || && logic handling 2015-04-10 13:31:44 +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
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
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
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
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
Fabio Bas
8f3421204e Optimize loop; refers #910 2015-04-08 12:52:02 +02:00
Matt Lowe
1c89b90cbb Fixed double click sys icon
Was an issue with double clicking the icon when the app was full screen/
fullscreen + minimized.

Now works as expected.
2015-04-08 10:12:41 +02:00
Matt Lowe
6b307469fe Fixed issue with clicking on PM bubbles
Previously would not open the client if the window was minimized.
Added the same popup fix for mentions
2015-04-07 23:32:13 +02:00
poixen
89bce3d649 Revert "Kick message no longer takes you to kicked tab" 2015-04-07 15:55:11 +02:00
Matt Lowe
b20ae9710c Mention popup fix
+ will now only popup with a mention alert when you are not on the same
tab/window.
+ will also no longer popup by mentioning yourself
2015-04-05 12:43:02 +02:00
Zach
8ca2135f08 Merge pull request #901 from poixen/left_justified_hand
Left hand justification
2015-04-04 17:45:02 -04:00
poixen
7c6b6818f1 Merge pull request #907 from poixen/right_click_cast
Right click cast
2015-04-04 23:38:53 +02:00
poixen
e96e2e4b04 Merge pull request #906 from poixen/rename_user_lists
Renamed userlist tab to account
2015-04-04 23:38:44 +02:00
Fabio Bas
0a366d7564 Fix #67
Workaround the two remaining issues, mostly fixing the “load deck”
screen in tab_game:
 * Only preload up to the first 300 cards of a deck;
 * don’t even bother trying to load card images if they’ll be shown
with width <= 10

Trying a 17k cards deck like the one proposed in #67 is still a no go,
mostly due to the cpu time used to create all the objects. Anyway, i
tested decks up to 8k cards and they works fine now (if you like to
wait while trice is loading them)..
2015-04-04 14:03:22 +02:00
Fabio Bas
cab1e096df Fix #118
Fix selection problem when sorting the deck list
2015-04-04 12:49:28 +02:00
Matt Lowe
20bfb4d0a7 Fix for hand target casting
if you have the setting to NOT play cards to the stack enabled, it meant
that any spells (like Lightning Bolt) would be cast to the stack but no
arrow would show. This was an edge case I missed.
2015-04-03 19:02:14 +02:00
Matt Lowe
725cb2f863 Renamed userlist tab to account 2015-04-02 23:02:54 +02:00
poixen
b8401592d4 Merge pull request #905 from poixen/socket_failure_dlg
Reopen connection if socket failure
2015-04-02 19:22:18 +02:00
Matt Lowe
9e6be7459d Reopen connection if socket failure
Missed from #879
2015-04-02 18:33:35 +02:00
Matt Lowe
986eab4d40 Default to one player
I think the majority of players use this feature for
goldfishing/practicing. Defaulting to one player for convenience.
2015-04-02 13:23:39 +02:00
Matt Lowe
a082fbcfef Left hand justification
Set to false by default, let me know if you think it should be true.

As all cards are played to the left of the screen this feels more
comfortable to use as you dont need to keep looking at different areas
of the screen.

Will auto rearrange when changed during game-play.
2015-04-02 12:49:06 +02:00
Zach
fb49a8867e Merge pull request #897 from poixen/counter_issue
Fixed accidental +/- of counters when using middle click menu
2015-04-01 15:54:41 -04:00
Matt Lowe
a0be18ca09 Removed dev code 2015-04-01 18:33:02 +02:00
Matt Lowe
e78747241d Refactored code and made lines cleaner
Before:

After:
2015-04-01 17:24:50 +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
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
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
2a6c08b9db Merge pull request #882 from ctrlaltca/remove_deckbrewz
Remove deck brew by ZeldaZach
2015-03-26 18:50:29 -04:00
Fabio Bas
839da83d2c Remove deck brew by ZeldaZach 2015-03-26 23:08:53 +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
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
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
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
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
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
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
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
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
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
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
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
Jeffrey Oliver
180108e6f9 ctrl-click to add a card to a selection. 2015-02-12 22:44:17 -08: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
Matt Lowe
3c60ac6114 Set to download HQ images by default 2015-02-11 21:38:34 +01:00
Matt Lowe
92474479e4 Added modifier key to quick PM
Ctrl + click on a user name to PM
2015-02-11 18:56:28 +01:00
Jeffrey Oliver
cc32e8c86e Add a play face down context menu item when in the hand zone. 2015-02-10 22:58:32 -08:00
Matt Lowe
959b516cb8 Kick message no longer takes you to kicked tab 2015-02-10 11:25:27 +01:00
Zach H
f0338118af minor fix 2015-02-09 16:07:23 -05:00
Zach H
7a1fb45ebc feedback change 2015-02-09 16:04:39 -05:00
Zach
ce2541af1e Allow for shortcuts on hand viewing
Based on feedback, allow for shortcut for specs to view hands
2015-02-09 15:52:04 -05:00
Zach H
43d34bb825 spectator preferences 2015-02-09 15:35:16 -05:00
Matt Lowe
616f8439ae Changed text to match room creation
"see hands" -> "see everything"
2015-02-09 17:41:38 +01:00
Matt Lowe
d420fc89a5 Spectator viewing options
Its now easy to see which games you can chat/see hands in.
2015-02-09 17:11:13 +01:00
Gavin Bisesi
5f3f767178 Merge pull request #710 from ctrlaltca/pvt_filters
Disable filters in "show user's games" dialog
2015-02-08 17:28:18 -05:00
Fabio Bas
0d974914a3 Disable filters in "show user's games" dialog
Hide filters-related buttons
Bypass the proxy model
2015-02-08 22:35:37 +01:00
Zach
a813dcb803 Merge pull request #708 from poixen/local_chat_focus
Local chat focus
2015-02-08 15:34:18 -05:00
Gavin Bisesi
43a9ac61fb Merge pull request #702 from ctrlaltca/osx_menubar
Osx menubar improvements; fix #659
2015-02-08 15:05:35 -05:00
Matt Lowe
f91de7e1f1 Local chat focus
Games with only 1 player will now not focus on the chat when starting
the game. This helps with goldfishing.
2015-02-08 20:56:16 +01:00
Zach
25747a0964 Merge pull request #704 from ctrlaltca/fix_683
Fix #683 and #684
2015-02-07 19:15:44 -05:00
Fabio Bas
ae674e54b0 Merge patch for #684 2015-02-08 00:40:28 +01:00
Fabio Bas
cbd391b1b8 Second attempt based on feedback
re-split the menus, but rename the cockatrice one to “actions”
2015-02-08 00:38:04 +01:00
Matt Lowe
3b0a8c2aa8 Updated
+ Added room name
+ takes you to kicked game tab
2015-02-08 00:36:35 +01:00
Fabio Bas
9c6784a1c0 Fix #683
Two regressions; depends on the fix for #684, too
2015-02-08 00:26:16 +01:00
Fabio Bas
5646a76ee7 OSX: merge the duplicate cockatrice menu in the main one 2015-02-07 23:13:32 +01:00
Matt Lowe
7de110306f You have been kicked message box
Its easy to not see that you have been kicked right now. This makes it
more apparent.
2015-02-06 23:14:55 +01:00
Gavin Bises
86b92a25de Merge remote-tracking branch 'origin/master' into show-password-games-by-default 2015-02-05 21:46:29 -05:00
Zach H
296e31b510 flag fix 2015-02-05 17:24:09 -05:00
Zach H
ad8e47a35d flag fix 2015-02-05 17:23:11 -05:00
Zach
059a62a00d Merge pull request #689 from Cockatrice/fix-688
Fix #688. Reuse chat tabs when user opens more chat with same user
2015-02-04 20:54:26 -05:00
Gavin Bises
f22e42428c Fix #688. Reuse chat tabs when user opens more chat with same user 2015-02-04 20:34:11 -05:00
Gavin Bises
6e5f4d1f06 Merge remote-tracking branch 'origin/master' into jo-remove-name-filters-from-settings 2015-02-04 20:15:41 -05:00
Gavin Bisesi
78aa291734 Merge pull request #687 from poixen/base_mention_color
Changed default mention/username color
2015-02-04 19:10:10 -05:00
Matt Lowe
cf26127dc4 Changed default mention/username color
#A6120D
Dark blood red, less "pink" that the current.
2015-02-05 00:28:22 +01:00
Gavin Bisesi
6d499bdad2 Merge pull request #685 from poixen/mentions_in_om
Added click mentions to PMs
2015-02-04 18:18:08 -05:00
Matt Lowe
ef607eeb4c Added mentions to PMs
+ adds client wide continuity
+ one day we might have multiuser pms
+ I use it when greeting users who pm me: "hello @username!"
2015-02-04 17:13:52 +01:00
Gavin Bisesi
37a05eb731 Merge pull request #671 from kaiserfro/jo-reduce-whitespace-from-game-description
Reduce the game descriptions whitespace.
2015-02-04 10:18:23 -05:00
Matt Lowe
f7f651338b Updated deck editor buttons 2015-02-03 23:35:18 +01:00
Gavin Bisesi
25cc695190 Merge pull request #672 from ctrlaltca/deckstats
Fixed "analyze on deckstats"; Fix #662
2015-02-03 10:30:28 -05:00
Matt Lowe
787773e949 Chat has focus when starting game
When the game starts the line edit now has focus immediately.
2015-02-03 13:53:18 +01:00
Fabio Bas
7ce9d3749e Fixed "analyze on deckstats"; Fix #662
Plus: added support for deck name
2015-02-03 08:48:20 +01:00
Jeffrey Oliver
bd39d60388 Reduce the game descriptions whitespace. 2015-02-02 20:59:46 -08:00
Gavin Bises
975c5e0db3 Show password protected games by default 2015-02-02 19:14:23 -05:00
poixen
b7521bad8b Merge pull request #620 from poixen/mention_punctuation
Check for non-characters
2015-02-02 21:45:02 +01:00
poixen
4c418bc9b4 Merge pull request #654 from poixen/chat_buddy_stars
Buddy stars
2015-02-02 17:55:14 +01:00
Gavin Bises
82ca261ec8 Merge remote-tracking branch 'origin/master' into mention_color
Conflicts:
	cockatrice/src/dlg_settings.cpp
	cockatrice/src/dlg_settings.h
2015-02-01 13:29:50 -05:00
Zach
a08fc0461f Merge pull request #660 from Cockatrice/ignore-unreg-pm
Ignore unreg pm
2015-02-01 13:17:03 -05:00
Gavin Bises
26fa936347 Add settings page option to ignore unreg user pm 2015-02-01 12:14:25 -05:00
Gavin Bises
5222183ff3 Don't open new PM windows from unreg when ignoring unreg pm 2015-02-01 12:05:29 -05:00
Gavin Bises
32c6635137 Add settings interface for ignoring unreg pm 2015-02-01 12:05:04 -05:00
Matt Lowe
42c4f4a08c Fixed pile view bug
When sorting a view which has the last column the longest an error
happens where the view is squashed.
2015-02-01 00:31:25 +01:00
Matt Lowe
d57a6111aa Buddy stars
Buddies will now be seen as stars in the chat
2015-01-31 17:11:17 +01:00
Matt Lowe
3f2c570075 fixed conflict 2015-01-30 19:23:04 +01:00
Matt Lowe
d065236ce9 Added separator
Its been annoying me for a long time.
2015-01-30 13:57:16 +01:00
Matt Lowe
75f8ecd6e9 Added label 2015-01-30 13:06:09 +01:00
Zach H
b608d81037 Merge branch 'fix-deck-shuffle-check' 2015-01-29 21:10:34 -05:00
Gavin Bisesi
a8fcd9ec26 Merge pull request #623 from Cockatrice/country-code
Add country code to user info box.
2015-01-29 20:27:19 -05:00
Gavin Bises
d0f4d96d17 Don't store shuffle zone check - always check it
It doesn't make any sense to store that particular setting
2015-01-29 20:06:15 -05:00
Gavin Bises
6f50266931 Uppercase country code for text display, not flag filename generation 2015-01-29 20:01:48 -05:00
Matt Lowe
de38a294b5 Updated color setting
+ live preview added
+ will now only store the color if valid
2015-01-30 01:54:57 +01:00
Matt Lowe
ec8a2de2eb Chat mention color
+Chat mention / username color can now be set via hex in the settings
+ Users can invert the color of the mention text black/white
+ if an invalid color is provided, the default will be used
2015-01-30 00:48:50 +01:00
Gavin Bises
6fa34c6c04 Add cmc to card db filter model 2015-01-29 13:33:06 -05:00
Gavin Bises
7893ab086f Fix broken cmc parsing from cards.xml
I don't know why this even compiled
2015-01-29 13:32:17 -05:00
ctrlaltca
a31c15c752 Merge pull request #637 from ctrlaltca/fix_cache_size
Refix #558, Fix #631
2015-01-29 14:27:36 +01:00
Fabio Bas
29190708c3 Fix merge botch 2015-01-29 14:11:15 +01:00
Gavin Bisesi
dd426cbac9 Merge pull request #634 from Cockatrice/oracle-cmc
Parse cmc from json and store in cards.xml
2015-01-29 05:48:32 -05:00
Matt Lowe
2a78d15792 Taskbar attention when mentioned 2015-01-29 10:27:16 +01:00
Jeffrey Oliver
763d8a7919 Merge branch 'master' into jo-remove-name-filters-from-settings 2015-01-28 20:28:36 -08:00
Gavin Bises
e2fe25735b Parse cmc from json and store in cards.xml 2015-01-28 20:28:38 -05:00
Gavin Bises
1af6486d74 Capitalize country code in user info box 2015-01-28 19:03:08 -05:00
Gavin Bises
b5fbebc883 Add country code to user info box.
People might not know all the flags
2015-01-28 11:57:17 -05:00
Matt Lowe
78edb8c661 Check for non-characters
now checks for non characters, so a mention s like "@username!" will now
work.
Requires some testing though, there are a lot of scenarios to check for.
2015-01-28 13:27:45 +01:00
Gavin Bisesi
739ca6a02e Merge pull request #607 from poixen/osx_fix
Refactor pileview sorting code
2015-01-27 20:10:54 -05:00
Jeffrey Oliver
223b38c27b Add a bool to the gameselector constructor to choose whether or not we should
load settings from saved values or use defaults.
2015-01-27 12:40:13 -08:00
Gavin Bisesi
93cf7dbaaf Merge pull request #609 from poixen/chat_mention_fixes
Chat mention fixes
2015-01-27 06:30:20 -05:00
Matt Lowe
3c0aca70e0 Updated method name
+ updated method name
+ added some doc
2015-01-27 10:55:52 +01:00
Gavin Bisesi
62c4c0f4eb Merge pull request #597 from ideocl4st/tweak-hand-context-menu
Submenus for moving all cards in a zone to another
2015-01-26 20:33:17 -05:00
Jaeic Lee
bfc1bd04b5 Added separators
Looks better imo.
2015-01-27 09:54:11 +09:00
Matt Lowe
639cbefee0 Chat mention fixes
+ fixed some issues with highlighting entire line
+ added case insensative mentions
2015-01-27 00:43:11 +01:00
Matt Lowe
b89535f7ff Refactored code 2015-01-26 22:19:00 +01:00
Jaeic Lee
c6800c48d2 More ellipsis
Should be the last of them
2015-01-27 03:32:58 +09:00
Jaeic Lee
46fb5f820e Tweaked some texts
Per Daenyth’s request
2015-01-27 03:14:52 +09:00
Zach
613f7717ab Merge pull request #595 from poixen/shufflefix
Fixed shuffle issue
2015-01-26 10:24:55 -05:00
Gavin Bisesi
ceead6b9e3 Merge pull request #593 from poixen/other_user_mention_option
Removed other user mention BG
2015-01-26 07:18:24 -05:00
Gavin Bisesi
ffb5ac6b9a Merge pull request #599 from poixen/removed_unused_connect
Removed a connection
2015-01-25 15:31:26 -05:00
Matt Lowe
c0aafec907 Removed a connection
This isnt being used anymore
2015-01-25 12:15:53 +01:00
Matt Lowe
02277b2442 Removed other user mention BG
Due to feedback, I have removed the background color for other user
mentions. I think this looks cleaner, and doesnt require an additional
option.
2015-01-25 09:44:07 +01:00
Jaeic Lee
cc14e3cfc6 Submenus for moving all cards in a zone to another 2015-01-25 11:34:51 +09:00
Gavin Bisesi
2a6291dcde Merge pull request #592 from poixen/tap_animation
Faster tapping speed
2015-01-24 21:21:31 -05:00
Matt Lowe
ec198c33ca Fixed shuffle issue
when closing a view we save the current settings. I added a check to
only update the shuffle settings if the zone we are closing can be
shuffled.
2015-01-25 00:34:41 +01:00
Matt Lowe
359391acba Fix for #557 2015-01-24 23:59:53 +01:00
Matt Lowe
e409d96bb9 Faster tapping speed
+ Feels better with a little more speed
2015-01-24 23:01:10 +01:00
Jeffrey Oliver
d96e566411 Add back in the games description filter storage. 2015-01-23 20:53:21 -08:00
Zach
712f12a7a6 Merge pull request #587 from ZeldaZach/return_align_fix
adding return
2015-01-23 12:08:18 -05:00
Zach H
22a1bcdf60 adding return 2015-01-23 12:07:53 -05:00
Zach
dac5726dab Merge pull request #504 from ctrlaltca/local_scry_and_move
Specify the player when triggering a move on a revealed card
2015-01-23 10:14:05 -05:00
Jeffrey Oliver
cc75210ac6 Removed the loading and saving of the user name and game description
from the persistent filter settings.
2015-01-22 20:39:28 -08:00
poixen
b06b81895b Merge pull request #580 from poixen/room_user_level
Updated game view
2015-01-22 23:26:14 +01:00
Matt Lowe
8fdaadf462 refactorings #3
removed const from enum
2015-01-22 22:37:49 +01:00
Matt Lowe
86bbf75ddd refactorings #2
+ removed static from enum
+ removed condition check for user level
2015-01-22 22:23:21 +01:00
Matt Lowe
8ac58259b4 Refactorings 2015-01-22 22:05:08 +01:00
Matt Lowe
1406a27775 Updated game view
+ removed password column
+ added a lock svg to restrictions if pw is needed
+ added "password" to restrictions if pw is needed
+ added user pawn to creator tab
+ reformatted code for easy adaptation later
2015-01-22 21:35:52 +01:00
Matt Lowe
497fed6b15 Updated colors 2015-01-22 12:39:24 +01:00
Matt Lowe
0334fe3c8f Other mentions -- DRAFT --
Mentions about other players currently in the room will be highlighted.
They are also clickable for mentions and right clickable for context
options.
2015-01-22 09:32:56 +01:00
Matt Lowe
fd2b34278f Fixed spelling mistake 2015-01-21 07:50:20 +01:00
Matt Lowe
b9c537bf47 Moved "Ignore messages from unregistered users"
Relocated to the chat settings tab.
2015-01-20 20:02:36 +01:00
Gavin Bisesi
6dfaa81a53 Merge pull request #561 from poixen/chatnamehighlight
Username block highlighting
2015-01-20 12:35:41 -05:00
Gavin Bisesi
fa8bcccaaa Merge pull request #549 from poixen/cardviewlist
Sortable card views can now be split into pile types
2015-01-20 12:15:19 -05:00
Gavin Bisesi
931b420323 Merge pull request #556 from poixen/settings_dlg_refactorings
Refactored Settings Tab
2015-01-20 11:39:25 -05:00
Gavin Bisesi
10aa137475 Merge pull request #562 from poixen/chat_click_mentions
Click tag mentions
2015-01-20 10:06:04 -05:00
Matt Lowe
b41d64615d Added "Chat settings..." shortcut to chat cog 2015-01-20 15:35:16 +01:00
Matt Lowe
222105be61 Added functionality in game 2015-01-19 21:29:15 +01:00
Matt Lowe
041e91412d Switch Statement 2015-01-19 08:33:28 +01:00
Matt Lowe
f0c661a0df Added seperator
Added a separator
2015-01-18 00:33:42 +01:00
Matt Lowe
54a1a28619 Added ratio scaling
Previously was adding pixels, rather than using ratios. this was cutting
off cards on higher res screens
2015-01-18 00:18:23 +01:00
Matt Lowe
d59e1f135d Refactored Chat Settings tab
- removed heap alloc
2015-01-17 18:04:06 +01:00
Matt Lowe
d02d3ed521 Refactored Deck Editor tab
- removed heap allocation
2015-01-17 17:55:13 +01:00
Matt Lowe
5cf801eb94 Refactored User Interface tab
- removed heap allocs
2015-01-17 17:50:04 +01:00
Matt Lowe
a599fa1a63 Removed manual sizing
replaced the resize(x, y) to "pack" the widgets. It saves space and
makes the settings tighter.
2015-01-17 17:30:24 +01:00
Matt Lowe
98e84f0d63 Fixed some merge issues 2015-01-17 17:11:14 +01:00
Matt Lowe
4b45ba46f4 Refactored General Settings Tab
~ Removed some heap allocs
~ Remaining heap allocs are needed.
~ Unrolled "one line" declarations in header
~ restructured logic in GeneralSettingsPage

Refactored Appearance Tab

- removed some heap allocs
- removed setting of zone view, its not needed here, its configurable in
real time, in game.
2015-01-17 16:59:00 +01:00
Matt Lowe
ece56ff3f2 Added @ back in
Added the @ back to the chat, this will help if a user does not have the
newest version of the client.
2015-01-17 15:03:41 +01:00
Matt Lowe
8bc2adb70b Set focus
The line edit now gets focus for faster typing.
2015-01-17 14:53:41 +01:00
Matt Lowe
45112e49b1 Click tag mentions
You can now click on a username in the main chat to add a "@username"
tag to the chat. Makes communication with other users using tags faster.
2015-01-17 14:47:16 +01:00
Matt Lowe
49d3ad73d5 Uername block highlighting
I was able to find a simple way to achive the block highlighting.
2015-01-17 13:23:30 +01:00
poixen
9b7f488bd7 Merge pull request #559 from poixen/chatnamehighlight
Fixed #557
2015-01-17 00:43:49 +01:00
Matt Lowe
e4afd9fa4d Fixed #557 2015-01-17 00:08:54 +01:00
Fabio Bas
24c6e4a81d Limit pixmap cache size to 2047MB; fix #555
also, fix any invalid values loaded from config
2015-01-16 17:11:38 +01:00
Matt Lowe
aad98756d1 Refactorings
+ added comments
+ refactored optimumRect
2015-01-15 23:52:19 +01:00
Gavin Bisesi
8e396cadc2 Merge pull request #554 from poixen/chatsettingstab
Updated chat setting tab
2015-01-15 08:39:30 -05:00
Matt Lowe
a794112b1d Updated chat setting tab
+ Renamed "Messages" to "Chat Settings"
+ Moved the chat mentions to this tab
+ Added boarder round macro settings
2015-01-15 00:47:10 +01:00
Matt Lowe
0454f9c24b Added title for sound settings 2015-01-15 00:01:12 +01:00
Matt Lowe
e4e3a1d2e5 Sorting views
+ When viewing a sorted view (like revealing hand, or looking at
library), the cards will now be sorted in columns based on the main card
type.
+ Settings are now saved.
2015-01-14 23:19:22 +01:00
Gavin Bisesi
ce2520d74f Merge pull request #538 from poixen/settingscleanup
Realigned Icons
2015-01-14 07:38:23 -05:00
poixen
8fee9c6c4b Merge pull request #535 from poixen/chatnamehighlight
Chat highlighting when username is mentioned
2015-01-13 19:11:52 +01:00
Matt Lowe
f1a9401416 Changed color 2015-01-13 18:06:49 +01:00
Gavin Bisesi
2ae9cd2c37 Merge pull request #543 from poixen/clearchat
Clear chat
2015-01-12 21:15:55 -05:00
Matt Lowe
2e342361a5 Clear chat
Users can now clear the chat in the main lobby. This removes unwanted
text and clears up memory when the client has been open a long time.
2015-01-13 00:39:19 +01:00
Matt Lowe
5452d0ceae Chat highlighting when mentioned
When being mentioned in a post with '@username' you will now see the entry highlighted. This
helps to see when someone is talking to you. It work across the main
chat, in game and in private chat.
2015-01-12 15:15:15 +01:00
Gavin Bisesi
69e6aa355f Merge pull request #534 from poixen/accountage
Added account age to user info window
2015-01-11 21:37:07 -05:00
Matt Lowe
0445e570d7 Realigned Icons
+ Moved Icons to the top. You can now see all options.
+ All SVGs now have a background (GO! was missing one).
+ All SVGs now have the same background (General had one of its own)
2015-01-11 11:55:48 +01:00
Matt Lowe
02043ad4f9 Added Account Age
+ Added the ability to see the account age of registered users. Changes
are both in server and client. The server will now send back the
registration date along with the user data. The client will then use
this to calculate the account age and display it in the user details
window.
2015-01-11 00:45:12 +01:00
Gavin Bisesi
37a4c0d0e6 Merge pull request #531 from mcallahan/resizing2
Resize player names in playerlistwidget properly.
2015-01-07 15:42:03 -05:00
Michael Callahan
eac6e41de7 Resize player names in playerlistwidget properly. 2015-01-06 22:20:45 -07:00
Fabio Bas
2101ed7096 Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt
Conflicts:
	cockatrice/src/dlg_settings.cpp
	cockatrice/src/dlg_settings.h
2015-01-05 22:46:12 +01:00
Gavin Bisesi
c98a146746 Merge pull request #520 from mcallahan/always-reveal-top-master-master
Reset Always reveal top card when starting a new game.
2015-01-05 16:36:07 -05:00
Gavin Bisesi
fba60c20c0 Merge pull request #523 from kaiserfro/apply-filters-at-start2
Apply filters at start
2015-01-05 11:26:54 -05:00
Fabio Bas
2671d6abdc Merge remote-tracking branch 'upstream/master' into local_scry_and_move 2015-01-05 11:08:11 +01:00
Jeffrey Oliver
4a2a61ef46 Replace the 99 with a const int. 2015-01-04 15:32:29 -08:00
Jeffrey Oliver
8eb0e2dbef Remove reminder. 2015-01-04 15:31:59 -08:00
Matt Lowe
a1a021c99c Added timestamps to in game chat
+ added time stamps to the in game chat
2015-01-04 18:01:46 +01:00
Jeffrey Oliver
bb317003b4 Save filters after a filter clear.
Remove some duplicated code.
2015-01-02 17:23:15 -08:00
Jeffrey Oliver
f01d26bf96 Enable the clear filter button by default. 2015-01-02 17:10:55 -08:00
Jeffrey Oliver
1e78596dfa Remove unused function. 2015-01-02 17:07:30 -08:00
Jeffrey Oliver
f1803fe879 Remove some debug. 2015-01-02 17:06:30 -08:00
Jeffrey Oliver
b1e5153ea5 Should be a const ptr. 2015-01-02 17:03:17 -08:00
Jeffrey Oliver
dbfbfcc837 WIP: refactor filters to save to persistence from within model. 2015-01-02 15:19:36 -08:00
Jeffrey Oliver
6a4384f903 WIP: Refactor gamesproxymodel to own the persistence layer. 2015-01-02 15:05:33 -08:00
Fabio Bas
0abd1fb299 Rework patch for "move to.." menu; fix "P/T"-related menus 2015-01-02 17:10:19 +01:00
Michael Callahan
142b42e095 Reset Always reveal top card when starting a new game. 2015-01-01 09:53:29 -07:00
Jaeic Lee
93d6bfed65 Merge branch 'master' into korean-translation
Updating to sync with origin
2015-01-01 23:25:29 +09:00
Jaeic Lee
be973879d0 Added Korean Translation 2015-01-01 22:58:35 +09:00
ctrlaltca
16bbc5e8c0 Merge pull request #516 from mcallahan/compilation-warnings
Clean up a small pile of compiler warnings.
2015-01-01 14:32:53 +01:00
Gavin Bisesi
0f1c8c59ac Merge pull request #508 from Blitzmerker/master
Fixes the "Card preview window gets stuck and can't be removed" issue by...
2015-01-01 08:08:29 -05:00
Gavin Bisesi
a6c750668a Merge pull request #496 from ctrlaltca/set_extinfo
Remove branch decoration
2015-01-01 08:07:19 -05:00
Gavin Bisesi
b38cd7833f Merge pull request #500 from ctrlaltca/translation_fixes
Translation fixes
2015-01-01 08:07:06 -05:00
Michael Callahan
3a0c86938c Clean up a small pile of compiler warnings. 2014-12-30 15:54:38 -07:00
Michael Callahan
3c9ddd780e Better icon packing in PlayerListWidget. 2014-12-30 15:27:21 -07:00
Blitzmerker
6af8a49aae Fixes the "Card preview window gets stuck and can't be removed" issue by saving the cardname, instead of getting it back from the popup (with possible issues with case sensitivity). Also closes an old popup when a new is created. 2014-12-29 19:00:28 +01:00
Fabio Bas
ea1067189d Specify the player when triggering a move on a revealed card
Fixes #72, #493
2014-12-27 17:12:21 +01:00
Fabio Bas
dd88476796 Changed parameter name to something more meaningful 2014-12-27 15:02:20 +01:00
Gavin Bisesi
f52935791c Merge pull request #501 from ctrlaltca/crash_on_exit
Fix crash on close #255
2014-12-26 20:05:54 -05:00
Fabio Bas
390a8f1985 Fix #484
Missing tooltip
2014-12-26 16:09:56 +01:00
Fabio Bas
15e4c852dd Fix crash on close #255 2014-12-26 16:03:59 +01:00
Fabio Bas
2d932c68de Fixed translation for "clear downloaded pictures" button 2014-12-26 14:48:58 +01:00
Fabio Bas
f88621fd97 Use QPixmapCache for card images
Drop CardInfo’s own pixmap caches; use QPixmapCache instead.
Use QPixmap references instead of pointers.
Being stored in QPixmapCache, all card images are now subjected to
QPixmapCache’s size limit
2014-12-24 16:18:55 +01:00
Fabio Bas
b96104bed4 Expose QPixmapCache's cache limit size as an user preference 2014-12-24 16:16:34 +01:00
Fabio Bas
a5a92e0a7d Remove branch decoration 2014-12-18 17:39:07 +01:00
Gavin Bisesi
776d809f2f Merge pull request #483 from ZeldaZach/how_many_cards
How Many Cards
2014-12-09 11:39:40 -05:00
Zach H
b738428941 Adding a way to see how many of each type 2014-12-08 17:18:21 -05:00
Gavin Bisesi
8670bc674f Merge pull request #471 from ctrlaltca/set_extinfo
More sets handling improvements
2014-12-08 10:38:54 -05:00
Zach H
a44b7367be removing blp pricing 2014-12-05 21:26:41 -05:00
Fabio Bas
9cc8d8b86c Misc fixes
ucfirst(setCode): requires oracle re-run
reorder columns
rename the “short name“ column as “set code“
ensure proper casting for releaseDate and sortKey fields (refs 00a5ed0)
2014-12-05 08:48:33 +01:00
Fabio Bas
0ba351c955 Add "saved" msgbox 2014-12-04 21:09:50 +01:00
Fabio Bas
00a5ed0b79 Fix compilation with qt <= 5.2 2014-12-04 18:29:06 +01:00