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 |
|
Fabio Bas
|
32fb532ad3
|
OSX: Test the ability to translate application menu entries
|
2015-02-07 23:17:26 +01:00 |
|
Fabio Bas
|
508c444453
|
Regenerated translations to pick up new string from OS X menubar
|
2015-02-07 23:14:37 +01:00 |
|
Fabio Bas
|
5646a76ee7
|
OSX: merge the duplicate cockatrice menu in the main one
|
2015-02-07 23:13:32 +01:00 |
|
Gavin Bisesi
|
adb259fdd6
|
Merge pull request #695 from Cockatrice/show-password-games-by-default
Show password games by default
|
2015-02-05 22:04:33 -05:00 |
|
Gavin Bises
|
86b92a25de
|
Merge remote-tracking branch 'origin/master' into show-password-games-by-default
|
2015-02-05 21:46:29 -05:00 |
|
Gavin Bisesi
|
f8bb295eef
|
Merge pull request #694 from ZeldaZach/flag_fix
Remove Blank Flag Notation
|
2015-02-05 19:39:49 -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
|
b369da4ad5
|
Merge pull request #682 from ctrlaltca/fix_674
Fix #674
|
2015-02-04 21:30:16 -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 |
|
woogerboy21
|
0c32cfaa27
|
Merge pull request #686 from Cockatrice/woogerboy21-nsisquotefix
Corrected NSIS template quoting
|
2015-02-04 15:57:26 -05:00 |
|
woogerboy21
|
40610997c2
|
Corrected NSIS template quoting
There are extra quotes introduced into line #19 that causes the NSIS installer creation to fail.
|
2015-02-04 15:30:38 -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 |
|
Fabio Bas
|
3f38e780f4
|
Fix #674
|
2015-02-04 12:48:08 +01:00 |
|
Jeffrey Oliver
|
843cd9718e
|
Reduce the whitespace in the server game constructor.
|
2015-02-03 22:22:31 -08:00 |
|
Gavin Bisesi
|
cb50fd0e2c
|
Merge pull request #679 from poixen/deckEditorButtons
Updated deck editor buttons
|
2015-02-03 18:00:13 -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 |
|
Gavin Bises
|
a29bf2cf0d
|
make -j2 for travis builds
|
2015-02-03 09:22:41 -05:00 |
|
Gavin Bisesi
|
e7198edfc7
|
Merge pull request #676 from poixen/focus_chat
Chat has focus when starting game
|
2015-02-03 09:15:25 -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 |
|
Zach
|
72d1b211c4
|
Merge pull request #644 from poixen/mention_color
Chat mention color
|
2015-02-01 15:39:53 -05: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 |
|
Gavin Bisesi
|
eeed03b101
|
Merge pull request #656 from poixen/view_size_fix
Fixed pile view bug
|
2015-02-01 10:35:02 -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 |
|
Gavin Bisesi
|
6d4716b38f
|
Merge pull request #648 from poixen/menu_sep
Added separator
|
2015-01-30 10:07:00 -05: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 |
|