gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
3,881 Commits 53 Branches 176 Tags
c06fc562a10d8037089ea2991d95a4757953e776
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ctrlaltcaandGitHub 2cbfc5a8e6 Merge pull request #2096 from ctrlaltca/fix_2091 
Fix infinite loop on local game close
 2016-07-24 12:29:03 +02:00
Fabio Bas d61d9c98a0 Avoid locking on local server shutdown 2016-07-20 16:53:57 +02:00
ctrlaltcaandGitHub b28b174056 Merge pull request #2097 from ctrlaltca/fix_shutdown 
Remove additional minute in server shutdown
 2016-07-19 13:21:33 +02:00
Fabio Bas 36e62df67d Remove additional minute 2016-07-19 11:57:11 +02:00
ctrlaltcaandGitHub 0939cd8b21 Merge pull request #2082 from ctrlaltca/fix_2081 
Remove newlines from Deck name in TabDeckEditor
 2016-07-15 11:14:13 +02:00
Fabio Bas b0efcf9f89 Remove newlines from Deck name in TabDeckEditor 2016-07-15 10:57:42 +02:00
ctrlaltcaandGitHub cbff59ae59 Merge pull request #2078 from skwerlman/patch-1 
fix typo in sample servatrice ini
 2016-07-14 09:06:47 +02:00
ctrlaltcaandGitHub 0c731e378a Merge pull request #2077 from ctrlaltca/webclient_ui 
Some web client UI fixes
 2016-07-13 09:01:33 +02:00
Fabio Bas 1a38e4ef98 Some web client UI fixes 2016-07-12 23:15:42 +02:00
ctrlaltcaandGitHub a11e57503e CONTRIBUTING: Syntax highlight, protobuf 2016-07-10 11:01:15 +02:00
ctrlaltcaandGitHub 35df6485ab CONTRIBUTING: C++11, nullptr, Database migrations 2016-07-10 10:47:19 +02:00
ctrlaltcaandGitHub d4ced6f6af Merge pull request #2067 from ctrlaltca/fix_2066 
Fix compilation warning
 2016-07-09 10:31:55 +02:00
Fabio Bas 430f1baf2f make gcc an happy puppy 2016-07-09 10:18:12 +02:00
ctrlaltcaandGitHub 6a152ffbac Merge pull request #1991 from ctrlaltca/websockets 
Implementation of websockets in servatrice and test js client
 2016-07-05 14:45:31 +02:00
ctrlaltcaandGitHub 07bc215b3e Merge pull request #2021 from ZeldaZach/color_list 
Colors to deck editor
 2016-07-05 14:45:09 +02:00
ctrlaltcaandGitHub 066aff96d7 Merge pull request #2049 from Cockatrice/filterBuddiesOnly 
filter buddies only
 2016-07-03 23:08:44 +02:00
ctrlaltcaandGitHub 7f2e39500e Merge pull request #2038 from ctrlaltca/translations 
Translations update
 2016-06-30 15:27:55 +02:00
Fabio Bas 670f55bc28 Translations update 2016-06-30 15:26:52 +02:00
ctrlaltcaandGitHub a045cf1c41 Merge pull request #2037 from Cockatrice/tooomm-tx_charts 
readme: fix transifex charts
 2016-06-30 11:22:38 +02:00
ctrlaltcaandGitHub 9807bcb48f Merge pull request #2025 from ctrlaltca/logui 
Log UI
 2016-06-29 13:56:46 +02:00
ctrlaltcaandGitHub 60ada0c278 Merge pull request #2036 from ctrlaltca/fix_2031 
Fix openssl detection on win64
 2016-06-29 13:54:59 +02:00
Fabio Bas 204f351a61 Fix openssl detection on win64 2016-06-29 09:53:50 +02:00