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
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
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
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
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
