Commit Graph

49974 Commits

Author SHA1 Message Date
Anthony Calosa
ac3ff9e966 Merge branch 'master' into 'master'
[Mobile] Fix selected deck on activate

See merge request core-developers/forge!4143
2021-03-08 03:23:43 +00:00
Anthony Calosa
0d35f4806e [Mobile] Fix AI selected decks on activate 2021-03-08 11:21:54 +08:00
Anthony Calosa
6c0f63039e [Mobile] Revert deck chooser activation 2021-03-08 10:37:13 +08:00
Adam Pantel
aa866eb42f Add notifications to minigame cards 2021-03-07 19:07:05 -05:00
Adam Pantel
dcda2ade1d [Un-cards] Minigame cards 2021-03-07 17:26:36 -05:00
Lykrast
1928759ff9 Fix 11 result misread 2021-03-07 22:18:47 +00:00
Lykrast
d467e7b7f4 Kharis & The Beholder 2021-03-07 21:51:06 +00:00
Michael Kamensky
f97c3e06ad Merge branch 'master' into 'master'
Fix a variety of Roll Dice card- and AI-related issues, improve AI for AF RollDice

See merge request core-developers/forge!4138
2021-03-07 17:08:33 +00:00
Michael Kamensky
2eefa72494 - Fix a variety of issues with "Roll dice" silver-bordered cards
- Add some additional AI to RollDiceAi
- Fix NeedsToPlay(Var) not being properly enforced for lands
- Minor other tweaks/fixes.
2021-03-07 20:07:05 +03:00
Michael Kamensky
60f79e90a7 Merge branch 'master' into 'master'
Added an AI hint for Jirina Kudro

See merge request core-developers/forge!4137
2021-03-07 14:41:08 +00:00
Michael Kamensky
1da63ef83e - Added an AI hint for Jirina Kudro 2021-03-07 17:40:37 +03:00
Hythonia
a13d8ec83b Reap Intellect 2021-03-07 15:25:32 +01:00
Hythonia
ecff4f02a3 Miscellaneous fixes and adjustments 2021-03-07 15:22:09 +01:00
Bug Hunter
a8c01b4487 Merge branch 'fixhead' into 'master'
Fix Elite Headhunter cost

See merge request core-developers/forge!4134
2021-03-07 10:10:53 +00:00
tool4EvEr
f466fd690b Fix Elite Headhunter cost 2021-03-07 11:10:32 +01:00
Anthony Calosa
3a3c8230c0 Merge branch 'kevlahnota-master-patch-09449' into 'master'
fix Time Spiral Remastered promo

See merge request core-developers/forge!4133
2021-03-07 09:52:57 +00:00
Anthony Calosa
e8046e0483 fix Time Spiral Remastered promo 2021-03-07 09:52:37 +00:00
Michael Kamensky
882ab0c24b Merge branch 'unicode_deck_name' into 'master'
support unicode deck name

See merge request core-developers/forge!2472
2021-03-07 05:43:27 +00:00
Michael Kamensky
137b10f361 Merge branch 'remove-reference' into 'master'
Remove References$ from everything

See merge request core-developers/forge!4031
2021-03-07 05:41:04 +00:00
Adam Pantel
fd44c9745d Remove References$ from scripts 2021-03-07 00:39:14 -05:00
Adam Pantel
fdd5aa936f Remove code for References$ 2021-03-07 00:36:03 -05:00
Michael Kamensky
3335e17803 Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.39.001

See merge request core-developers/forge!4131
2021-03-07 05:15:14 +00:00
Michael Kamensky
7d47cf2a06 - Preparing Forge for Android publish 1.6.39.001 [incremental]. 2021-03-07 08:12:56 +03:00
Michael Kamensky
22b45fff9a Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-03-07 08:12:06 +03:00
Michael Kamensky
cbc0051f8a [maven-release-plugin] prepare for next development iteration 2021-03-07 08:00:39 +03:00
Michael Kamensky
0437e9354b [maven-release-plugin] prepare release forge-1.6.39 forge-1.6.39 2021-03-07 08:00:30 +03:00
Michael Kamensky
668e2834bc Merge branch 'master' into 'master'
Prepare for release

See merge request core-developers/forge!4130
2021-03-07 04:48:09 +00:00
Michael Kamensky
4ca125e0b6 - Fix unused imports. 2021-03-07 07:46:22 +03:00
Michael Kamensky
73a6d65118 - Update ANNOUNCEMENTS.txt
- Rename a method in ChangeZoneAi
2021-03-07 07:42:48 +03:00
Michael Kamensky
8cff34e488 Merge branch 'unset-cards' into 'master'
[Un-cards] DeckLimit keyword + Cardboard Carapace

See merge request core-developers/forge!4127
2021-03-07 04:34:27 +00:00
Michael Kamensky
1efda3f97b Merge branch 'pcel' into 'master'
[Un-cards] PCEL

See merge request core-developers/forge!4129
2021-03-07 04:33:06 +00:00
Michael Kamensky
04e25abdc6 Update shichifukujin_dragon.txt 2021-03-07 04:32:33 +00:00
Michael Kamensky
8d025dffbf Update robot_chicken.txt [AI hint] 2021-03-07 04:31:38 +00:00
Michael Kamensky
df17c3a31b Merge branch 'master' into 'master'
[Desktop] update ImageView for Decks

See merge request core-developers/forge!4128
2021-03-07 04:28:46 +00:00
Michael Kamensky
4148742624 Merge branch 'Williams-master-patch-25386' into 'master'
Time Spiral Remastered

See merge request core-developers/forge!4126
2021-03-07 04:17:07 +00:00
Adam Pantel
41cae28145 [Un-cards] PCEL 2021-03-06 23:16:58 -05:00
Anthony Calosa
e73f117037 [Desktop] update ImageView for Decks 2021-03-07 08:39:12 +08:00
John
92ca4f2dc6 Update Time Spiral Remastered.txt 2021-03-06 21:21:18 +00:00
Adam Pantel
acb21b2a28 [Un-cards] DeckLimit keyword + Cardboard Carapace 2021-03-06 16:16:07 -05:00
John
5123b1d434 Update Time Spiral Remastered.txt 2021-03-06 20:21:03 +00:00
John
96dfc7425e Update Time Spiral Remastered.txt 2021-03-06 20:15:01 +00:00
John
05e8afdeb2 Update Time Spiral Remastered.txt 2021-03-06 20:03:02 +00:00
John
6f50a0520b Update blocks.txt 2021-03-06 19:44:37 +00:00
John
f30689ff4a Add new file 2021-03-06 19:40:46 +00:00
Michael Kamensky
0312e54590 Merge branch 'Williams-master-patch-33741' into 'master'
Historic Anthology 4

See merge request core-developers/forge!4125
2021-03-06 19:38:04 +00:00
John
db9af67f33 Add new file 2021-03-06 18:12:59 +00:00
Michael Kamensky
671aca556a Merge branch 'fixEphara' into 'master'
Ephara, God of the Polis: fix card drawing for opponent

See merge request core-developers/forge!4123
2021-03-06 12:37:59 +00:00
Michael Kamensky
cb5da0f99c Merge branch 'fix_text_renderer_crash' into 'master'
[Mobile] Fix crash issue in TextRenderer

See merge request core-developers/forge!4124
2021-03-06 12:37:53 +00:00
Lyu Zong-Hong
84d2f43265 Fix crash issue in TextRenderer 2021-03-06 21:15:33 +09:00
tool4EvEr
f46e96170a Fix card drawing for opponent 2021-03-06 13:02:52 +01:00