Commit Graph

37900 Commits

Author SHA1 Message Date
Michael Kamensky
47b9b226e1 Merge branch 'grothama' into 'master'
Grothama

See merge request core-developers/forge!632
2018-06-12 05:27:17 +00:00
Hanmac
db1479f6b9 Grothama: fixed card draw 2018-06-12 06:48:28 +02:00
Michael Kamensky
b42c2ad489 Merge branch 'bbd_migrate_upcoming' into 'master'
Migrating BBD Upcomings

See merge request core-developers/forge!633
2018-06-12 04:08:27 +00:00
Michael Kamensky
ea7b290850 Merge branch 'ldaarchetypedeckgenerationchanges' into 'master'
Archetype based deck generation

See merge request core-developers/forge!631
2018-06-12 04:08:17 +00:00
Chris H
d8415d85ef Migrating BBD Upcomings 2018-06-11 22:13:58 -04:00
Hanmac
4e85678560 cards: add Grothama 2018-06-11 22:20:16 +02:00
austinio7116
5e335b97fa Improved deck generation code to reduce constraints and allow the LDA archetypes to be more accurately sampled. Ensure Tron doesn't get broken. 2018-06-11 20:25:16 +01:00
Hanmac
fd5a969434 CardFactoryUtil: xcount added DamageDoneByPlayerThisTurn 2018-06-11 20:46:09 +02:00
Hanmac
b58b8e2051 Trigger: replace ORIGINALHOST in ABILITY 2018-06-11 20:45:10 +02:00
Hanmac
38eda65143 Card: store Damage done by Sources a Player control to card 2018-06-11 20:43:42 +02:00
austinio7116
ddf8ce3ac5 Update LDA model with more lower tier data 2018-06-11 18:22:23 +01:00
maustin
8de0472048 Improved deck generation code - ensure keycard is non-land for LDA deck generation and improve handling of basic lands to ensure no colour is missed. 2018-06-11 18:03:56 +01:00
austinio7116
75931881f7 Improved deck naming for LDA generated decks 2018-06-11 08:42:47 +01:00
austinio7116
6d24ddc8e6 Prune archetypes that are less than 0.1% of meta as these are largely not real decks, but shared characteristics of multiple decks or unique decks not suitable for random generation. 2018-06-11 08:41:51 +01:00
Michael Kamensky
54f5af72f2 Merge branch 'oracle-updates-nonfunctional' into 'master'
Oracle updates nonfunctional

See merge request core-developers/forge!629
2018-06-10 18:58:11 +00:00
Rob Schnautz
4d3cdaa26f Shard order 2018-06-10 18:21:06 +00:00
Michael Kamensky
e29cb17712 Merge branch 'master' into 'master'
Forge for Android 1.6.11.001

See merge request core-developers/forge!628
2018-06-10 04:05:24 +00:00
Agetian
eb22d38770 - Preparing Forge for Android publish 1.6.11.001 [incremental]. 2018-06-10 07:04:42 +03:00
Blacksmith
244d98d81f Clear out release files in preparation for next release 2018-06-10 00:47:30 +00:00
Blacksmith
e2c57c0973 [maven-release-plugin] prepare for next development iteration 2018-06-10 00:42:03 +00:00
Blacksmith
6ec968cd85 [maven-release-plugin] prepare release forge-1.6.11 forge-1.6.11 2018-06-10 00:42:00 +00:00
Blacksmith
0a4270970d Update README.txt for release 2018-06-10 00:40:15 +00:00
Michael Kamensky
50f978bc5c Merge branch 'morePartner' into 'master'
More partner

See merge request core-developers/forge!626
2018-06-09 11:47:17 +00:00
Agetian
2543dd0bae - Minor typo fix. 2018-06-09 14:46:21 +03:00
Agetian
2d9cdcaef6 Merge branch 'morePartner' of git.cardforge.org:core-developers/forge into morePartner 2018-06-09 14:35:42 +03:00
Hanmac
ed612574bc cards: add mentor and protege partner 2018-06-09 08:48:29 +02:00
Hanmac
20b28e3d06 cards: add soulblade partner 2018-06-09 08:48:29 +02:00
Hanmac
bfd667de00 cards: add chakram partner 2018-06-09 08:48:29 +02:00
Hanmac
a551612b89 cards: added blaring partner 2018-06-09 08:48:28 +02:00
Hans Mackowiak
7e4b909278 Merge branch 'patch-1' into 'master'
typo

See merge request core-developers/forge!627
2018-06-09 06:08:11 +00:00
Rob Schnautz
8448148f97 typo 2018-06-09 06:07:05 +00:00
Michael Kamensky
dc3efbc739 Merge branch 'filteredhands' into 'master'
Filtered Hands

See merge request core-developers/forge!607
2018-06-09 05:33:30 +00:00
Hanmac
2fd5ed045d cards: add mentor and protege partner 2018-06-08 23:28:40 +02:00
Hanmac
5c63c5fe1c cards: add soulblade partner 2018-06-08 23:09:34 +02:00
Hanmac
8f1ecbb12b cards: add chakram partner 2018-06-08 23:05:25 +02:00
Hanmac
8247399af8 cards: added blaring partner 2018-06-08 23:04:35 +02:00
Michael Kamensky
a89106211f Merge branch 'FriendOrFoe' into 'master'
Friend or foe

See merge request core-developers/forge!619
2018-06-08 08:00:43 +00:00
Michael Kamensky
e1202c6839 Merge branch 'ldaarchetypedeckgenerationchanges' into 'master'
Archetype based deck generation

See merge request core-developers/forge!625
2018-06-08 07:59:36 +00:00
Agetian
939e461c08 - Fixed Regna's Sanction. 2018-06-08 10:47:32 +03:00
Agetian
653329be09 - Fixed Virtus's Maneuver (take two) 2018-06-08 10:09:29 +03:00
Agetian
a2223fc6f9 - Fixed Virtus's Maneuver "friend" ability.
- Added a simple AI limiting NeedsToPlay svar.
2018-06-08 10:00:36 +03:00
Hanmac
2f02b03d6a Generous Patron: you need to be the Source of the counter for this effect to trigger 2018-06-08 06:55:00 +02:00
Hanmac
d851a4fc8d cards: add Virtus's Maneuver 2018-06-08 06:51:33 +02:00
Agetian
c54d24a362 - Simple limiting SVar for Khovrath's Fury AI until a better logic can be devised.
- Ideally should at least account for the fact that it should not overdraw cards and deck itself.
2018-06-08 07:18:49 +03:00
Rob Schnautz
c2797969d4 Shard order 2018-06-08 02:23:08 +00:00
austinio7116
f34dc83907 Changes to ensure LDA archetype decks are used in gauntlets rather than the old card-based ones. Ensured correct longpress function for generated decks in cardview on android. 2018-06-07 20:32:15 +01:00
austinio7116
85ad236693 Changed card-based deck generation to archetype based making better use of the new LDA models. Decks can now be selected by archetype with names generated from the source decklists. Archetypes are ordered by popularity.
(cherry picked from commit e993b00)
2018-06-07 19:55:41 +01:00
Hanmac
97cd2130b4 cards: add Khorvath's Fury 2018-06-07 07:34:24 +02:00
Michael Kamensky
3bf91bdde6 Merge branch 'dom-puzzles' into 'master'
Added puzzles PS_DOM5 and PS_DOM6.

See merge request core-developers/forge!624
2018-06-04 19:41:51 +00:00
Agetian
8304196533 - Added puzzles PS_DOM5 and PS_DOM6. 2018-06-04 22:41:01 +03:00