Commit Graph
2626 Commits
Author SHA1 Message Date
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
Gavin Bisesi 62e0bc9bb1 Merge pull request #707 from ctrlaltca/servatrice_locking
Improvement to servatrice database interface
2015-02-18 13:16:48 -05:00
Zach 3bf80540da Merge pull request #731 from poixen/oracle_logo
Updated oracle logo
2015-02-18 11:48:14 -05:00
Matt Lowe cfa54e5eb8 Updated to 48x48 2015-02-18 16:58:32 +01:00
Fabio Bas 569180799d When compiling with qt5, require at least version 5.0.3 2015-02-18 14:20:39 +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 ef654341fa Merge pull request #733 from poixen/alert_icon
New logo for changed tab
2015-02-14 17:18:10 -05: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
ctrlaltca e4147e6476 Merge pull request #738 from ctrlaltca/zip_win32
Fix zip support in oracle under win32; fix #736
2015-02-13 19:05:57 +01:00
ctrlaltca 8f96731360 Merge pull request #737 from ctrlaltca/translations
Translation updates to support Transifex; fix #651
2015-02-13 18:04:00 +01:00
Fabio Bas 3c285e572c Fix compilation under win32; fix installation of lib under win32 2015-02-13 17:58:20 +01:00
Fabio Bas e8cb260734 Fix win32 compilation without zlib 2015-02-13 16:58:55 +01:00
Fabio Bas 798dc09fe6 Translation updates to support Transifex
* ignore .tx folder
 * cmake: when UPDATE_TRANSLATIONS=ON, extract new strings only to the
english translation file.
 * added info in CONTRIBUTING.md
 * updated english translations
2015-02-13 15:56:17 +01:00
Jeffrey Oliver 180108e6f9 ctrl-click to add a card to a selection. 2015-02-12 22:44:17 -08:00
Fabio Bas ca9fffcf7e Fix "QMYSQLResult::data: column 7 out of range" error 2015-02-12 22:39:06 +01:00
Matt Lowe d1fa7a1075 Vacuumed defs 2015-02-12 14:45:30 +01:00
Matt Lowe b3df978722 New logo for changed tab 2015-02-12 14:39:44 +01:00
Matt Lowe 64b8ed1e21 Increased default pixmap cache 2015-02-12 14:07:21 +01:00
Matt Lowe 3f49e3f82e Updated logo
Updated logo
2015-02-12 13:39:01 +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
Gavin Bisesi df911338df Merge pull request #729 from poixen/hq_images_default
Set to download HQ images by default
2015-02-11 22:17:07 -05:00
Matt Lowe 3c60ac6114 Set to download HQ images by default 2015-02-11 21:38:34 +01:00
Gavin Bisesi 59f5554d9d Merge pull request #728 from tooomm/readme-translation2
more Translation Status Updates
2015-02-11 14:42:12 -05:00
tooomm cb5d8ba74b readjusted space 2015-02-11 19:24:12 +01:00
tooomm e5c177eba3 Translation Status Updates2 in Readme.md
- add link to translation faq in the wiki
- force more space between the images
- updated the picture links

Did you change any names from "oracle_ents" to "oracle" within transifex @ctrlaltca?
2015-02-11 19:21:12 +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
Gavin Bisesi dcc6c18965 Merge pull request #723 from tooomm/readme-translation
Translation Status Updates in Readme.md
2015-02-10 18:59:40 -05:00
tooomm 5c6d378d34 Translation Status Updates in Readme.md
- add separate links to different translation files (cockatrice_en.ts & oracle_en.ts) if you click one of the statistics
- added transifex icon with link to cockatrice project
- text changes
2015-02-10 23:20:16 +01:00
Gavin Bisesi b5a8f5a925 Merge pull request #717 from poixen/new_pawns
Refreshed the look of the default pawns
2015-02-10 09:33:24 -05:00