Matt Lowe
319b5d88b2
Removed redundant constructor
...
Removed constructor that was not needed. Also removes annoying "error"
output when compiling.
2015-03-06 21:09:18 +01:00
poixen
fd4f76289c
Merge pull request #798 from poixen/window_title_username
...
Updated english, reverted spanish
2015-03-04 18:45:52 +01:00
Matt Lowe
afe33be229
Updated english, reverted spanish
2015-03-04 18:05:35 +01:00
Zach
5f7d0fe7c2
Merge pull request #796 from poixen/search_improvement
...
Fixed card search
2015-03-03 18:53:09 -05:00
Zach
855b7951fe
Merge pull request #795 from poixen/window_title_username
...
Added username to window title
2015-03-03 18:49:46 -05:00
poixen
cc6b826cad
Removed comments
2015-03-03 16:53:48 +01:00
ctrlaltca
ebf088363e
Merge pull request #797 from ctrlaltca/osx_qt541
...
update travis for qt5.4.1 under osx
2015-03-03 15:46:41 +01:00
Fabio Bas
b0e371feb9
update travis for qt5.4.1 under osx
2015-03-03 15:44:24 +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
8f732325b2
Updated english translations
2015-03-03 13:29:43 +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
poixen
f0646ee537
Merge pull request #789 from poixen/new_ready
...
Updated ready/not ready
2015-02-27 23:37:45 +01:00
Matt Lowe
9cea8e0229
Added faint black line, tilted tick more
2015-02-27 00:00:49 +01:00
Matt Lowe
e4f8a499f4
Updated ready/not ready
2015-02-26 23:26:36 +01: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
Zach
c25ba426b0
Merge pull request #785 from ideocl4st/update-sourcelang-150224
...
Updating source language file
2015-02-24 01:43:19 -05:00
Jaeic Lee
e6bf3b783c
Updating source language file
2015-02-24 11:37:30 +09:00
Zach
928f51a462
Merge pull request #784 from ctrlaltca/translations
...
Fetched new translations from transifex
2015-02-23 18:31:36 -05:00
Fabio Bas
def4d50e97
Fetched new translations from transifex
2015-02-23 22:40:07 +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
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
Zach
342dfe7edb
Merge pull request #770 from Cockatrice/fix-632
...
Fix #632 . Url and mentions work together
2015-02-21 13:10:52 -05:00
Zach
510fe4e0fb
Merge pull request #769 from Cockatrice/fix-osx-compile-bug
...
Avoid compilation failure due to protobuf bug on osx
2015-02-21 13:08:17 -05:00
Zach
65412800f8
Merge pull request #767 from ctrlaltca/oracle_progressbar
...
Fix oracle progressbar; fix #764
2015-02-21 13:02:03 -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
4d8218da13
Avoid compilation failure due to protobuf bug on osx
...
https://code.google.com/p/protobuf/issues/detail?id=119
2015-02-21 07:16:51 -05:00
Fabio Bas
514c414cfc
Fix oracle progressbar; fix #764
2015-02-21 10:46:16 +01: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
Gavin Bisesi
9d9ffd8a9a
Merge pull request #760 from poixen/updated_spec_svg
...
Updated spectator eye image
2015-02-19 20:43:50 -05:00
Gavin Bisesi
1c724e6fb1
Merge pull request #761 from poixen/updated_icon_player
...
Updated player fighting svg
2015-02-19 20:42:35 -05:00
Matt Lowe
f28a8b5ad1
Updated player fighting svg
...
+ Changed to be black
+ Made a little thicker
2015-02-19 18:09:38 +01:00
Matt Lowe
1b8c1ab9cd
Updated image
...
Bolder outline
More defined shape
2015-02-19 17:35:12 +01:00
poixen
edd3b75fe6
Merge pull request #758 from poixen/game_created_fix
...
Fixed 5+ hour issue for new games
2015-02-19 16:54:18 +01:00
Gavin Bisesi
98bf17bb9f
Merge pull request #755 from ctrlaltca/qt5_minversion
...
When compiling with qt5, require at least version 5.0.3, fix #741
2015-02-19 09:26:40 -05:00
Fabio Bas
2034d3f7ff
linux+clang+qt5 works now, disable allow_failures
2015-02-19 15:11:06 +01:00
Fabio Bas
623cbe8759
Added qt5multimedia
2015-02-19 14:55:49 +01:00
Fabio Bas
11d77f8324
Even make is too old.. 2.8.9 is required, this repo offers 2.8.11
2015-02-19 14:52:09 +01:00
Fabio Bas
4de9da8b2b
Attempt to get travis compile using qt5.2
2015-02-19 14:45:38 +01: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