Northmoc
|
000b13780d
|
rampage_of_the_valkyries.txt (Marvel)
|
2020-12-21 11:31:08 -05:00 |
|
Northmoc
|
08c6c24c5f
|
magda_brazen_outlaw.txt (Marvel)
|
2020-12-21 11:31:08 -05:00 |
|
Anthony Calosa
|
7b44b4f680
|
Merge branch 'master' into 'master'
[Android] Option for Auto Cache size
See merge request core-developers/forge!3523
|
2020-12-21 16:03:58 +00:00 |
|
Anthony Calosa
|
c1cdcdcdfb
|
-[Android] Option for Auto Cache size
|
2020-12-22 00:00:17 +08:00 |
|
Hans Mackowiak
|
54c8fd74eb
|
SpellAbility: remove totalManaSpent variable
|
2020-12-20 11:10:41 +01:00 |
|
Hans Mackowiak
|
0d701224bf
|
Player: fix KeywordCollection iterating KeywordInterfaces
|
2020-12-20 10:41:40 +01:00 |
|
Hans Mackowiak
|
9df8679ed4
|
Merge branch '1678-use-hash-set-instead-of-enum-set-for-keyword-sets' into 'master'
Resolve "Use hash set instead of enum set for Keyword sets"
Closes #1678
See merge request core-developers/forge!3521
|
2020-12-20 08:40:16 +00:00 |
|
Hans Mackowiak
|
f670e131f9
|
Resolve "Use hash set instead of enum set for Keyword sets"
|
2020-12-20 08:40:16 +00:00 |
|
Hans Mackowiak
|
3c243556e2
|
Merge branch 'fixes' into 'master'
Fixes
See merge request core-developers/forge!3522
|
2020-12-20 07:04:51 +00:00 |
|
Tim Mocny
|
0d5b1ee324
|
Fixes
|
2020-12-20 07:04:51 +00:00 |
|
Michael Kamensky
|
ba482c2754
|
Merge branch 'modalPermSpells' into 'master'
MDFC: fix SpellPerm for Kaldheim
See merge request core-developers/forge!3520
|
2020-12-20 05:01:09 +00:00 |
|
Hans Mackowiak
|
a321e51583
|
MDFC: fix SpellPerm for Kaldheim
|
2020-12-19 12:35:58 +01:00 |
|
Hans Mackowiak
|
e801ff94e5
|
AnimateAi: fix mandatory needs to use getTargetableCards
|
2020-12-19 08:50:21 +01:00 |
|
Michael Kamensky
|
3e51fffb57
|
Merge branch 'IHasSVars' into 'master'
IHasSVars interface to connect CardTraitBase -> Card -> CardState
See merge request core-developers/forge!3519
|
2020-12-19 04:37:07 +00:00 |
|
Hans Mackowiak
|
cb6f4c1431
|
IHasSVars interface to connect CardTraitBase -> Card -> CardState
|
2020-12-18 21:36:59 +01:00 |
|
swordshine
|
301508d5ec
|
Merge branch 'khm17' into 'master'
KHM - 17 Dec
See merge request core-developers/forge!3515
|
2020-12-18 01:53:18 +00:00 |
|
swordshine
|
98cf7d3aaf
|
Merge branch 'fix' into 'master'
Cleanup Fix: Commune with Lava
See merge request core-developers/forge!3516
|
2020-12-18 01:53:01 +00:00 |
|
Northmoc
|
3a15945a37
|
KHM initial editions
|
2020-12-17 17:27:25 -05:00 |
|
Northmoc
|
2ccd690c2d
|
+ SubAbility$ Cleanup
|
2020-12-17 17:26:51 -05:00 |
|
Michael Kamensky
|
79e38ed5da
|
Merge branch 'khm15' into 'master'
KHM - 15 Dec
See merge request core-developers/forge!3512
|
2020-12-17 05:52:40 +00:00 |
|
Northmoc
|
610c8f8f38
|
MDFC lands
|
2020-12-15 19:40:02 -05:00 |
|
Northmoc
|
9e492c9fe2
|
showdown_of_the_skalds.txt
|
2020-12-15 19:31:46 -05:00 |
|
swordshine
|
573e7decf6
|
Merge branch 'sengir' into 'master'
sengir_the_dark_baron.txt +TriggerZones +AI
See merge request core-developers/forge!3511
|
2020-12-15 04:24:20 +00:00 |
|
Northmoc
|
3584099883
|
sengir_the_dark_baron.txt +TriggerZones +AI
|
2020-12-14 18:09:39 -05:00 |
|
Sol
|
54c16d995f
|
Merge branch 'patch-8' into 'master'
Update worlds.txt
See merge request core-developers/forge!3510
|
2020-12-14 13:47:54 +00:00 |
|
Gabriel Franco
|
479e4be56e
|
Update worlds.txt
|
2020-12-12 17:37:37 +00:00 |
|
Anthony Calosa
|
e8ee0f32bf
|
Merge branch 'master' into 'master'
Updated deckgen data
See merge request core-developers/forge!3509
|
2020-12-10 13:57:58 +00:00 |
|
Anthony Calosa
|
c4fb241cce
|
Updated deckgen data
-Austinio7116
|
2020-12-10 21:53:51 +08:00 |
|
Hans Mackowiak
|
56b5d53208
|
Cheat: fix cast cheat
|
2020-12-10 11:55:32 +01:00 |
|
Michael Kamensky
|
ef43f9307b
|
Merge branch 'booster-updates' into 'master'
Update edition files to only use Set cards sheets
See merge request core-developers/forge!3508
|
2020-12-10 04:48:22 +00:00 |
|
friarsol
|
b96c974d3a
|
Update edition files to only use Set cards sheets
|
2020-12-09 23:04:25 -05:00 |
|
Anthony Calosa
|
c9fc6dbc92
|
Merge branch 'colorsCtrlFix' into 'master'
CardFactoryUtil: make ColorsCtrl only check the players battlefield
See merge request core-developers/forge!3507
|
2020-12-09 13:06:50 +00:00 |
|
Hans Mackowiak
|
3d55e4704a
|
CardFactoryUtil: make ColorsCtrl only check the players battlefield
|
2020-12-09 13:08:43 +01:00 |
|
Michael Kamensky
|
68508f9456
|
Merge branch 'lathril' into 'master'
KHM: lathril_blade_of_the_elves.txt
See merge request core-developers/forge!3504
|
2020-12-09 04:54:21 +00:00 |
|
Michael Kamensky
|
beb214b0a2
|
Merge branch 'chosennumber' into 'master'
add chosen number to card detail pane
Closes #1668
See merge request core-developers/forge!3505
|
2020-12-09 04:54:04 +00:00 |
|
Hans Mackowiak
|
a401a35bec
|
Merge branch 'fix' into 'master'
living_hive.txt add CombatDamage$ True
See merge request core-developers/forge!3503
|
2020-12-08 17:50:00 +00:00 |
|
Northmoc
|
f6ddda9b38
|
add chosen number to card detail pane
|
2020-12-08 08:30:12 -05:00 |
|
Northmoc
|
ff9b21c1e5
|
lathril_blade_of_the_elves.txt
|
2020-12-08 07:31:27 -05:00 |
|
Northmoc
|
b26bba5b03
|
living_hive.txt add CombatDamage$ True
|
2020-12-08 07:30:18 -05:00 |
|
Anthony Calosa
|
d78327383d
|
Merge branch 'master' into 'master'
Fix ChangeZoneAllEffect LTB triggers
Closes #887
See merge request core-developers/forge!3502
|
2020-12-08 11:21:59 +00:00 |
|
Anthony Calosa
|
c9dab9c1d0
|
Fix ChangeZoneAllEffect LTB triggers
- fix Animate Dead + Worldgorger Dragon Combo
Closes #887
|
2020-12-08 19:21:01 +08:00 |
|
Michael Kamensky
|
635bb53f11
|
Merge branch 'master' into 'master'
Fix imports.
See merge request core-developers/forge!3501
|
2020-12-08 07:58:19 +00:00 |
|
Michael Kamensky
|
04ccb1d106
|
- Fix imports.
|
2020-12-08 10:57:34 +03:00 |
|
Michael Kamensky
|
f5b7d6d893
|
Merge branch 'master' into 'master'
Basic AI logic components for Raiding Party.
See merge request core-developers/forge!3500
|
2020-12-08 07:53:24 +00:00 |
|
Michael Kamensky
|
63beb045f9
|
- Basic AI logic components for Raiding Party.
|
2020-12-08 10:51:39 +03:00 |
|
Michael Kamensky
|
37149d43e9
|
Merge branch 'raiding' into 'master'
Raiding Party! Preferred Selection!
Closes #92 and #98
See merge request core-developers/forge!3493
|
2020-12-08 07:04:10 +00:00 |
|
Michael Kamensky
|
9a6f084fe7
|
Merge branch 'downgrade-miglayout' into 'master'
Miglayout 5+ breaks quest WinLoseView
See merge request core-developers/forge!3499
|
2020-12-08 06:57:24 +00:00 |
|
friarsol
|
3eaf694ca9
|
Miglayout 5+ breaks quest WinLoseView
|
2020-12-07 22:05:28 -05:00 |
|
Tim Mocny
|
6fff0ffb02
|
Merge branch 'migratecmr' into 'master'
migrate CMR (and un stuff that was put in Upcoming)
See merge request core-developers/forge!3497
|
2020-12-08 00:55:17 +00:00 |
|
Northmoc
|
8e40a9dd23
|
migrate CMR and un stuff that was put in Upcoming
|
2020-12-07 19:54:11 -05:00 |
|