Zach H
a44b7367be
removing blp pricing
2014-12-05 21:26:41 -05:00
Fabio Bas
9cc8d8b86c
Misc fixes
...
ucfirst(setCode): requires oracle re-run
reorder columns
rename the “short name“ column as “set code“
ensure proper casting for releaseDate and sortKey fields (refs 00a5ed0
)
2014-12-05 08:48:33 +01:00
Fabio Bas
0ba351c955
Add "saved" msgbox
2014-12-04 21:09:50 +01:00
Fabio Bas
00a5ed0b79
Fix compilation with qt <= 5.2
2014-12-04 18:29:06 +01:00
Fabio Bas
2745cb2c62
Removed debug
2014-12-02 14:43:39 +01:00
Fabio Bas
36ed4480c2
Re-added save and restore buttons
2014-12-02 14:38:36 +01:00
Gavin Bisesi
ef8bd60a32
Merge pull request #465 from poixen/urlchat
...
Added more space between chat
2014-12-01 12:45:08 -05:00
Gavin Bisesi
0be45e3969
Merge pull request #463 from poixen/chatlinkunderline
...
Added underline to links in chat
2014-12-01 09:27:42 -05:00
Fabio Bas
e48a815d25
Add move buttons, misc improvements
2014-11-30 21:37:06 +01:00
Matt Lowe
0cb1dde8c8
Added more space between chat
...
Added a couple extra pixels in the chat. Make it look a little less
squished.
Before: http://imgur.com/7U6oe82
After: http://imgur.com/C8gGpDY
2014-11-29 02:49:22 +01:00
Matt Lowe
52cadd75f3
Added underline to links in chat
...
[REVIEW]
Links now have a blue underline to better indicate they are clickable.
Preview: http://imgur.com/gQZEv4I
2014-11-29 01:18:52 +01:00
Gavin Bisesi
9e1f8a0892
Merge pull request #449 from ctrlaltca/set_extinfo
...
Sets handling improvements
2014-11-27 06:13:29 -05:00
Matt Lowe
0f6dc6be6c
Fix for #460
2014-11-27 09:52:27 +01:00
Fabio Bas
c8aeff0b0c
Port #436 to QDateTime
2014-11-26 12:34:26 +01:00
Fabio Bas
2704523c73
Merge branch 'master' into set_extinfo
2014-11-26 11:45:51 +01:00
Gavin Bisesi
f71cfb1240
Merge pull request #436 from mitchellwrosen/master
...
Add 'Start time' column to game list
2014-11-25 09:01:24 -05:00
Gavin Bisesi
19de7cbc03
Merge pull request #428 from woogerboy21/static_reveal_library
...
Don't remove card images from revealed decks
2014-11-25 08:41:08 -05:00
Gavin Bisesi
9d62c578e6
Merge pull request #435 from poixen/bottomdeck
...
Action: Move Bottom Card to Graveyard
2014-11-25 08:40:45 -05:00
Matt Lowe
bbcfe84d08
Added double click/Enter for Server tab
...
Added the same functionality to the server tab
2014-11-23 20:01:09 +01:00
Matt Lowe
9e349d8b88
Added "ENTER" to join a room
...
Can now join a room by highlighting a room and pressing ENTER. Works
nice with arrow navigation.
2014-11-23 00:46:54 +01:00
Matt Lowe
6a44855a5c
Added double click to join a room
...
Can now double click on a room in the lobby to join
2014-11-23 00:36:50 +01:00
Mitchell Rosen
cab37b3945
Capitalize game columns
2014-11-22 00:08:47 -08:00
Mitchell Rosen
03bdbe2c7a
Added '<1m ago'
2014-11-22 00:08:00 -08:00
Mitchell Rosen
0af70883a8
0s-5m displayed as '<5m ago'
2014-11-22 00:06:13 -08:00
Mitchell Rosen
d0969c10c6
Show hours and minutes between 60 and 90 minutes
2014-11-22 00:06:13 -08:00
Mitchell Rosen
da145bdd7b
fix localization in time strings
2014-11-22 00:06:13 -08:00
Mitchell Rosen
7aff20b4ee
Fix the build
2014-11-22 00:06:13 -08:00
Mitchell Rosen
a3dc403f75
Translate, change 'Start time' to 'Game created', add debug log
2014-11-22 00:06:13 -08:00
Mitchell Rosen
93ab9f9691
Add 'Start time' column to game list
2014-11-22 00:06:13 -08:00
ctrlaltca
a28eb053c5
Merge pull request #450 from poixen/ghostcards
...
Added fade to card drag items
2014-11-21 08:24:14 +01:00
Matt Lowe
141d0c7618
Added fade to card drag items
...
[REVIEW]
Added a white mask to cards that are being dragged.
Preview: http://webmup.com/1we4W/
2014-11-21 00:09:38 +01:00
Gavin Bisesi
68bc67cde5
Merge pull request #433 from poixen/scalecards
...
Cards Scale with mouse over action
2014-11-20 16:41:04 -05:00
Fabio Bas
ee3731717c
Fixed button labels
2014-11-20 09:15:58 +01:00
Matt Lowe
916735d613
Merge branch 'master' into newsearchbar
2014-11-19 22:21:43 +01:00
Fabio Bas
f48f386f35
Sets window: implemented save and restore buttons
2014-11-19 22:18:41 +01:00
Fabio Bas
ac43fa23b9
Better handle the TK set used for tokens
...
Let oracle add a basic TK set in cards.xml
Unify all the code previously using the string literal “TK”
2014-11-19 19:44:54 +01:00
Fabio Bas
8542d875d3
Sets dialog: new columns and sorting
...
Added "order key", "set type" and "release date" columns
Use a proxy model to sort the table
made the dialog wider accordingly
2014-11-19 18:09:37 +01:00
Matt Lowe
d467cc8b01
QT_VERSION check now checks for correct version
...
Feature is only included in Qt 5.3+
2014-11-18 18:14:47 +01:00
Matt Lowe
a2c4a1e537
Action: Move Bottom Card to Graveyard
...
Created menu action to move card from the bottom of the library to the
graveyard. Qt accelerator key is "i". #125
2014-11-15 16:35:30 +01:00
Gavin Bisesi
438d4e4661
Merge pull request #417 from poixen/newsearchbar
...
Updated Search Bar Style
2014-11-14 10:19:24 -05:00
woogerboy21
6811819161
Don't remove card images from revealed decks
...
Revealed library had write access, which meant that the user would see cards being removed from the zone as the other player drew cards. The cards were not the actual ones drawn, just the ones at the same index, so no information was leaked.
Fix #297
2014-11-13 20:31:55 -05:00
Matt Lowe
62b7890e59
Cards Scale with mouse over action
...
Cards now scale up by 10% when mouse over.
2014-11-12 23:26:24 +01:00
Matt Lowe
f58cc32ef4
Added version check
...
Added version check, to only include the new Searchbar icon for Users
running Qt 5+
2014-11-10 22:14:27 +01:00
Gavin Bisesi
277c050d76
Merge pull request #421 from ctrlaltca/even_more_pictures
...
Add fallback urls for cards without a muId set
2014-11-10 10:27:47 -05:00
Fabio Bas
cb37073828
Oracle: fetch release date and set type
...
and save them in cards.xml
2014-11-10 16:22:46 +01:00
Matt Lowe
33a6e3c5c0
Removed hard coded CSS
...
Hard coded CSS might have a slight chance of not rendering the same
across all platforms. More research needs to be performed. Until then I
have removed the hard coded search bar customization.
2014-11-10 08:49:24 +01:00
Fabio Bas
fc1d06e13b
Add fallback urls for cards without a muId set
...
We only have a good HQ source for them; any idea on a low-quality
source?
2014-11-10 00:23:41 +01:00
Gavin Bisesi
a320af70da
Merge pull request #418 from ctrlaltca/osx_info_plist
...
OSX: Add proper infos to info.plist
2014-11-09 17:34:35 -05:00
Gavin Bisesi
6b1df247d1
Merge pull request #415 from ctrlaltca/no_pictures_yet
...
Rework the picture download behavior
2014-11-09 17:16:00 -05:00
Fabio Bas
c0ee060af4
Fixed vendor name
2014-11-09 23:14:36 +01:00
Gavin Bisesi
b3715c5da2
Merge pull request #416 from poixen/partialsearch
...
Partial Card Name Search
2014-11-09 17:08:02 -05:00
Fabio Bas
da46996294
Fix #408
...
Gray out "only buddies/only reg users" in the “create game” dialog if
the user is unregistered
2014-11-09 22:12:55 +01:00
Fabio Bas
a716d73a42
OSX: Add proper infos to info.plist
...
fixes #411
2014-11-09 21:03:10 +01:00
Matt Lowe
eef4a621b3
Updated Search Bar Style
...
Please note that I don't feel that the search bar needs to be skinned by
users, hence why it is not part of the large css-skinning project. I
also feel that given the PR #416 a new search bar with highlight the new
search functionality.
Updated the look of the search bar:
+ larger, curved edges
+ changes color when has focus
+ search icon built into search
- removed "Search For" text in lieu of search icon
2014-11-09 12:04:09 +01:00
Matt Lowe
0589f02ca2
Partial Card Name Search
...
+ Card searches now do partial string matches, rather than needing to
match the beginning of the string.
2014-11-09 11:23:45 +01:00
Fabio Bas
4b8ac99370
Corrected spacing
2014-11-08 15:52:04 +01:00
Fabio Bas
8ca0b96d10
Rework the picture download behavior
...
Should fix #412
2014-11-08 15:08:49 +01:00
Gavin Bisesi
8d2e5d3c43
Merge pull request #306 from Mawu3n4/translation
...
French translation
2014-11-07 10:11:53 -05:00
Gavin Bisesi
8f801825a9
Merge pull request #379 from poixen/uicolors
...
Changed UI colors
2014-11-05 15:45:53 -05:00
Gavin Bisesi
5ad869c636
Merge pull request #378 from poixen/animation
...
Card Animation performance improvement
2014-11-05 15:45:24 -05:00
Gavin Bisesi
67db347d12
Merge pull request #366 from poixen/removeoldimages
...
Resource cleanup
2014-11-05 15:31:17 -05:00
poixen
967e1a469e
Removed comments
...
- Removed comments as-per request
2014-11-05 14:10:30 +01:00
poixen
accd3ecca1
Removed commented line
...
- removed unused commented out code
2014-11-05 14:03:43 +01:00
Matt Lowe
332d69a1a5
Removed comment
...
+ removed getters and setters comment
2014-11-03 17:19:12 +01:00
Matt Lowe
097090ac1c
Updated static variable name
...
+ Updated DELTA variable to more suitable name:
ROTATION_DEGREES_PER_FRAME
2014-11-03 16:33:48 +01:00
Matt Lowe
c130ee92fa
Additional comment
...
+ Added additional comment explaining what DELTA is.
2014-11-03 14:39:51 +01:00
Zack
66aba2eec7
Merge remote-tracking branch 'upstream/master' into translation
2014-10-22 11:18:54 +02:00
Gavin Bisesi
07cccda17b
Merge pull request #377 from poixen/newhandsvg
...
Updated hand.svg
2014-10-20 10:28:58 -04:00
Matt Lowe
80fd0fbcf3
Removed inline logic
...
Removed inline logic to static variable, slight performance increase.
2014-10-17 00:17:44 +02:00
Matt Lowe
41478800ef
Updated Sideboard gradient colors
...
Wasnt happy with the first gradient, too much white. Now uses 2 shades
or purple.
2014-10-16 18:15:07 +02:00
Matt Lowe
a1c013a893
Updated UI features
...
+ Added a fade to inactive players TableZone
+ Refreshed TableZone, HandZone and DeckView default background colors
2014-10-16 18:14:51 +02:00
Matt Lowe
2193d247d0
Improved card animation performance
...
+ Cards now animate smoother and faster
+ removed redundant computations performed each frame
2014-10-16 18:06:30 +02:00
Matt Lowe
dc58d1a61e
Shortened animation time between phases
...
+ changed from 50ms to 25ms between update calls.
2014-10-16 18:05:49 +02:00
Matt Lowe
03f79887c4
Updated Hand image
...
Looking at the client I saw the cockatrice was still on the card back. I
have now removed it.
2014-10-14 22:43:14 +02:00
Fabio Bas
e0d76b60d0
Change button label and made it translatable
2014-10-14 22:02:42 +02:00
Fabio Bas
82a3deec30
Add a button in the sounds settings to play a test sound
2014-10-14 21:13:16 +02:00
Fabio Bas
9ef4d79c33
Install the audio/* plugins under windows and osx
2014-10-14 21:13:04 +02:00
Gavin Bisesi
8dbb2d8e6f
Merge pull request #364 from ctrlaltca/win32_openssl_cmake
...
Deploy openssl libraries under win32
2014-10-14 14:03:32 -04:00
Gavin Bisesi
a26d4078cc
Revert "Find cards by prefix"
2014-10-14 11:28:30 -04:00
Zack
2c74524f59
fix: missing message closing tag
2014-10-12 16:43:35 +02:00
Matt Lowe
299283aa2e
Resource cleanup
...
Removed some unused resource files.
2014-10-10 23:00:05 +02:00
Fabio Bas
dfb8be79cf
Fix installation of libeay32.dll, ssleay32.dll while compiling the PACKAGE target
2014-10-10 17:22:29 +02:00
Zack
9169d3a804
fix: conflicts && add: new translation
2014-10-10 14:56:05 +02:00
Fabio Bas
6f25e09132
Deploy openssl libraries under win32
...
They are needed to fetch prices from deckbrew and possibly, in the
future, for ssl server connections
2014-10-10 14:12:30 +02:00
Gavin Bisesi
6810ae46d6
Merge pull request #260 from Mawu3n4/master
...
Find cards by prefix
2014-10-09 11:29:02 -04:00
Gavin Bisesi
4070ba8e26
Merge pull request #352 from poixen/image-refresh
...
Image refresh
2014-10-09 11:27:47 -04:00
Gavin Bisesi
006451f402
Merge pull request #238 from arxanas/no-overwrite-tokens-xml
...
Fix #231 : tokens.xml no longer overwritten by cards.xml.
2014-10-06 11:34:58 -04:00
Matt Lowe
e240e47d2f
Fixed svg for icon
...
For some reason there was an issue with making the creature image white,
i found a workaround. Icon should now display correctly.
2014-10-03 19:02:40 +02:00
Matt Lowe
7cdd2a26f6
Icon changes
...
+ added updated mac icon that was missing
~ resized cockatrice.png
2014-10-03 19:02:27 +02:00
Matt Lowe
294edb3295
Logo and card back refresh
...
~ Updated the back of the card, cleaner lines, slightly more modern.
~ Updated game icon/logo
2014-10-03 19:02:12 +02:00
Gavin Bisesi
277aba79dc
Merge pull request #336 from poixen/master
...
Tokens use PT levels from cards.xml if available
2014-10-02 15:00:17 -04:00
Antony Woods
1f58f7d848
Changed 'value' to 'setValue' on line 275
2014-10-02 08:48:04 +01:00
Gavin Bisesi
b32aeb2211
Merge pull request #280 from pliu037/remove-.full-req
...
Support images without .full suffix
2014-10-01 13:50:02 -04:00
Matt Lowe
e3a94ecca3
Token PT is now set to DB values if not defined in event.
2014-10-01 19:20:42 +02:00
Gavin Bisesi
7eed007f14
Merge pull request #281 from ctrlaltca/fix_202
...
Fix crash #202
2014-09-30 20:35:11 -04:00
Matt Lowe
a80ccd882c
Tokens use PT levels from cards.xml if available
...
I added a check to see if the event PT is empty, if it is, we try and
use the PT from the cards.xml. In resp to issue #330 .
2014-10-01 00:57:07 +02:00
Fabio Bas
eaad8de8d0
Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers
2014-09-29 18:25:10 +02:00
Gavin Bisesi
b5de708756
Merge pull request #289 from acron0/auto-connect
...
Added 'auto connect' checkbox to connect dialog.
2014-09-29 10:24:06 -04:00
Jan Martin
6f97e59c03
Change default scry to 1.
2014-09-19 21:41:57 +10:00
Zack Dibe
8928a699f9
fix: grammar in french translation
2014-09-11 23:44:52 +02:00
Mawu3n4
54e3867c72
finish fr translation
2014-09-11 15:18:40 +02:00
Mawu3n4
466f5ae5e1
add: FR translations and fix bad grammar
2014-09-11 15:17:35 +02:00
Yuki Izumi
fefb6fc612
Add sideboard helpers.
2014-09-11 12:56:27 +10:00
Antony Woods
f1b012c83d
Adding modified translation files
2014-09-09 17:30:37 +01:00
Antony Woods
dbe46084ac
Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect
2014-09-09 17:22:55 +01:00
Fabio Bas
d6b97976f9
Refreshed all translation files
2014-09-06 10:40:23 +02:00
Fabio Bas
a0b35ee60b
Cockatrice - CMake: Include all existing translation files using a glob
2014-09-06 10:38:59 +02:00
Fabio Bas
e5eda9f172
Add a UPDATE_TRANSLATIONS options that actually updates translations!
2014-09-04 16:15:01 +02:00
Antony Woods
ab83d6185a
Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog
2014-08-29 16:53:30 +01:00
Antony Woods
b381298981
Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point.
2014-08-27 21:25:11 +01:00
James Turner
f06d2123fc
Remove invalid character
2014-08-19 17:39:05 -04:00
Peng Liu
a83e6cdf48
Removed unused variable, bool stripped, from classes and functions.
2014-08-11 13:47:47 -04:00
Gavin Bisesi
134810b979
Merge pull request #279 from ctrlaltca/valgrind_unified
...
Fixed Valgrind warnings
2014-08-11 09:11:12 -04:00
Fabio Bas
23a3b8364c
Merge remote-tracking branch 'upstream/master' into fix_202
2014-08-11 15:07:43 +02:00
Gavin Bisesi
5c46cfc169
Merge pull request #179 from woogerboy21/registered-user-only-server
...
Registered Only Server
2014-08-11 09:03:57 -04:00
Fabio Bas
484a6e8bdc
Fix crash #202
2014-08-11 10:50:55 +02:00
Peng Liu
781460d6ac
Cockatrice can now load images both with and without .full. Will need to clean-up bool stripped (used to determine .full suffix inclusion).
2014-08-11 04:37:00 -04:00
Fabio Bas
1da2e7154c
Fixed Valgrind warnings
...
Running cockatrice in valgrind i didn't found any bad memory leak
(good!), but only a few jumps depending on uninitialized variables.
Even if the possibility of crashes are remote, it's nice to sort them
out.
2014-08-11 10:08:33 +02:00
Gavin Bisesi
8b32a1010a
Merge pull request #265 from pliu037/clear-downloaded-pics
...
Clear downloaded images from settings
2014-08-10 13:34:14 -04:00
Mawu3n4
d55f6fdec1
fix: show card only found once by prefix
2014-08-08 14:24:29 +02:00
Daenyth
765e865aa2
Continue downloading card images after failing url on one.
...
I should probably bust this out to a method.
2014-08-08 09:33:38 +02:00
Daenyth
42f1c6938f
Merged: First draft of better pic url error handling
...
Cherry-picked b9cb61abd05f83c67740aafa5e1e6939143547e4
2014-08-08 09:33:35 +02:00
Fabio Bas
bba8184d37
Fix off by one
2014-08-07 23:14:57 +02:00
Fabio Bas
88dfea8ece
Don't save card pictures if we don't have a proper set name for it
2014-08-07 23:14:50 +02:00
Fabio Bas
3bce98e3a9
Fix crashes trying to load the picture of a card with no <set>
2014-08-07 23:14:41 +02:00
Peng Liu
d3459aabf9
Moved the button from the paths section to be below the "Download high-quality card pictures" checkbox. Button now reads "Reset/Clear Downloaded Pictures". Removed "Path to"s from card/token database, hand/stack/table/player info background, and card back labels.
2014-08-07 14:35:18 -04:00
Peng Liu
ae80752497
Added notification messages informing users of the success or failure of clearing downloaded images.
2014-08-07 14:00:59 -04:00
Waleed Khan
ffc5b59fec
Fix #258 : Dashes to spaces.
2014-08-07 12:29:20 -04:00
Peng Liu
674005383b
Added a button and the functionality to clear all downloaded images (all images within subfolders at picsPath/downloadedPics) under Settings.
2014-08-07 12:09:42 -04:00
Mawu3n4
10ab53c4ac
fix: find by prefix if card not found only
2014-08-07 17:43:14 +02:00
Waleed Khan
c0d4669088
Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml
...
Conflicts:
cockatrice/src/carddatabase.cpp
2014-08-07 11:06:41 -04:00
Dibe Zackaria
9092f2298b
fix: remove auto
2014-08-06 20:27:04 +02:00
Dibe Zackaria
e8abd6eb63
fix: typo
2014-08-06 20:13:59 +02:00
Mawu3n4
7d190ddaf7
fix: pushed old version
2014-08-06 18:01:47 +02:00
Mawu3n4
621a47de9c
add: find token cards by prefix
2014-08-06 17:54:47 +02:00
Gavin Bisesi
ef1fbc0db9
Merge pull request #256 from pliu037/handle-PNGs-2
...
Handle PNGs (and other image formats)
2014-08-06 10:42:15 -04:00
Fabio Bas
6502a182e8
Support loading of files with wrong extension
...
Like M15’s .png that cockatrice wrongly saved as .jpg
Additionally, move the QImageReader declaration outside of the inner
loop
2014-08-06 09:31:22 +02:00
Peng Liu
4bb1d28ae7
Removed the QLists for determining image format. Instead, using QImageReader, both when downloading/saving and when loading, to determine the correct format (Cockatrice now supports all QImageReader-supported formats).
...
Image loading still uses one for loop to iterate through the QList of paths to folders in which to search for images.
2014-08-05 14:54:40 -04:00
Peng Liu
8587b8c349
Refactored the magic bytes into two QLists: one containing a list of QStrings representing the supported extensions, the other containing a list of QByteArrays representing the magic bytes in hex.
...
Refactored the image loading loop to be two nested for loops: the outer loop iterating through the QList of paths to folders in which to search for images and the inner loop iterating through the QList of supported extensions.
2014-08-05 03:48:30 -04:00
Peng Liu
75122c3c9d
Switched back to using QFile instead of QImage for saving as QImage's save function adds overhead to the file size, leaving me unsure whether the original image is affected.
2014-08-04 17:01:58 -04:00
Peng Liu
387086cb4c
Added support for PNG images (both for downloading/saving and loading).
2014-08-04 16:43:57 -04:00
Fabio Bas
3667ab504c
Fix compilation warning introduced in #246
...
/cockatrice/src/main.cpp:162:16: warning: format string is not a string
literal (potentially insecure) [-Wformat-security]
qDebug("Could not create " +
settingsCache->getPicsPath().toUtf8() + "/CUSTOM. Will fall back on
default card images.");
2014-08-04 20:09:53 +02:00
Gavin Bisesi
8d482245ff
Merge pull request #251 from arxanas/case-insensitive-tokens
...
Fix #248 : the token dialog generates cards irrespective of their case and punctuation
2014-08-04 10:50:25 -04:00
Peng Liu
a9eaf65a82
Changed .toLatin1() to .toUtf8().
2014-08-02 23:44:31 -04:00
Waleed Khan
309494111c
Fix #248 : the token dialog generates cards irrespective of their case and punctation.
2014-08-02 19:32:24 -04:00
Peng Liu
b3fa99ef36
I was too hasty and forgot a + and to toLatin1() a QString in the qDebug arg.
2014-07-31 23:24:25 -04:00
Peng Liu
077d9f2745
Checks if CUSTOM folder was successfully created. If not, prints qDebug message and proceeds as normal except uses default card images instead of custom ones.
2014-07-31 22:42:13 -04:00
Gavin Bisesi
ffed0e00fe
Merge pull request #214 from pliu037/master
...
Added better support for custom card images
2014-07-31 13:42:57 -04:00
Gavin Bisesi
ca6bd669ce
Merge pull request #233 from ctrlaltca/regression_card_picurl
...
Add back support for custom picture urls in cards.xml
2014-07-31 11:30:26 -04:00
Gavin Bisesi
7d5ce6f0ef
Merge pull request #235 from ctrlaltca/offline_users_menu
...
Disable some usercontextmenu actions if the user is offline; fix #234
2014-07-30 15:49:43 -04:00