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,993 Commits 53 Branches 176 Tags
0dcf97d29d272b5cfd13f55ea1d9bbaa794be806
Commit Graph
3993 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
tooommandZach H b615b5b33e Translation Updates (#2918) 2017-11-19 15:11:37 -05:00
tooommandGavin Bisesi 3dc2526f0a update download wording (#2912) 2017-11-04 20:17:18 -04:00
tooommandGavin Bisesi 6bc39a4f6f yml config documentation (#2899) 
* little fix

* add config hints

* doc link
 2017-11-04 20:16:41 -04:00
John HillandZach H 422c899cdb Sorting by P/T numerically (#2901) 2017-11-04 13:11:46 -04:00
Gavin Bisesiandtooomm e96a250bf1 Fix easy changes link in readme (#2897) 
Using these two labels because github tells contributors to look for them.
 2017-11-02 15:17:29 +01:00
TaylorShiellsandGavin Bisesi 563e96e051 Update Readme.md (Style Guide) / FMRM feedback (#2905) 
This change establishes the Google Developer Documentation Style Guide as the official style guide for the ReadMe. This will provide a starting point for editors or writers looking to work on documentation. This edit also does an initial patch on the readme based on that style guide
 2017-11-01 13:08:17 -04: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
tooommandctrlaltca fcb0daf80f more ignore for appveyor (#2892) 
* add dockerfile and license to ignorelist

* fixed space
 2017-10-09 19:15:36 +02:00
tooommandctrlaltca a3ca459526 exclude translation files from codacy (#2891) 
* exclude translation files from codacy

* update appveyor ignore config

add codacy.yml
 2017-10-09 16:40:05 +02:00
tooommandctrlaltca 17202e8dba AppVeyor: prevent unnecessary builds (#2888) 
* prevent unnecessarybuilds

* readd qt5 string

sadly this is needed as of now:
https://github.com/Cockatrice/Cockatrice/blob/ff6b0f86ec6d3bf76d6667003b82ce24479c0d15/cockatrice/src/releasechannel.cpp#L59-L68

* wrap asterisks

* fixed with validator

https://ci.appveyor.com/tools/validate-yaml

* complete link

* add helpful links

this should not trigger a appveyor build

* add space in readme

this should not trigger a appveyor build

* highlight c++ types

this should not trigger a appveyor build

* remove empty line

this should not trigger a appveyor build

* declutter dockerignore

this should not trigger a appveyor build
 2017-10-09 11:19:56 +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
Zach HandGitHub 96b30da492 fix deckstats.net regex (#2886) 2017-10-04 23:36:42 -04:00
tooommandZach H 9cbdc4195e change to https (#2863) 2017-10-04 12:46:43 -04:00
tooommandZach H ada262b826 betaXYZ to betaX (#2882) 2017-10-04 12:45:28 -04:00
Alessandro MarzialettiandZach H 78e299fdfd Fixed life points not showing (#2868) (#2881) 2017-10-04 12:44:36 -04:00
skwerlmanandctrlaltca cf5cd21c50 Update .gitlab-ci.yml (#2876) 
Remove support for Fedora 22 (been EOL for a while)
Add support for Ubuntu 17.04 and 17.10

Note that debug builds for 17.04 and 17.10 are still affected by issue #2343, and so always fail.
 2017-10-03 15:28:47 +02:00
woogerboy21andGitHub b684c12964 Correct VS2017 Compile Issue (#2878) 
A line in the servatrice CMAKE file was removed in a prior commit causing a compile error in newer versions of visual studio.  This returns the line.
 2017-10-03 09:23:33 -04:00
tooommandZach H df8c38b649 add link to project roadmap (#2872) 2017-10-01 00:23:06 -04:00