Commit Graph

53641 Commits

Author SHA1 Message Date
leriomaggio
2e1777265d Specialised Stats for Commander decks
Stats panel now includes card count also for commander deck section (instead of total) for commander (sub)type game format // editor.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-06 15:54:00 +01:00
leriomaggio
73e5e5095d Setting constants for Localiser Mock so return value is testable
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-06 15:52:35 +01:00
Anthony Calosa
050ecb51bd [Mobile] refactor netplay phase indicator 2021-10-06 21:28:39 +08:00
Anthony Calosa
38f7d1ba83 Merge branch 'master' into 'master'
fix disable card images

See merge request core-developers/forge!5509
2021-10-06 09:47:08 +00:00
Anthony Calosa
eb01aa8e58 phase indicator 2021-10-06 17:46:00 +08:00
Anthony Calosa
0c2b0b3d9a fix disable card images 2021-10-06 17:33:02 +08:00
tool4EvEr
24f84c2835 Add ReplaceDamageAi 2021-10-06 10:10:47 +02:00
tool4EvEr
c65aa86f6b Clean up 2021-10-06 10:10:19 +02:00
Hans Mackowiak
164784fdad Update the_bears_of_littjara: fix SpellDescription 2021-10-06 07:28:51 +00:00
Michael Kamensky
a8115d8a44 Merge branch 'refrain' into 'master'
Add AI for Rousing Refrain

See merge request core-developers/forge!5508
2021-10-05 18:31:46 +00:00
tool4EvEr
8ea9eb6118 Add AI for Rousing Refrain 2021-10-05 20:16:34 +02:00
Anthony Calosa
27b0fb3247 Merge branch 'master' into 'master'
move back the targeting arrows so they wouldn't drawn on top of the game menu overlay

See merge request core-developers/forge!5507
2021-10-05 14:18:30 +00:00
Anthony Calosa
df100b5b77 move back the targeting arrows so they wouldn't drawn on top of the game menu overlay 2021-10-05 22:15:54 +08:00
Anthony Calosa
48d5d7112a Merge branch 'master' into 'master'
unused import

See merge request core-developers/forge!5506
2021-10-05 08:17:50 +00:00
Anthony Calosa
7edab67dd1 unused import 2021-10-05 16:17:09 +08:00
Anthony Calosa
6949cb0cb6 Merge branch 'master' into 'master'
move indicators and arrows out of drawoverlay

See merge request core-developers/forge!5505
2021-10-05 08:09:29 +00:00
Anthony Calosa
3c78e6b1b2 move indicators and arrows out of drawoverlay 2021-10-05 16:07:49 +08:00
Anthony Calosa
8b63c71a05 Merge branch 'master' into 'master'
minor adjustments

See merge request core-developers/forge!5504
2021-10-05 06:34:46 +00:00
Anthony Calosa
a1ff670df2 minor adjustments 2021-10-05 14:33:51 +08:00
Michael Kamensky
31ad3bf7a5 Merge branch 'master' into 'master'
[Mobile] Fix targeting arrows on Netplay

See merge request core-developers/forge!5502
2021-10-05 06:16:02 +00:00
Anthony Calosa
30c5ef6aeb remove unused vars 2021-10-05 14:08:32 +08:00
Anthony Calosa
ca0a012106 Merge remote-tracking branch 'core/master' 2021-10-05 14:04:34 +08:00
Anthony Calosa
7c24c529fa [Mobile] Fix targeting arrows on Netplay. 2021-10-05 14:03:08 +08:00
Anthony Calosa
3de2410280 Merge branch 'master' into 'master'
# fix Cleanup Phase Highlight

See merge request core-developers/forge!5501
2021-10-05 05:07:10 +00:00
Anthony Calosa
eafd04c6e6 # fix Cleanup Phase Highlight
- todo: find out why this is needed, something is affecting the getplayerturn on every eot..
2021-10-05 13:05:10 +08:00
Michael Kamensky
04ceec158a Merge branch 'master' into 'master'
Added puzzle PS_MID1 - Possibility Storm - Innistrad Midnight Hunt 01

See merge request core-developers/forge!5500
2021-10-05 04:55:17 +00:00
Michael Kamensky
d444c7ec82 - Added puzzle PS_MID1. 2021-10-05 07:54:28 +03:00
Michael Kamensky
0416240809 Merge branch 'master' into 'master'
Attempt to fix FightAi for Back for More.

See merge request core-developers/forge!5497
2021-10-05 04:06:50 +00:00
Michael Kamensky
94d8342279 - Remove unintended commit. 2021-10-05 07:06:31 +03:00
Michael Kamensky
baff2a5486 - Minor change to the code. 2021-10-05 07:04:43 +03:00
Michael Kamensky
9ced0e0d76 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-10-05 07:02:29 +03:00
Michael Kamensky
fd41a0c00f Merge branch 'combo' into 'master'
Fix Combo Attack

See merge request core-developers/forge!5499
2021-10-05 04:01:43 +00:00
tool4EvEr
2435111048 Fix Combo Attack 2021-10-04 23:06:13 +02:00
Anthony Calosa
693d5c4597 Merge branch 'master' into 'master'
[Mobile] fix accuracy for mouse hover

See merge request core-developers/forge!5498
2021-10-04 20:27:13 +00:00
Anthony Calosa
58403fde5b [Mobile] fix accuracy for mouse hover 2021-10-05 04:25:50 +08:00
Michael Kamensky
fe60e5ef31 - Attempt to fix FightAi for Back for More, part 2. 2021-10-04 23:04:11 +03:00
Michael Kamensky
40af8ba071 - Attempt to fix FightAi for Back for More. 2021-10-04 23:03:37 +03:00
Bug Hunter
5bd6be02c6 Merge branch 'aifix' into 'master'
Fix DamageDealAi when not targeting players

See merge request core-developers/forge!5496
2021-10-04 19:53:52 +00:00
tool4EvEr
34fdad4379 Fix DamageDealAi when not targeting players 2021-10-04 21:54:13 +02:00
Michael Kamensky
c6e072cc1a Merge branch 'master' into 'master'
Fix imports.

See merge request core-developers/forge!5495
2021-10-04 19:24:50 +00:00
Michael Kamensky
4885898588 - Fix imports. 2021-10-04 22:24:14 +03:00
Michael Kamensky
2aa70f7dc3 Merge branch 'suspend' into 'master'
Fix Quicken + Suspend

See merge request core-developers/forge!5494
2021-10-04 18:09:53 +00:00
tool4EvEr
4470cdc0bf Don't allow suspend when Split Second 2021-10-04 18:31:13 +02:00
TRT
8e35f0b4ce Clean up 2021-10-04 17:19:15 +02:00
TRT
d24bbf1979 Cleanup usesTargeting 2021-10-04 17:13:37 +02:00
TRT
68f3879f11 Fix Quicken + Suspend 2021-10-04 14:05:13 +02:00
Michael Kamensky
ecf1843922 Merge branch 'aifix' into 'master'
Improvements for Oath of Mages, Grimoire Thief & Tyrant of Discord

See merge request core-developers/forge!5493
2021-10-04 03:44:53 +00:00
tool4EvEr
42b6d39726 Improvements for Oath of Mages, Grimoire Thief & Tyrant of Discord 2021-10-04 00:51:34 +02:00
Anthony Calosa
97b5100fc9 Merge branch 'master' into 'master'
update TrackableProperty

See merge request core-developers/forge!5492
2021-10-03 09:58:45 +00:00
Anthony Calosa
194b4b2128 update TrackableProperty 2021-10-03 17:57:40 +08:00