Commit Graph
100 Commits
Author SHA1 Message Date
ctrlaltcaandGitHub ebc881fa1c fix #3523 (#3524) 2019-01-27 11:42:22 +01:00
ctrlaltcaandZach H ed70099e36 Rework of the card database, xml format and oracle parser (#3511)
* CardDB: merge all card properties in a new structure

* Pre Json parser changes

 * Cockatrice: use qt's builtin json support
 * Move qt-json src dir from cockatrice to oracle
 * Add dummy cockatricexml4 parser (yet to be implemented)

* Implement a new parser and xml format

 * cockatricexml4: new xml parser following the "generic properties hash" pattern;
 * oracleimporter: refactor the parsing code to better adapt to cockatricexml4; rewrote split cards parsing
 * carddb: change "colors" from a stringlist to a string
 * carddb: move the getMainCardType() method to the cockatricexml3 parser
 *

* CardInfo: show all properties (stil missing: nice name + translation)

* Rework the "add related card" feature so that it doesn't change the card name in the carddb

Also, fix token count display

* Picture loader: Added support for transform cards

* Fix side information for flip cards

Mtgjson uses side a/b for flip cards, while scryfall doesn't

* Pictureloader: dynamic tag resolution from card properties

Examples old => new
* !cardid! => !set:muid!
* !uuid!   => !set:uuid!
* !collectornumber! => !set:num!
New examples:
 * !prop:type!
 * !prop:manacost!

* Start moving mtg-related property names to a specific file

* Clangify

* Fix tests

* Make gcc an happy puppy

* Revert "Make gcc an happy puppy"

This reverts commit 446ec5f27516c4d3b32dbfc79557f4827c5c5bdf.

* Some gcc fixes

* Share set list between different db parsers, so they won't overwrite one each other

* All glory to the hypnoclangifier!

* Fix test compilation

* Cleanup edited files in the prior PR. (#3519)

* Cleanup edited files in the prior PR.

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* Fix includes

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* Update carddatabase.h
2019-01-23 18:17:10 -05:00
ctrlaltcaandGitHub 19180243aa Workaround fedora compilation problem on Travis; fix #3508 (#3512)
* attempt fix fedora by downgrading qt

* fix
2019-01-22 10:28:20 +01:00
ctrlaltcaandZach H 273d5d89b7 Fix shortcuts on mac; fix #3482 (#3491)
* hopefully fix #3482

* Travis:uUse the most recent osx_image; use homebrew support in travis
2019-01-08 15:20:29 -05:00
ctrlaltcaandZach H 4eda7cda9e Make deck editor filter translatable ; extracted new translations; Fix #3488 (#3490)
* Fix #3488 ; extracted new translations

* Make operators translatable, too
2019-01-07 21:50:36 -05:00
ctrlaltcaandGavin Bisesi 463ef13fe0 Update version to 2.6.2 (#3492)
## Short roundup of the initial problem
We released 2.6.2, but CMake still thinks it's 2.6.1

## What will change with this Pull Request?
Update CMake version to 2.6.2
2019-01-07 09:12:27 -05:00
ctrlaltcaandZach H 2621cc09ac Optimize json parsing (#3480) 2018-12-30 19:05:40 -05:00
ctrlaltcaandZach H 65f41e520e [WIP] Basic mtgjsonv4 support (#3458)
* Basic mtgjsonv4 support

* Fix set type

* [WIP] Oracle: use zx instead of zip

* clanfigy fixes

* Fix reading last block of xz

* Added back zip support

* [WIP] adding xz on ci + fixes

* typo

* resolve conflict

* Make gcc an happy puppy

* test appveyor build

* appveyor maybe

* Appveyor: add  xz bindir

* Update ssl version (the old one is not available anymore)

* Windows is a really shitty platform to code on.

* test vcpkg

* again

* gosh

* nowarn

* warning 2

* static

* Maybe

* cmake fix

* fsck this pain

* FindWin32SslRuntime: add vcpkg path

* Appveyor: cache support, force usable of openssl from vcpkg

* updated as suggested

* ouch

* Import card uuids and expose this property as !uuid! for card image download

* Minor style fixes

* address changed URL
2018-12-20 18:05:03 -05:00
ctrlaltcaandGitHub 638ee1af4a This should fix appveyor compilation (#3434) 2018-11-12 18:50:38 +01:00
ctrlaltcaandGitHub 1415a4dafa Fix servatrice linking under FreeBSD - fix #3376 (#3377)
Fix servatrice linking under FreeBSD - fix #3376
2018-09-06 12:20:20 +02:00
ctrlaltcaandGitHub b61c07a205 Check for both 32 and 64bit cockatrice when uninstalling (#3323) 2018-07-12 23:58:56 +02:00
ctrlaltcaandGitHub c01aad6767 Travis: minor changes (#3321)
Use the xenial version of llvm's toolchain for clang-format
Add qt5.5's websocket library for servatrice
2018-07-11 17:43:33 +02:00
ctrlaltcaandGitHub dc727cb620 NSIS: misc fixes [wip] (#3300)
NSIS: misc fixes
2018-06-25 18:34:58 +02:00
ctrlaltcaandZach H 2354a6f89d Fix cards loading bug (#3307) 2018-06-24 17:49:26 -04:00
ctrlaltcaandZach H e223f07462 fix #3235 (#3302) 2018-06-21 18:56:53 -04:00
ctrlaltcaandGitHub f70e87c5a0 Fix #3285 (#3299) 2018-06-19 22:55:01 +02:00
ctrlaltcaandtooomm 0b3e86e307 Fix "reinstall" button in updater, fix #3293 (#3297) 2018-06-19 19:57:44 +02:00
ctrlaltcaandtooomm a5ea4f7da2 Add ability to edit chat macros, Fix #3296 (#3298) 2018-06-19 19:15:13 +02:00
ctrlaltcaandGitHub 1276c8dd46 Add -DWARNING_AS_ERROR=1 option to cmake script (#3275) 2018-06-06 08:43:04 +02:00
ctrlaltcaandZach H 89ab7f1f67 Fix #3252 (#3269) 2018-06-02 02:41:10 -04:00
ctrlaltcaandGitHub f97959febc fix #3257 (#3258) 2018-05-24 15:46:02 +02:00
ctrlaltcaandGitHub 4cdd17945d Servatrice: make listening host configurable; fix #3241 (#3242)
* fix #3241

* clangify
2018-05-12 23:54:03 +02:00
ctrlaltcaandGitHub c06fc562a1 Cmake scripts refactoring; fix #3225 (#3230)
* fix #3225

* Servatrice: use websockets as an optional component (for qt < 5.3)

* Attempt++
2018-05-12 23:28:22 +02:00
ctrlaltcaandZach H a7f4aace9c Extract the xml parser from carddatabase (#3223) 2018-05-04 03:46:08 -04:00
ctrlaltcaandZach H 2780270911 macOS: fix qt plugin installation (#3216)
* Osx: fix qt plugin installation

* Add make install step to travis debug build

* only install under osx

* Add "styles" plugins (for native look'n'feel)

* Osx: upgrade qt from 5.5 to current (5.10.1)

* Fix osx on travis

The qt homebrew formula now installs three qt* symlinks (qt, qt5, qt5@5.x) so we can't use/don't need bash globbing anymore
2018-05-02 15:57:35 -04:00
ctrlaltcaandZach H 37ab7b8fb1 Add a note about bug #3135 (#3184) 2018-04-09 16:47:08 -04:00
ctrlaltcaandGitHub 6374d157fc Fix Appveyor builds (#3151)
* fix appveyor builds
2018-03-24 16:05:08 +01:00
ctrlaltcaandZach H 517420cccb Replace CardInfo* and Carset* with smart pointers (#3053)
* Replace CardInfo* and Carset* with smart pointers

* fixes to help memory & c++11 stuff
2018-02-02 12:52:47 -05:00
ctrlaltcaandZach H 994a643d9c Travis: enable ccache usage under macOS; halves compilation time (#3052) 2018-01-27 13:43:48 -05:00
ctrlaltcaandZach H e127cb74b6 Fixed most issues from codacy (#3050) 2018-01-27 13:31:44 -05:00
ctrlaltcaandGitHub b29bd9e070 Clang-format (#3028)
* 1/3 Add .clang-format file and travis compilation check

* 2/3 Run clang-format

* 3/3 Fix compilation problems due to include reordering

* 3bis/3 AfterControlStatement: false
2018-01-27 10:41:32 +01:00
ctrlaltcaandGitHub 55029b6b68 Travis: remove sudo (#3037) 2018-01-20 16:50:06 +01:00
ctrlaltcaandGitHub 3a11aebb21 windows/appveyor compilation updates (#3020) 2018-01-17 18:20:05 +01:00
ctrlaltcaandZach H cd558a9722 Even out db collation to utfmb4_unicode_ci; fix #2835 ; fix #2218 (#2915) 2018-01-13 04:02:22 -05:00
ctrlaltcaandGitHub 3af2be4539 removed win xp support; update qt to 5.9 for win 32bit (#2975) 2017-12-19 09:09:20 +01:00
ctrlaltcaandZach H 4baaf978f5 Deck editor: force default file extension on file save; fix #2829 (#2910) 2017-10-31 15:34:56 -04:00
ctrlaltcaandGitHub 6b6ba9a8f1 Update translations (#2890)
* Translations

* update and test codacy change
2017-10-09 19:16:23 +02:00
ctrlaltcaandGitHub ff6b0f86ec Appveyor updates (#2885)
* Appveyor updates

Remove unused stuff (mysql, choco)
Use MSVC 2015
Upgrade Qt to 5.9, protobuf to 3.4.1

* stick qith qt 5.6 for winxp 32bit compatibility; zlib test

* Appveyor is using a randmon clone path for pulls, get it from an env variable
2017-10-05 08:38:09 +02:00
ctrlaltcaandZach H 7875407795 servatrice: case-insensitve check for email and token challenge; fix #2857 (#2860) 2017-09-28 15:34:35 -04:00
ctrlaltcaandGitHub ccee0aa3fd Cmake: remove old unneeded POLICIES (fix Appveyor) (#2859) 2017-09-22 17:47:05 +02:00
ctrlaltcaandGitHub 1366e5970e Portable mode for windows (#2794)
* Portable mode for windows

* fix start menu in portable mode

* Make gcc an happy puppy

* Clean old installation if we are installing over an old portable mode installation

* Default to Desktop\CockatricePortable

* Settings dialog fixes

* wording
2017-07-08 11:22:29 +02:00
ctrlaltcaandZach H 03a7a9fafb Webclient: fix some bugs (#2742)
* Handle room join and leave events + case sensitive userlist sort; fix #2307

* Webclient: add autoscroll, but only if already at the bottom; fix #2306
2017-05-31 23:04:59 -04:00
ctrlaltcaandGitHub f75caa7245 Webclient overhaul (#2735)
Migrate from protobuf.js 5.x to 6.x (remove long.js and bytebuffer.js)
Upgrade jQuery from 1.x to 3.x
Upgrade jQueryUI to 1.12.x
Use minimized version of js libraries
Disable debug messages
Fix default value for Event_RoomSay’s RoomMessageType field
2017-05-29 14:12:36 +02:00
Fabio Bas a4e78bbfa2 remove debug 2017-05-05 15:23:59 +02:00
Fabio BasandZach H 36f6907fa3 Improved token loading 2017-05-04 23:28:51 -04:00
ctrlaltcaandGitHub 3c5e38bd14 Hide some icons for spectators; fix #2589 (#2656)
* fix #2589

* Additional fix
2017-04-29 15:06:30 +02:00
ctrlaltcaandGitHub b20c60e603 fix #2332 (#2650) 2017-04-29 12:21:37 +02:00
ctrlaltcaandZach H df211748ca Add clear button to deck editor (#2654) 2017-04-26 15:20:35 -04:00
ctrlaltcaandZach H ce77d51a8f Fix crash on logger; make log window modalless (#2659) 2017-04-26 15:05:24 -04:00
Fabio Bas 2c551bdd35 Revert "fix #2332"
This reverts commit 0fd77346df.
2017-04-25 19:35:07 +02:00
Fabio Bas 0fd77346df fix #2332 2017-04-25 18:58:01 +02:00
ctrlaltcaandGitHub a46c7156dd fix_crash (#2649) 2017-04-25 18:13:45 +02:00
ctrlaltcaandZach H 3c54499a40 sort edit sets better (#2648) 2017-04-25 11:40:47 -04:00
ctrlaltcaandZach H 160d66d890 show tokens all sets (#2646) 2017-04-25 11:32:51 -04:00
ctrlaltcaandZach H 3f3839d70a fix deck card backs (#2645) 2017-04-25 11:32:00 -04:00
ctrlaltcaandZach H ab94d2c91d Token Dialog Revamp (#2639) 2017-04-25 00:29:57 -04:00
ctrlaltcaandZach H 8ad448a23c fix #2600 (#2638) 2017-04-25 00:29:32 -04:00
ctrlaltcaandGitHub acb40bc738 Fix #2608; fix #2609; fix #2611 (#2636) 2017-04-24 22:20:44 +02:00
ctrlaltcaandGitHub f2a887a6a4 fix #2623 (#2634) 2017-04-24 22:20:19 +02:00
ctrlaltcaandGitHub 29904c49da Specify reason when on game leave; fix #2624 (#2633)
* fix #2624

* feedback++
2017-04-24 22:20:08 +02:00
Fabio Bas 38ad71b06a fix ox compilation 2017-04-24 21:59:09 +02:00
Fabio Bas 7f057612bf possibily fix osx shortcut problem 2017-04-24 20:39:11 +02:00
ctrlaltcaandGitHub 9d2494e6e2 Update README.md adding link to guidelines; fix #2627 (#2635) 2017-04-24 15:52:30 +02:00
ctrlaltcaandGitHub 3e12a5f67f Update CONTRIBUTING.md (#2613)
* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

"wait for CI upload" should be "wait for CI to upload"
"update again the version number" should be "update the version number again"
2017-04-21 14:26:55 +02:00
ctrlaltcaandGitHub 3356b2ede7 Change version in about window and installer name (#2570)
* Change version in about window and installer name

* Change version in about window and installer name

* Cmake get version updates

* dev snapshot format changed

* alignment changes
2017-04-20 13:41:18 +02:00
ctrlaltcaandGitHub 6e723b2a99 translations (#2469) 2017-03-14 00:04:26 +01:00
ctrlaltcaandGitHub 2817f54c96 Fix issues with new updater; fix #2465 (#2468)
* fix #2465
2017-03-13 23:21:15 +01:00
ctrlaltcaandGitHub f9a025081a fix #2445 (#2458) 2017-03-12 18:23:58 +01:00
ctrlaltcaandGitHub 877a5ca3b1 fix_2449 (#2459) 2017-03-12 18:21:49 +01:00
ctrlaltcaandGitHub 0d34fc5df2 fix_2424 (#2461) 2017-03-12 18:21:30 +01:00
ctrlaltcaandGitHub 160c4cea6b Translations (#2430) 2017-03-01 10:18:56 +01:00
ctrlaltcaandGitHub 7373819c32 Add release channels for autoupdater (#2362)
Fetch releases from github and find corresponding installers on bintray
2017-03-01 09:43:09 +01:00
ctrlaltcaandGitHub 651128257f Webclient: make account fields more user friendly (#2363)
* fix_2310

* Remove Gender

Removes gender
2017-02-19 15:07:51 +01:00
ctrlaltcaandGitHub ae5fc1fe2c Fix use of uninitalized value (#2364) 2017-01-16 21:06:35 +01:00
ctrlaltcaandZach H d45293489f Git: Force short commit hash length to 7 chars (#2361) 2017-01-15 08:12:05 -05:00
ctrlaltcaandGitHub a1840ea9d3 translations galore (#2245) 2016-10-29 11:31:35 +02:00
ctrlaltcaandZach H b808d3824b don't use corrected name when downloading card (#2164) 2016-10-22 19:07:58 -04:00
ctrlaltcaandGitHub 989c91f1d1 [ci skip] Don't send connection form when enter is pressed on the host autocompleter (#2225) 2016-10-18 14:47:54 +02:00
ctrlaltcaandGitHub c3ef53d6fd Removed unused class (#2222) 2016-10-18 14:34:11 +02:00
ctrlaltcaandGitHub 40468a79ea Merge branch 'master' into CleanupMaxUserCheck 2016-10-17 12:27:20 +02:00
ctrlaltcaandGitHub f20e2ce2bd Merge pull request #2185 from tritoch/pending-mtgjson-Ae
Pending mtgjson/gatherer Æ-->Ae conversion
2016-10-14 14:07:19 +02:00
ctrlaltcaandGitHub e4127fead3 Merge pull request #2199 from wincinderith/load-remote-fix
Disable "Load remote deck..." button in local game
2016-10-05 14:25:50 +02:00
ctrlaltcaandGitHub d8f7c57eff Fixed travis build on osx 2016-10-05 14:24:50 +02:00
ctrlaltcaandGitHub 65c98c8422 Merge pull request #2179 from ctrlaltca/fix_gtest
fix google tests
2016-09-20 22:39:35 +02:00
ctrlaltcaandGitHub c4bb16e74b Merge pull request #2175 from Cockatrice/add_new_pub_server
add mtg.tetrarch.co server
2016-09-20 22:28:54 +02:00
ctrlaltcaandGitHub 54cc0c2af6 Merge pull request #2178 from ctrlaltca/translations
Updated translations
2016-09-20 22:27:17 +02:00
Fabio Bas 0e8206a36f Updates translations 2016-09-20 22:23:36 +02:00
Fabio Bas 018a4736c6 fix google tests 2016-09-20 21:50:32 +02:00
ctrlaltcaandZach H 7f28a7e844 Fix #601; Fix #725 (#2126)
Analyze deck on tappedout
Fix small bug in deckstats interface
2016-09-02 01:34:56 -04:00
ctrlaltcaandZach H 680277ad6a fix #2129 (#2132)
Remove selection move at all
2016-08-31 14:13:30 -04:00
ctrlaltcaandGitHub 8571815cbd Merge pull request #2134 from ctrlaltca/fix_1992
Renamed !setnumber! to !collectornumber!
2016-08-27 10:02:58 +02:00
Fabio Bas ae456a5bc3 Renamed !setnumber! to !collectornumber! 2016-08-20 10:27:23 +02:00
ctrlaltcaandGitHub da2eb97c7b Merge pull request #2125 from ctrlaltca/fix_1762
Fix clipboard behavior in deck editor and game
2016-08-10 09:23:33 +02:00
ctrlaltcaandGitHub ac841ee2c6 Merge pull request #2117 from ctrlaltca/fix_2088
Webclient: misc improvements (was: parse html in server message)
2016-08-09 11:14:01 +02:00
Fabio Bas c321227fa7 Fix clipboard behavior in deck editor and game 2016-08-09 11:13:36 +02:00
Fabio Bas a68df3611b Fix #2088
Add an autocomplete with known server names to the connect dialog;
Added support for server messages (identification, shutdown, user
warning and promotion)
Connection dialog’s inputs are now wider
Only declare implemented client features
Added check for protocol version on connect before login
Avoid listbox being rendered as dropdown on mobiles
2016-08-09 10:39:03 +02:00
ctrlaltcaandZach H 0f0f9a1246 fix #2118 (#2119) 2016-08-02 21:58:56 -04:00
ctrlaltcaandGitHub 1834e09c0f Merge pull request #2115 from Cockatrice/single_game_types
Radio buttons for game types
2016-07-30 10:31:04 +02:00
ctrlaltcaandGitHub 8644016d3c Merge pull request #2114 from ctrlaltca/fix_2107
Webclient: Fix room closing on disconnect
2016-07-26 12:50:39 +02:00
Fabio Bas 8eb36fa2f1 fix #2107 2016-07-26 12:49:07 +02:00