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
4,087 Commits 53 Branches 176 Tags
115ed7805992f482160b8a54c9d959d88eaee730
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tooommandZach H f1e79707e8 work around confusing new default badge label (#3701) 2019-05-01 17:29:15 -04:00
tooommandZach H 837924b819 reword (#3682) 2019-04-06 23:12:21 -04:00
tooommandZach H 00cfb1347a Update ISSUE_TEMPLATE.md (#3679) 2019-04-04 14:52:48 -04:00
tooommandZach H 7072f24103 update link (#3665) 
repo got moved
 2019-03-22 16:11:36 -04:00
tooommandZach H 4d7024e066 version bump to 2.7.1 (#3635) 2019-03-07 22:47:41 -05:00
tooommandctrlaltca 317f29b321 update appveyor badge (#3576) 2019-02-11 22:32:11 +01:00
tooommandZach H 5b197c072e Git clone depth 15 (#3577) 2019-02-10 20:54:47 -05:00
tooommandGitHub b3fd5857f8 bump app version to 2.7.0 2019-02-10 13:29:12 +01:00
tooommandZach H a7d485d6f5 keep wrong project domain for proper settings storage (#3560) 
* update project domain

* revert + comment/hint

* better wording
 2019-02-05 23:57:35 -05:00
tooommandGavin Bisesi 3a05bcfb29 fix deployment on travis (#3468) 
## Short roundup of the initial problem
Deployment conditions weren't met, because the $BUILDTYPE variable doesn't exist anymore.
@ebbit1q changed that, and there is a flag now that you pass to the compile script instead.

## What will change with this Pull Request?
- Remove that condition
It's not needed because we make sure via the build config itself that on tags no debug builds are run. This was a double check basically to prevent debug builds beeing deployed.
 2018-12-07 11:48:06 -05:00
tooommandctrlaltca d9b11858fb exclude mac debug on tagged release (#3443) 
leftover from #3433
 2018-11-21 22:57:16 +01:00
tooommandctrlaltca 8b7a287b44 clarify min req (#3426) 2018-11-07 08:32:20 +01:00
tooommandZach H 0cd671c022 Improve hints for manage sets dialog (#3419) 2018-10-31 21:14:47 -04:00
tooommandGavin Bisesi 7e6c4d8a6c fix appveyor dependencies (#3420) 
ty @ctrlaltca
 2018-10-28 13:11:51 -04:00
tooommandZach H 8b567427c2 update proto links (#3380) 
repo moved, see https://github.com/protocolbuffers/protobuf/issues/4796
 2018-09-01 13:27:41 -04:00
tooommandZach H 3605a2ca0e bump min qt requirement (#3375) 2018-08-30 02:08:48 -04:00
tooommandctrlaltca 135c02ea41 travis: more cleanup (#3336) 
* add links to build image update history

* remove cmake from apt

* remove bc from apt

* remove clang-format from apt

* test clang-format

* Revert "test clang-format"

This reverts commit b2f12da427.

* remove protobuf from apt

* Revert "remove protobuf from apt"

This reverts commit 9162c8800c.

* remove qt from apt

* test with versions which differ from what xenial provides

* Revert "test with versions which differ from what xenial provides"

This reverts commit 6192e58169.

* Revert "remove qt from apt"

This reverts commit 0d9aff1c4c.

* conditions v1 are the default now

https://blog.travis-ci.com/2018-07-18-build-stages-officially-released

* add new job names

https://docs.travis-ci.com/user/customizing-the-build/?utm_source=blog&utm_medium=web&utm_campaign=build_stages_ga#Naming-Jobs-within-Matrices

* disable mail

* clang-format version

* remove clang source

* cmake version

* macOS: remove clang-format

formatting only checked on linux build

* add compiler info

* cmake version2

* remove fast_finish

only useful if allowed failures are configured in the matrix:
https://docs.travis-ci.com/user/customizing-the-build/#fast-finishing
 2018-08-27 10:50:55 +02:00
tooommandctrlaltca f1eab4e26a remove unused beta file endings (#3338) 2018-08-02 21:31:32 +02:00
tooommandctrlaltca 451e1874a7 UI dialog tweaks: filter + create game(s) (#3351) 
* vbox --> grid layout
 2018-07-25 08:21:29 +02:00
tooommandGitHub 69c103ede3 missing features dlg: better update hint (#3352) 
## Short roundup of the initial problem
People missed the hint on how to resolve missing features on their own, because update hint was hidden behind the `Show details` label.

## What will change with this Pull Request?
- Update hint is more prominently placed and not hidden behind a label
- It's translatable now
- Wording update to reflect UI change

## Screenshots
<!-- simply drag & drop image files directly into this description! -->
- before
![missing_features](https://user-images.githubusercontent.com/9874850/43153756-74cfd9f0-8f72-11e8-9e0f-fbf47b13f324.png)
- after
![missing_features_new](https://user-images.githubusercontent.com/9874850/43153761-78bec4e0-8f72-11e8-9853-ccc1ecb7f558.png)
 2018-07-24 21:05:42 +02:00
tooommandZach H ac0f92bac6 bump to 2.6.1 (#3342) 2018-07-21 10:56:39 -04:00
tooommandZach H 2d0d29fb5c appveyor: version updates + tweaks (#3334) 
* version updates

- qt to 5.11.x
- openssl to 1.0.2o
- protobuf to 3.6

* undo protobuf change

* reapply with proper semver

* only qt latest

* combined env, protobuf 3.6

* slim build matrix config down

* fix env

* test

* fix env -eq

* test if script changes work

* /2

* enable cache again

* fix

* final
 2018-07-17 20:12:39 -04:00
tooommandZach H cba1ca8d5b remove Qt guards (#3328) 
* remove version guards

* clangify

* [skip ci] README wording

* add cmake requirement to readme

* remove return

* remove min req from README
 2018-07-17 20:08:42 -04:00
tooommandGitHub c12c3c071f NSIS: Show hint when user installs 32bit Cockatrice on 64bit Windows (#3331) 
* hint for 32bit

* final wording
 2018-07-17 07:40:45 +02:00
tooommandGitHub d37d73017f nsis: add sleep timer to ensure unlocking of vc_redist (#3325) 
* add 3s sleep + log hint
 2018-07-14 15:49:41 +02:00
tooommandGitHub a766aa7d8a appveyor: reduce version string to basic info (#3324) 
## Short roundup of the initial problem
It was mostly out of date because we have to manually update it with our current version number.
The use of that is suspect anyway, since it only displays in the appveyor build overview.
It also had a redundant info about the branch.

## What will change with this Pull Request?
- remove hard coded version number
- remove branch
- cleanup build trigger from [#3300](https://github.com/Cockatrice/Cockatrice/pull/3300/files#diff-11c909939117928998b102a1fff7d363)
- more readable style

## Screenshots
I did some tests, so don't be confused about the different styles displayed in the history:
<!-- simply drag & drop image files directly into this description! -->
![version](https://user-images.githubusercontent.com/9874850/42664150-876175ac-8639-11e8-9df5-3fdd775440ed.png)
 2018-07-13 17:29:16 +02:00
tooommandctrlaltca d0d662f73a switch to xenial (#3320) 2018-07-11 14:52:19 +02:00
tooommandZach H 4796110afb updates (#3311) 2018-06-29 16:06:55 -04:00
tooommandZach H 1618e89c41 travis: remove unneeded debug builds on tags for faster release deployment (#3266) 
* add hint

* enable condition for debug

* enable new conditions
 2018-06-21 19:40:12 -04:00
tooommandGavin Bisesi 4e75a74bfd readme: fix linebreaks (#3292) 
## Short roundup of the initial problem
Everything was mixed in one single line.

## What will change with this Pull Request?
- introduce line brakes to keep the wanted look

## Screenshots
<!-- simply drag & drop image files directly into this description! -->
before: https://github.com/Cockatrice/Cockatrice/tree/2018-06-17-Release-2.6.0#run
after: https://github.com/Cockatrice/Cockatrice/tree/tooomm-patch-2#run

---

Should the `webatrice` webclient be listed there as well?
 2018-06-18 07:58:04 -04:00
tooommandZach H b316a5d541 new icons (#3289) 2018-06-17 18:09:58 -04:00
tooommandZach H 664d717e17 skip branches with open pull requests (#3265) 
See https://www.appveyor.com/docs/appveyor-yml/
 2018-05-28 19:29:19 -04:00
tooommandZach H 494dfc2f4b actCancel remove (#3261) 2018-05-25 21:59:52 -04:00
tooommandZach H 3a05d063af connect dialog: button reworks (#3243) 2018-05-25 21:59:42 -04:00
tooommandGitHub ec4a99e47b remove empty languages (#3253) 
## What will change with this Pull Request?
- cleanup of empty and unused languages files (catalan, lithuanian, hebrew, ukrainian)
- reflect language removing on transifex
 2018-05-23 10:32:41 +02:00
tooommandZach H 9acf606e93 settings dialog: fewer space (#3245) 2018-05-15 01:53:01 -04:00
tooommandctrlaltca 73fb9ee03e update file rules (#3232) 2018-05-10 22:07:22 +02:00
tooommandZach H 4e10ce7473 smaller clear pic button (#3220) 2018-05-04 03:48:53 -04:00
tooommandZach H 661e00f563 log cleanup (#3207) 2018-05-02 16:07:43 -04:00
tooommandZach H 8a5baa4637 connect dialog tweaks (#3211) 2018-04-23 14:30:46 -04:00
tooommandZach H f5eb05b682 bump version number (#3205) 
* bump version number

* bump
 2018-04-18 19:50:26 -04:00
tooommandZach H f309ddf28a README updates (#3203) 2018-04-16 20:08:26 -04:00
tooommandZach H 034e79dd36 typo (#3187) 2018-04-10 12:51:57 -04:00
tooommandZach H 5c03f18c72 add hint about how to contact server admins (#3186) 2018-04-10 12:40:24 -04:00
tooommandZach H 0c10b66a2d prettify spoiler settings (#3180) 2018-04-09 17:15:37 -04:00
tooommandZach H 7758145e71 comment explanation out (#3181) 2018-04-09 16:47:44 -04:00
tooommandZach H 42d15c39a0 change vcredist install option from "/quiet" to "/passive" (#3175) 2018-04-07 12:32:20 -04:00
tooommandZach H a0d84114de fix space (#3172) 2018-04-06 15:01:04 -04:00
tooommandZach H 706054ea96 readme: link update (#3173) 2018-04-06 15:00:46 -04:00
tooommandZach H 7d5a33b12c bump version number (#3174) 2018-04-06 15:00:32 -04:00
tooommandZach H a056a882c3 flip rename (client side) (#3149) 2018-04-05 22:42:54 -04:00
tooommandZach H f89f6438c9 Update ISSUE_TEMPLATE.md (#3171) 2018-04-05 22:42:36 -04:00
tooommandZach H e25b7e9eb8 button label wording (#3168) 2018-04-04 04:45:28 -04:00
tooommandZach H 5df547ee53 update template (#3150) 2018-03-23 23:37:11 -04:00
tooommandZach H ab3989aeba Consistent use of 'beta' tag across the project (#3089) 2018-02-07 11:33:14 -05:00
tooommandZach H aba47719b2 properly display logical connectors (#3072) 
they should not get transalted as well
 2018-02-04 13:47:12 -05:00
tooommandGitHub 3e418ba3c6 travis: temporary downgrade mac builds to qt5.5 (#3066) 
`qt@5.7` is no longer available: https://github.com/Homebrew/homebrew-core/pull/23165#issuecomment-362270835
 2018-02-01 19:09:46 +01:00
tooommandZach H d13cf65a10 contributing: add toc + little tweaks (#3030) 2018-01-27 13:45:27 -05: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
tooommandZach H cc822dd8df card filter: add clear button and placeholder text (#3003) 2018-01-11 16:43:08 -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
tooommandZach H 51ec593759 fix space (#2990) 2018-01-02 22:57:23 -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
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
tooommandZach H 7e80f4b4ae oracle: fix wording for token download (#2946) 2017-12-15 15:42:30 -05:00
tooommandZach H 4d641eb0e7 version number bump to next patch (#2920) 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
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
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
tooommandZach H df8c38b649 add link to project roadmap (#2872) 2017-10-01 00:23:06 -04:00
tooommandGavin Bisesi 1424de2c54 remove old TODO file (#2870) 2017-09-29 20:51:41 -04:00
tooommandGitHub ef89104503 add colourless keyword to deck filter (#2858) 
extends #2737 for missing term (add colourless)
 2017-09-27 14:03:58 +02:00
tooommandGavin Bisesi 93d8ac10ff Fix broken README links after #2826 
copying --> license
 2017-08-14 08:25:20 -04:00
tooommandZach H 04d84f9d9a repo cleanup (#2826) 2017-08-11 21:42:45 -04:00
tooommandZach H 2557a2183d .travis folder (#2805) 2017-08-06 23:56:31 -04:00
tooommandZach H af3423e67d split up string and argument (#2822) 2017-08-06 20:51:54 -04:00
tooommandGavin Bisesi e90c389212 remove mention-bot config file (#2814) 2017-07-31 18:08:25 -04:00
tooommandZach H 1cb3d88e35 flag updates (#2804) 2017-07-14 21:30:27 -04:00
tooommandctrlaltca 1565309146 enable caching for ci (#2799) 
* enable cache

* caching on mac

* fix ci caching on mac

* fix

* add mac cache

* added homebrew cache and pretty print yaml (+ structural ordering)

* cleanup

* fix ccache on mac

* testing workaround

https://github.com/travis-ci/travis-ci/issues/7456#issuecomment-296505058

* try xcode7.3 instead of workaround

* cache timout value

more time for cache to upload
 2017-07-07 16:17:18 +02:00
tooommandGitHub 029a4a39ad readme: https link + layout tweak (#2768) 2017-06-13 15:34:50 +02:00
tooommandZach H b36c349f9b remove unused define (#2757) 2017-06-11 00:42:09 -04:00
tooommandctrlaltca 4c953acebc exchange dl stat page (#2743) 2017-05-30 08:32:58 +02:00
tooommandctrlaltca 87060dc5c7 created_at to published_at (#2723) 2017-05-22 16:00:38 +02:00
tooommandGitHub 73e2c3d32f Publish --> Release 2017-05-13 14:49:35 +02:00
tooommandGitHub 7f273b547b add missing tr() 2017-05-13 13:24:04 +02:00
tooommandGitHub 41ebf7a9ad space 2017-05-09 12:47:19 +02:00