Commit Graph

47841 Commits

Author SHA1 Message Date
John
77e2ccbb78 Update lorehold_command.txt 2021-02-19 20:45:06 +00:00
John
d614185a76 Update quandrix_command.txt 2021-02-19 20:44:05 +00:00
John
c675e54986 Update prismari_command.txt 2021-02-19 20:43:56 +00:00
John
f08b41a2f5 Update lorehold_command.txt 2021-02-19 20:43:49 +00:00
John
9d1f1300a2 Update silverquill_command.txt 2021-02-19 20:43:45 +00:00
John
56066bf91b Update witherbloom_command.txt 2021-02-19 20:25:05 +00:00
John
e7fcdfad9b Update witherbloom_command.txt 2021-02-19 20:22:51 +00:00
John
03685a426a Update lorehold_command.txt 2021-02-19 20:21:27 +00:00
John
e1bb2a8938 Update lorehold_command.txt 2021-02-19 16:46:17 +00:00
John
4ec06589e0 Upload New File 2021-02-19 16:45:14 +00:00
John
02bc6d438f Upload New File 2021-02-19 16:44:13 +00:00
John
21d486ba17 Update witherbloom_command.txt 2021-02-19 16:16:20 +00:00
John
e622631c08 Upload New File 2021-02-19 16:01:19 +00:00
John
a6c6baa21a silverquill command 2021-02-19 15:39:08 +00:00
John
eb4466e0c6 Update quandrix_command.txt 2021-02-19 13:54:46 +00:00
John
9695e071b9 Update prismari_command.txt 2021-02-19 13:54:20 +00:00
John
5aa0f1c6b4 Update quandrix_command.txt 2021-02-19 11:50:22 +00:00
John
88b9b2a1d5 Update prismari_command.txt 2021-02-19 11:49:26 +00:00
John
111e5005e7 Upload New File 2021-02-19 11:48:40 +00:00
John
74601ef42d Add new file 2021-02-19 11:47:30 +00:00
Michael Kamensky
fda2dfe6aa Merge branch 'master' into 'master'
A simple AI logic to enable Oko, the Trickster ultimate

See merge request core-developers/forge!3916
2021-02-19 11:38:15 +00:00
Michael Kamensky
b9c9357d94 - Clean up imports. 2021-02-19 14:37:26 +03:00
Michael Kamensky
c519600629 - A somewhat more generally applicable logic. 2021-02-19 14:35:37 +03:00
Michael Kamensky
cffef2e479 - A simple logic to enable Ultimate for Oko, the Trickster for the AI (to be improved). 2021-02-19 14:23:28 +03:00
Michael Kamensky
4fc799af21 Merge branch 'master' into 'master'
Fix AI crash for Valki, God of Lies

See merge request core-developers/forge!3915
2021-02-19 08:35:48 +00:00
Michael Kamensky
922b96221d - Fix AI crash for Valki, God of Lies 2021-02-19 11:35:16 +03:00
Michael Kamensky
e3e39ab547 Merge branch 'master' into 'master'
An even cleaner implementation for CountersAi keyword counters logic

See merge request core-developers/forge!3914
2021-02-19 08:22:37 +00:00
Michael Kamensky
76d5e967c2 - An even cleaner implementation for CountersAi keyword counters logic 2021-02-19 11:22:02 +03:00
Michael Kamensky
85e3496c32 Merge branch 'churrufli-master-patch-91518' into 'master'
Update skinsList.txt (added kevlanota's Magic skin)

See merge request core-developers/forge!3912
2021-02-19 08:18:02 +00:00
Michael Kamensky
f4601c95dc Merge branch 'master' into 'master'
Cleaner implementation for CountersAi keyword counters logic

See merge request core-developers/forge!3913
2021-02-19 08:14:57 +00:00
Michael Kamensky
e85215c2e4 - Cleaner implementation for CountersAi keyword counters logic 2021-02-19 11:14:32 +03:00
Churrufli
61bcce021b Update skinsList.txt (added kevlanota's Magic skin) 2021-02-19 08:05:34 +00:00
Michael Kamensky
01f213edc0 Merge branch 'master' into 'master'
Fix inverse logic in AnimateAi

See merge request core-developers/forge!3911
2021-02-19 07:29:27 +00:00
Michael Kamensky
a1ea13ac5d - Fix inverse logic in AnimateAi 2021-02-19 10:28:38 +03:00
Michael Kamensky
1aec4309c9 Merge branch 'master' into 'master'
Don't miss mandatory activations from triggers in AttachAi

See merge request core-developers/forge!3910
2021-02-19 06:56:04 +00:00
Michael Kamensky
b060c6da39 - Don't miss mandatory activations from triggers in AttachAi 2021-02-19 09:55:16 +03:00
Michael Kamensky
6b16bba61f Merge branch 'master' into 'master'
Better comment for the Proguard thing

See merge request core-developers/forge!3909
2021-02-19 06:52:34 +00:00
Michael Kamensky
73bbb68597 - Better comment for the Proguard thing 2021-02-19 09:51:12 +03:00
Michael Kamensky
cf9aee9602 Merge branch 'master' into 'master'
Revert an accidental commit.

See merge request core-developers/forge!3908
2021-02-19 06:48:49 +00:00
Michael Kamensky
23f8bc40db - Revert an accidental commit. 2021-02-19 09:48:16 +03:00
Anthony Calosa
860660c504 Merge branch 'master' into 'master'
[Android] fix compiling error

See merge request core-developers/forge!3907
2021-02-19 06:45:43 +00:00
Anthony Calosa
7bbc9ab1f8 [Android] fix compiling error 2021-02-19 14:44:36 +08:00
Michael Kamensky
39af8f656c Merge branch 'unset-cards' into 'master'
More unset scripts

See merge request core-developers/forge!3890
2021-02-19 05:47:41 +00:00
Adam Pantel
0fe909a6f2 Some un-set and cmb1 scripts 2021-02-18 23:54:39 -05:00
Michael Kamensky
46d0ec4f94 Merge branch 'localization_japanese' into 'master'
Add Japanese localization and fix split card view

See merge request core-developers/forge!3892
2021-02-19 04:05:22 +00:00
Alumi
92d9bebc58 Add Japanese localization and fix split card view 2021-02-19 04:05:22 +00:00
Michael Kamensky
2f74fc51a1 Merge branch 'oracle' into 'master'
Most recent Oracle changes

See merge request core-developers/forge!3906
2021-02-19 04:04:12 +00:00
Michael Kamensky
501755f894 Merge branch 'fixtypo' into 'master'
Timely Ward: fix flash targeting

See merge request core-developers/forge!3905
2021-02-19 04:02:55 +00:00
Michael Kamensky
01da0e88d3 Merge branch 'fixAItrigger' into 'master'
Fix AI mandatory trigger

See merge request core-developers/forge!3904
2021-02-19 04:02:45 +00:00
Northmoc
53fa576d64 skinshifter.txt and CharmEffect.java support 2021-02-18 19:51:08 -05:00