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 |
|
Michael Kamensky
|
fc1a291bdc
|
Merge branch 'master' into 'master'
Fix local Multiplayer Phase Indicator
See merge request core-developers/forge!5491
|
2021-10-03 04:32:42 +00:00 |
|
Michael Kamensky
|
fbb7ce8938
|
Merge branch 'npe' into 'master'
Fix NPE when attaching aura with Genesis Hydra
See merge request core-developers/forge!5488
|
2021-10-03 04:32:21 +00:00 |
|
Anthony Calosa
|
64c7e5b5cb
|
update empty stack not hidden on local multiplayer
|
2021-10-03 11:32:48 +08:00 |
|
tool4EvEr
|
50c5d479e6
|
copyLastState must happen before any move
|
2021-10-02 21:52:01 +02:00 |
|
Anthony Calosa
|
3bf4c33044
|
Fix local Multiplayer Phase Indicator
|
2021-10-02 13:56:40 +08:00 |
|
Michael Kamensky
|
2cec5db777
|
Merge branch 'twosat-master-patch-24386' into 'master'
Update de-DE.properties
See merge request core-developers/forge!5490
|
2021-10-02 03:52:32 +00:00 |
|
Andreas Bendel
|
13e1840da0
|
Update de-DE.properties
GrayText translation
|
2021-10-01 21:02:52 +00:00 |
|
Michael Kamensky
|
10a21fb1a6
|
Merge branch 'johnwilliams7-master-patch-48251' into 'master'
Update Pro Tour Promos.txt
See merge request core-developers/forge!5489
|
2021-10-01 20:27:47 +00:00 |
|
John Williams
|
356e9ff477
|
Update Pro Tour Promos.txt
|
2021-10-01 19:57:12 +00:00 |
|
Michael Kamensky
|
bb421ea2e6
|
Merge branch 'gray_text' into 'master'
Gray text preference
See merge request core-developers/forge!5485
|
2021-10-01 17:09:36 +00:00 |
|