Sol
|
69877221c6
|
Merge branch 'migrate-upcoming' into 'master'
Migrate upcoming VOW
See merge request core-developers/forge!5853
|
2021-11-18 04:25:55 +00:00 |
|
friarsol
|
9b948362d7
|
Migrate upcoming VOW
|
2021-11-17 23:23:04 -05:00 |
|
Michael Kamensky
|
616bfd47a6
|
Merge branch 'shortcut' into 'master'
Fix Gutter Shortcut
See merge request core-developers/forge!5850
|
2021-11-18 03:56:56 +00:00 |
|
Michael Kamensky
|
f84e389b27
|
Merge branch 'TRT-master-patch-35244' into 'master'
Update forge-gui/res/cardsfolder/b/burning_rune_demon.txt
See merge request core-developers/forge!5851
|
2021-11-18 03:56:37 +00:00 |
|
Michael Kamensky
|
3c3d42fe7d
|
Merge branch 'adventure' into 'master'
Added multiple decks in adventure.
See merge request core-developers/forge!5852
|
2021-11-18 03:56:24 +00:00 |
|
Grimm
|
7e8d3b0bd7
|
Adjusted Deck selector
|
2021-11-18 03:28:27 +01:00 |
|
Grimm
|
ef8c7a81e7
|
Fixed save in dungeons/towns
|
2021-11-18 03:19:41 +01:00 |
|
Grimm
|
ca56e1bb4e
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure
|
2021-11-18 02:27:16 +01:00 |
|
Grimm
|
c47af43006
|
Added multiple decks in adventure.
Adjusted deck editor to enable usage in adventure mode.
Fixed a crash after a match.
|
2021-11-18 02:27:01 +01:00 |
|
Bug Hunter
|
48ffaf4479
|
Update forge-gui/res/cardsfolder/b/burning_rune_demon.txt
|
2021-11-17 21:23:54 +00:00 |
|
tool4EvEr
|
22fb4fd665
|
Fix Gutter Shortcut
|
2021-11-17 21:22:25 +01:00 |
|
Anthony Calosa
|
98073b49f4
|
Merge branch 'master' into 'master'
Fix land colors for combo mana
See merge request core-developers/forge!5849
|
2021-11-17 15:36:19 +00:00 |
|
Anthony Calosa
|
0cb63c7821
|
Merge remote-tracking branch 'core/master'
|
2021-11-17 23:32:04 +08:00 |
|
Michael Kamensky
|
5e1766b71e
|
Merge branch 'karn' into 'master'
RestartGameAi: Improve filtering
See merge request core-developers/forge!5848
|
2021-11-17 15:27:02 +00:00 |
|
Michael Kamensky
|
d83dee9e1a
|
Merge branch 'Svaldan-master-patch-89029' into 'master'
Fixed activation cost for Wedding Invitation
See merge request core-developers/forge!5845
|
2021-11-17 15:26:18 +00:00 |
|
Anthony Calosa
|
ea0ae4d8bc
|
Fix combo color for CardView land colors
|
2021-11-17 23:25:43 +08:00 |
|
Job Spijker
|
a010ab7044
|
Fixed activation cost for real this time
|
2021-11-17 13:55:54 +00:00 |
|
TRT
|
2d11b1a99a
|
Improve filtering
|
2021-11-17 14:09:11 +01:00 |
|
Michael Kamensky
|
eb2afcc191
|
Merge branch 'TRT-master-patch-25217' into 'master'
Update forge-gui/res/cardsfolder/e/enduring_angel_angelic_enforcer.txt
See merge request core-developers/forge!5847
|
2021-11-17 11:51:51 +00:00 |
|
Bug Hunter
|
9efcdc25ba
|
Update forge-gui/res/cardsfolder/e/enduring_angel_angelic_enforcer.txt
|
2021-11-17 10:17:08 +00:00 |
|
Bug Hunter
|
c78f09f9a3
|
Merge branch 'NPE' into 'master'
Add NPE Guards when checking for adding to combat
See merge request core-developers/forge!5846
|
2021-11-17 10:08:10 +00:00 |
|
TRT
|
5bce17ab3c
|
Add NPE Guards
|
2021-11-17 11:05:39 +01:00 |
|
Job Spijker
|
d9bcca43cc
|
Fixed activation cost for Wedding Invitation
|
2021-11-17 07:07:15 +00:00 |
|
Anthony Calosa
|
4e18ddd0df
|
Merge remote-tracking branch 'core/master'
|
2021-11-17 07:33:49 +08:00 |
|
Northmoc
|
68f0f5e440
|
goblin_welder.txt revis
|
2021-11-16 15:16:51 -05:00 |
|
Michael Kamensky
|
2aeff0a8fb
|
Merge branch 'arsonist' into 'master'
VOC: Midnight Arsonist + Support
See merge request core-developers/forge!5840
|
2021-11-16 18:19:00 +00:00 |
|
Michael Kamensky
|
7726b9a0e3
|
Merge branch 'austeregrim-master-patch-35402' into 'master'
Update readme, with discord invite link
See merge request core-developers/forge!5843
|
2021-11-16 18:18:37 +00:00 |
|
Austere Grim
|
67342fd44c
|
Update readme, with discord invite link
|
2021-11-16 18:16:18 +00:00 |
|
Michael Kamensky
|
861e187751
|
Merge branch 'TRT-master-patch-91682' into 'master'
Update forge-gui/res/cardsfolder/upcoming/reclusive_taxidermist.txt
See merge request core-developers/forge!5842
|
2021-11-16 12:10:25 +00:00 |
|
Bug Hunter
|
a9e1b596bd
|
Update forge-gui/res/cardsfolder/upcoming/reclusive_taxidermist.txt
|
2021-11-16 09:39:54 +00:00 |
|
Michael Kamensky
|
b30ad498be
|
Merge branch 'Svaldan-master-patch-34492' into 'master'
VOC cards – Svaldan master patch 34492
See merge request core-developers/forge!5837
|
2021-11-16 07:48:02 +00:00 |
|
Job Spijker
|
03e49e92e6
|
Fixed DeckHas and newline
|
2021-11-16 06:46:34 +00:00 |
|
Job Spijker
|
dbec0b983b
|
Fixed DeckHas
|
2021-11-16 06:45:40 +00:00 |
|
Job Spijker
|
4b27d719d7
|
Fixed DeckHas and newline
|
2021-11-16 06:44:50 +00:00 |
|
Anthony Calosa
|
73a8e38d4b
|
Merge remote-tracking branch 'core/master'
|
2021-11-16 13:22:28 +08:00 |
|
Michael Kamensky
|
14707ce7ca
|
Merge branch 'archfiend' into 'master'
VOC: Shadowgrange Archfiend + Support
See merge request core-developers/forge!5838
|
2021-11-16 03:21:26 +00:00 |
|
Michael Kamensky
|
f80a2e8137
|
Merge branch 'voc_15' into 'master'
VOC: 15 Nov
See merge request core-developers/forge!5839
|
2021-11-16 03:20:29 +00:00 |
|
Northmoc
|
c54b6c9d83
|
disorder_in_the_court.txt
|
2021-11-15 22:15:42 -05:00 |
|
Michael Kamensky
|
ed97ba7ee8
|
Merge branch 'aifix' into 'master'
Fix AI checking for Ward Cost when trying to add trigger to stack
See merge request core-developers/forge!5836
|
2021-11-16 03:15:18 +00:00 |
|
Northmoc
|
8e04757fb8
|
sinister_waltz.txt
|
2021-11-15 22:14:25 -05:00 |
|
Northmoc
|
722f2483f8
|
sudden_disappearance.txt typo
|
2021-11-15 22:08:42 -05:00 |
|
Sol
|
cf296e9020
|
Merge branch 'fix' into 'master'
haakon_stromgald_scourge_avatar.txt better ValidCard
See merge request core-developers/forge!5841
|
2021-11-16 02:51:51 +00:00 |
|
Northmoc
|
c102d2a316
|
haakon_stromgald_scourge_avatar.txt better ValidCard
|
2021-11-15 21:35:34 -05:00 |
|
Northmoc
|
b1b2ff2299
|
support "withoutManaAbility" as CardProperty
|
2021-11-15 21:31:06 -05:00 |
|
Northmoc
|
32f9d20ffd
|
midnight_arsonist.txt
|
2021-11-15 21:30:19 -05:00 |
|
Northmoc
|
9031737133
|
imposing_grandeur.txt
|
2021-11-15 21:26:59 -05:00 |
|
Northmoc
|
849b63155e
|
tweak building Madness string in Card Detail to allow for non-mana components
|
2021-11-15 19:54:10 -05:00 |
|
Northmoc
|
73452b5b8c
|
support finding GreatestPower among Remembered/RememberedLKI/etc
|
2021-11-15 19:53:25 -05:00 |
|
Northmoc
|
5f10933e95
|
more generic/current Madness reminder text
|
2021-11-15 19:51:16 -05:00 |
|
Hans Mackowiak
|
46f840c837
|
Merge branch 'fixes' into 'master'
Fix Thunderous Orator
See merge request core-developers/forge!5835
|
2021-11-16 00:51:09 +00:00 |
|