Jaeic Lee
|
c94e5f1186
|
Updated Korean translation
Added new strings for Cockatrice
New Oracle translation
Cleaned up vanished strings
|
2015-02-09 16:38:52 +09:00 |
|
Zach
|
f199115b54
|
Merge pull request #709 from ctrlaltca/oracle_translations
Oracle translations; fix #293
|
2015-02-08 18:29:47 -05: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 |
|
Fabio Bas
|
40d6caa59d
|
Merge branch 'master' into oracle_translations
|
2015-02-08 21:32:32 +01:00 |
|
Fabio Bas
|
f80e319900
|
Added translations for oracle; fix #293
Translations have been updated.
|
2015-02-08 21:17:51 +01: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 |
|
ctrlaltca
|
1d81cde457
|
Merge pull request #705 from ctrlaltca/fix_regression_667
Don't require zlib, it's optional - merging quickly since it breaks compilation
|
2015-02-08 01:00:28 +01:00 |
|
Zach
|
b1f5672481
|
Merge pull request #697 from poixen/kick_message
You have been kicked message box
|
2015-02-07 18:59:57 -05:00 |
|
Fabio Bas
|
40386a3415
|
Don't require lib, it's optional
|
2015-02-08 00:58:36 +01: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
|
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 |
|
Zach
|
030b02345d
|
Merge pull request #667 from ctrlaltca/oracle_zip
Oracle: support AllSets.json.zip; Fix #624
|
2015-02-07 17:04:22 -05: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 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
|
06290d2326
|
Changed popup buttons from "Ok/Cancel" to "Yes/No"
|
2015-02-04 14:47:09 +01:00 |
|
Fabio Bas
|
3f38e780f4
|
Fix #674
|
2015-02-04 12:48:08 +01:00 |
|
Fabio Bas
|
917a29fac0
|
This error message needs to explain itself a bit better
|
2015-02-04 12:18:25 +01:00 |
|
Fabio Bas
|
4ebcfc6b34
|
Raise a question popup when zip parsing fails
|
2015-02-04 12:15:28 +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 |
|