Commit Graph

45212 Commits

Author SHA1 Message Date
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 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
Sol
246e4a158d Merge branch 'BnR13july' into 'master'
Banned and Restricted - 13 July

See merge request core-developers/forge!2998
2020-07-14 00:31:42 +00:00
Tim Mocny
e2490f4022 Banned and Restricted - 13 July 2020-07-14 00:31:42 +00:00
Northmoc
b3331e22fa ugin_the_ineffable.txt add ForgetOnMoved$ 2020-07-13 14:58:43 -04:00
Zachary Kline
9da6f28bc0 Alternate start button handling. 2020-07-13 09:59:59 -07:00
Zachary Kline
76c093d966 Add several accessible names. 2020-07-12 20:22:52 -07:00
Michael Kamensky
e863fbf77e Merge branch 'hide_unfinished_tutorial' into 'master'
Remove tutorial mode until we're ready for it

See merge request core-developers/forge!2996
2020-07-12 03:48:15 +00:00
friarsol
efa45d61fd Remove tutorial mode until we're ready for it 2020-07-11 22:15:18 -04:00
Sol
cb1749bdfc Merge branch 'wander' into 'master'
mausoleum_wanderer.txt improve SVar:X

See merge request core-developers/forge!2994
2020-07-12 01:58:46 +00:00
Sol
9d4fcfc397 Merge branch 'CardDetailKeyboardFocus' into 'master'
Add the details text box to the focus order for faster gameplay.

See merge request core-developers/forge!2991
2020-07-12 01:58:30 +00:00
Sol
b583d72261 Merge branch 'typo' into 'master'
azra_oddsmaker.txt typos

See merge request core-developers/forge!2995
2020-07-12 01:57:54 +00:00
Northmoc
d4187b4144 azra_oddsmaker.txt typos 2020-07-11 21:39:59 -04:00
Northmoc
437d973400 mausoleum_wanderer.txt improve SVar:X 2020-07-11 21:38:18 -04:00
Michael Kamensky
c3d742278f Merge branch 'annoyance' into 'master'
weird space before DB$

See merge request core-developers/forge!2993
2020-07-11 16:12:34 +00:00
Northmoc
2b55ef9904 weird space before DB$ 2020-07-11 11:54:24 -04:00
Michael Kamensky
d0cd531f8e Merge branch 'forum9jul' into 'master'
The Mimeoplasm :: PutCounters needs ETB$ True

See merge request core-developers/forge!2983
2020-07-11 03:04:31 +00:00
Sol
2cbeb8621e Merge branch 'counterfix' into 'master'
2 cards with Counter effect need TargetType$

See merge request core-developers/forge!2992
2020-07-10 21:08:30 +00:00
Northmoc
752ec6526c Counter effect needs TargetType$ 2020-07-10 16:08:03 -04:00
Michael Kamensky
1c3f028e90 Merge branch 'tainted' into 'master'
tainted_pact.txt empty library case

See merge request core-developers/forge!2982
2020-07-10 19:01:10 +00:00
Tim Mocny
9d9f94fa8a tainted_pact.txt empty library case 2020-07-10 19:01:10 +00:00
Zachary Kline
b535332d14 Add the details text box to the focus order for faster gameplay. 2020-07-10 11:09:43 -07:00
Northmoc
8fd5ee9e38 the_mimeoplasm.txt counters need ETB$ True 2020-07-10 08:47:19 -04:00
Michael Kamensky
c72d575ebc Merge branch 'master' into 'master'
Check NetCombatDamage instead of NetPower when testing for possible Trample attack

See merge request core-developers/forge!2989
2020-07-10 12:26:28 +00:00
Agetian
faf5ac7728 - Check NetCombatDamage instead of NetPower 2020-07-10 14:23:45 +03:00
Michael Kamensky
16f5ce62f8 Merge branch 'master' into 'master'
Allow the AI to trample over defenders it can't kill.

See merge request core-developers/forge!2988
2020-07-10 10:15:32 +00:00
Agetian
082fd8cf5f - Somewhat more appropriate location for the updated trample AI code. 2020-07-10 12:34:42 +03:00
Agetian
b3857dfcfd - Allow the AI to trample over defenders it can't kill (e.g. Orgg vs. a regenerating blocker). 2020-07-10 12:18:09 +03:00
Michael Kamensky
55ca305077 Merge branch 'FControlsFocusFIx' into 'master'
Allow keyboard focus to land on checkboxes and radio buttons.

See merge request core-developers/forge!2985
2020-07-10 04:14:32 +00:00