Northmoc
947d345cf2
trufflesnout.txt life amount fix
2020-07-21 09:08:19 -04:00
Michael Kamensky
5d40229e85
Merge branch 'master' into 'master'
...
Fix AI for Jwari Shapeshifter
Closes #1513
See merge request core-developers/forge!3017
2020-07-21 09:56:03 +00:00
Agetian
c3b337a072
- Fix AI for Jwari Shapeshifter
2020-07-21 12:44:10 +03:00
Michael Kamensky
3e341e8ab9
Merge branch 'tides' into 'master'
...
read_the_tides.txt fixes
See merge request core-developers/forge!3014
2020-07-21 05:45:48 +00:00
Michael Kamensky
fcc072e8cc
Merge branch 'azorius' into 'master'
...
Azorious -> Azorius
See merge request core-developers/forge!3015
2020-07-21 05:45:40 +00:00
Michael Kamensky
697f6cede5
Merge branch 'effectnames' into 'master'
...
Remove "Name$ CARDNAME Effect" from Effects
See merge request core-developers/forge!3016
2020-07-21 05:45:36 +00:00
Northmoc
566e20fe11
Name$ CARDNAME Effect doesn't work
2020-07-20 20:13:25 -04:00
Northmoc
b6f67a2221
Azorious -> Azorius
2020-07-20 20:08:59 -04:00
Northmoc
48720fa6ea
read_the_tides.txt fixes
2020-07-20 19:04:12 -04:00
Michael Kamensky
50b57157e1
Merge branch 'master' into 'master'
...
Improve AI logic for Bound by Moonsilver.
See merge request core-developers/forge!3013
2020-07-20 05:12:53 +00:00
Agetian
62d3c4457b
- Improve AI logic for Bound by Moonsilver.
2020-07-20 08:03:10 +03:00
Michael Kamensky
c069d0e5d2
Merge branch 'fix-m21-booster-collation' into 'master'
...
Fix M21 booster collation: Move tap lands to land slot, exclude them from common slot
See merge request core-developers/forge!3008
2020-07-20 03:48:41 +00:00
Michael Kamensky
fd84050944
Merge branch '1511-supplant-form-legality-issues' into 'master'
...
Resolve "Supplant Form legality issues"
Closes #1511
See merge request core-developers/forge!3012
2020-07-19 19:38:19 +00:00
Hans Mackowiak
e8c5c78ddd
CardUtil: copy PT boost extra in case something is using LKI to make a token
2020-07-19 20:22:52 +02:00
Michael Kamensky
a542bf8057
Merge branch 'mayLook' into 'master'
...
MayLook: refactor it to use timestamp, also handle facedown exile
Closes #1509
See merge request core-developers/forge!3011
2020-07-19 15:59:43 +00:00
Hans Mackowiak
b816bae232
MayLook: refactor it to use timestamp, also handle facedown exile
2020-07-19 15:59:42 +00:00
pfirpfel
3ba0737bbe
Move tap lands to land slot, exclude them from common slot
2020-07-19 17:27:19 +02:00
Michael Kamensky
aafbdd1a9c
Merge branch 'master' into 'master'
...
Some AI hint updates (M21, some PlayMain1 additions, minor random changes)
See merge request core-developers/forge!3010
2020-07-19 08:26:44 +00:00
Agetian
0c1a6b88bc
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2020-07-19 11:08:19 +03:00
Agetian
4896cf724a
- Resolve merge conflicts.
2020-07-19 11:08:00 +03:00
Agetian
8b7d4a0c97
- Some more AI hint updates, mostly M21.
2020-07-19 08:20:28 +03:00
Agetian
80332687cb
- Add several PlayMain1 hints to cards + Extort (to ensure the AI can extort whatever he casts later that turn).
2020-07-19 06:57:18 +03:00
Michael Kamensky
cef4a85e6f
Merge branch 'sethron' into 'master'
...
Sethron fixes
See merge request core-developers/forge!3009
2020-07-19 03:32:31 +00:00
Tim Mocny
c79b36d5d0
Sethron fixes
2020-07-19 03:32:31 +00:00
Michael Kamensky
f08f960982
Merge branch 'pumpdefine' into 'master'
...
Pump overhaul
See merge request core-developers/forge!2997
2020-07-17 13:25:03 +00:00
Tim Mocny
56d374f15f
Pump overhaul
2020-07-17 13:25:02 +00:00
Michael Kamensky
08970b48b9
Merge branch 'forumfix' into 'master'
...
Various fixes for issues reported on Forum
See merge request core-developers/forge!3007
2020-07-17 13:22:22 +00:00
Tim Mocny
7ade96801c
Various fixes for issues reported on Forum
2020-07-17 13:22:22 +00:00
Michael Kamensky
618f41a315
Merge branch 'm21ed' into 'master'
...
Magic 2021.txt token typo
See merge request core-developers/forge!3006
2020-07-17 05:32:50 +00:00
Michael Kamensky
1989b1c370
Merge branch 'reflector' into 'master'
...
reflector_mage.txt patch
Closes #1505
See merge request core-developers/forge!3005
2020-07-17 05:32:37 +00:00
Northmoc
96d7ac595c
Magic 2021.txt token typo
2020-07-16 11:40:47 -04:00
Northmoc
0be4953990
reflector_mage.txt patch
2020-07-16 10:23:10 -04:00
Michael Kamensky
af3051b74e
Merge branch 'master' into 'master'
...
Initial implementation for Pongify-like logic in ChangeZoneAi, some refactoring for shared AI logic.
Closes #1506
See merge request core-developers/forge!3003
2020-07-16 09:51:41 +00:00
Agetian
db3d236463
- Fix unused imports.
2020-07-16 12:39:22 +03:00
Agetian
1f5578ad90
- Improve and unify Pongify logic.
...
- Add the SpecialAiLogic class for logic that is shared across several AFs by multiple cards.
- Move Aristocrats logic from PumpAi/CountersPutAi into SpecialAiLogic.
2020-07-16 12:22:01 +03:00
Sol
0bd3ab2071
Merge branch 'namingNames' into 'master'
...
Naming names
See merge request core-developers/forge!3001
2020-07-15 12:11:39 +00:00
Michael Kamensky
88ffc7c826
Merge branch 'master' into 'master'
...
Fix the GNU GPL license name on splash screens.
See merge request core-developers/forge!3002
2020-07-15 06:02:41 +00:00
Agetian
69d18a6911
- Add a TODO entry
2020-07-15 09:01:46 +03:00
Agetian
e2f738036d
- Initial implementation for Pongify-like logic in ChangeZoneAi
2020-07-15 08:59:36 +03:00
Agetian
3ec5906def
- Fix the GNU GPL license name on splash screens.
2020-07-15 08:26:42 +03:00
Zachary Kline
44a36396df
Formatting fixes.
2020-07-14 21:35:26 -07:00
Zachary Kline
87533decd8
Quest combo box labels.
2020-07-14 16:39:19 -07:00
Zachary Kline
4af7c1d839
Add names for tables in deck editor.
2020-07-14 15:52:52 -07:00
Michael Kamensky
3b26ea5084
Merge branch 'master' into 'master'
...
Prepare Forge for Android publish 1.6.36.001 [incremental].
See merge request core-developers/forge!3000
2020-07-14 09:00:35 +00:00
Agetian
2bc71ea1c6
- Prepare Forge for Android publish 1.6.36.001 [incremental].
2020-07-14 11:26:53 +03:00
Blacksmith
540d1cef6b
Clear out release files in preparation for next release
2020-07-14 02:09:59 +00:00
Blacksmith
5076f19194
[maven-release-plugin] prepare for next development iteration
2020-07-14 02:04:44 +00:00
Blacksmith
90a4cd49e8
[maven-release-plugin] prepare release forge-1.6.36
2020-07-14 02:04:38 +00:00
Blacksmith
2025fa31f8
Update README.txt for release
2020-07-14 02:01:55 +00:00
Sol
fd8cb59289
Merge branch 'ugin' into 'master'
...
ugin_the_ineffable.txt add ForgetOnMoved$
See merge request core-developers/forge!2999
2020-07-14 00:32:06 +00:00
