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
