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,862 Commits 53 Branches 176 Tags
37ab7b8fb1504e01d74fd140920a62e769d8cc5c
Commit Graph
3862 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ctrlaltcaandZach H e127cb74b6 Fixed most issues from codacy (#3050) 2018-01-27 13:31:44 -05:00
Daveandctrlaltca 3c3e6ae68a Domain change (#3051) 
.es es no mas

Server and database from .es is now active on cockatrice.dr4ft.com
 2018-01-27 17:30:40 +01: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
tooommandGitHub 8dbdd24c8e fix cmake 3.10 (#3048) 2018-01-25 20:39:10 +01:00
tooommandZach H 04ab3d7f13 fix release run on tags (#3046) 2018-01-23 12:58:56 -05:00
tooommandZach H 03d0a84ef5 "edit sets" --> "manage sets" rename (#3044) 2018-01-22 12:42:10 -05:00
tooommandZach H 14a0c53fc1 travis update (osx + linux) (#3041) 2018-01-21 17:07:25 -05:00
woogerboy21andGitHub da7c7c1f83 Update Servatrice MySQL Search Path (#3039) 
Removed the older versions of the mysql library install paths and updated to reflect the 5.7 product paths.
 2018-01-21 11:05:13 -05:00
Zach HandGitHub 261d3ac591 better null check (#3036) 2018-01-20 14:54:34 -05:00
ctrlaltcaandGitHub 55029b6b68 Travis: remove sudo (#3037) 2018-01-20 16:50:06 +01:00
Zach HandGitHub bc52882ac4 Fix Bad Gameplay (#3034) 2018-01-19 20:34:14 -05:00
Zach HandGitHub d1b95aad16 move to slot (#3032) 2018-01-19 19:04:48 -05:00
Zach HandGitHub 691bf36fbe Disable sideboard button w/o deck (#3025) 2018-01-19 10:50:18 -05:00
Zach HandGitHub 5a823becf1 Contributing Doc Updates (#3009) 2018-01-19 08:38:37 -05:00
Zach HandGitHub feeaba1d62 2.4.1 beta -> 2.5.0 beta (#3024) 
Big changes so we will go to 2.5.0 for next release
 2018-01-18 19:28:51 -05:00
Zach HandGitHub ebec30dd1c Add No annotations export option w/ shortcut (#3013) 2018-01-18 19:25:30 -05:00
Zach HandGitHub 5757d60b1d Smarter Mana Cost sorting & small cleanup (#3008) 2018-01-18 19:25:10 -05:00
skwerlmanandZach H 81fcc3c11a remove builds for 1610 and 1704 (#3023) 
ubuntu turned off the repo servers :(
 2018-01-18 19:24:43 -05:00
Zach HandGitHub 34bec90193 Fix deck loader with spaces (#3007) 2018-01-18 19:23:13 -05:00
Zach HandGitHub dcc632e0d4 Fix a crash (#3011) 2018-01-18 11:53:57 -05:00
Zach Handctrlaltca 7a150c558d Trim all inputs (except password) (#3018) 
* Trim all inputs (except password)

* missed )
 2018-01-17 18:57:13 +01:00
ctrlaltcaandGitHub 3a11aebb21 windows/appveyor compilation updates (#3020) 2018-01-17 18:20:05 +01:00
Zach HandGitHub 8825e2932a fix linux crash (#3014) 2018-01-13 04:20:12 -05: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
tooommandZach H cc822dd8df card filter: add clear button and placeholder text (#3003) 2018-01-11 16:43:08 -05:00
Kyle GrammerandZach H 6fc1aaef90 Add comp architecture (#2968) 2018-01-10 22:19:07 -05:00
tooommandZach H c8122c94ef adjust custom naming, clickable commit hash in brackets (#2981) 2018-01-10 13:38:51 -05:00
tooommandZach H e6e6932dbb card filter: alphabetical ordering for keywords (#2987) 2018-01-10 13:37:39 -05:00
tooommandZach H d124e6ac22 deck editor: add placeholder text to search (#3000) 2018-01-10 13:33:37 -05:00
tooommandZach H 7efab80d9b token creation context menu improvements (#2999) 2018-01-10 13:32:29 -05:00
Zach HandGitHub d19744236e Automatic Spoiler Season (#2991) 
* oracle now can be run in spoiler or normal mode

* tests for travis

* only run on relaunch

* spoilers in client (not oracle now) and tray icon shows when done

* spoiler status will be checked before downloading spoiler file

* only download if they care about spoilers

* reload db on spoiler download

* manual update button, code cleanup, and fix enabling sets when new

* cleanup, nullchecks, and fixes to spoiler

* reload DB even if not in spoiler season; necessary as we have a check elsewhere to prevent the reload if spoiler check happens

* Implement changes from 2991#issuecomment-356169374

* Change implicit nullptrs, alert on file deletion, minor changes

* make reload thread safe and minor changes from 2991#issuecomment-356450302

* Fix locking

* Disable update now button while process running
 2018-01-10 13:27:43 -05:00
tooommandZach H 51ec593759 fix space (#2990) 2018-01-02 22:57:23 -05:00
Zach HandGitHub 87c978937d replace beta semvar correctly (#2980) 2017-12-28 21:30:17 -05:00
tooommandZach H dfaa85847c add tag (#2979) 2017-12-28 20:02:30 -05:00
tooommandZach H 74dbf75c5b fix var call (#2978) 2017-12-28 19:21:42 -05:00
tooommandZach H f0f73c8f77 ci: deployment config for beta+stable (#2976) 2017-12-28 18:33:16 -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
tooommandZach H 5b8e0dc8ec add group key (#2967) 
as announced here: https://blog.travis-ci.com/2017-12-01-new-update-schedule-for-linux-build-images
 2017-12-18 18:17:31 -05:00
Zach HandGitHub b75882b6b9 Allow non-db cards to be moved around (#2960) 2017-12-18 14:17:54 -05:00
Zach HandGitHub 2abfd3b4a9 Update Rarity Filters & Refactoring (#2962) 2017-12-17 19:42:54 -05:00
Zach HandGitHub 014b9947fe clear search bar if all filters cleared (#2961) 2017-12-17 17:48:57 -05:00
Zach HandGitHub ec4e6d53df allow backspace button to remove a filter (#2959) 2017-12-17 17:39:41 -05:00
Zach HandGitHub 0eae4dbe54 add checkbox option to clear log (#2963) 2017-12-17 17:32:31 -05:00
Zach HandGitHub 297f1f2555 remove untap option, combine w/ tap (#2964) 2017-12-17 17:31:31 -05:00
tooommandZach H 7e80f4b4ae oracle: fix wording for token download (#2946) 2017-12-15 15:42:30 -05:00
Kyle GrammerandZach H 6e24f59826 Fixing split card from UNH with wrong name in database (fix #2947) (#2949) 2017-12-15 15:37:32 -05:00
Kyle GrammerandZach H 5e00faed5d Fix for Aftermath and Split Cards when sending to Tappedout; fix #2942 (#2944) 2017-12-10 17:56:49 -05:00
John RobeandZach H 6c038a91e4 Deck export (#2938) 
* Added “export deck” option to export deck to decklist.org for viewing/printing. Implemented using a new menu item, added shortcut ability, and functionality to parse the deck correctly and add main/sideboard cards to decklist. Per issue #2931
 2017-12-05 22:34:19 -05:00
tooommandZach H 4d641eb0e7 version number bump to next patch (#2920) 2017-11-19-Release-2.4.0 2017-11-19 20:22:12 -05:00
tooommandZach H 59824cf4dd update finish (#2923) 2017-11-19 20:22:02 -05:00