external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 01:38:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,094 Commits 31 Branches 187 Tags
bc85d9fcbe01c3be80426c76b36b78692901f21c
Commit Graph

55094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grimm
1ac45157bb merged Fregnor content 
fixed large maps
added pixmap for player pos on mini map
 2022-01-04 23:48:09 +01:00
Grimm
6fd8d94269 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2022-01-04 23:47:51 +01:00
Grimm
e6d2ba2517 merged Fregnor content 
fixed large maps
added pixmap for player pos on mini map
 2022-01-04 23:47:09 +01:00
tool4EvEr
cca65c6661 Cascade fix for Garth 2022-01-04 23:08:42 +01:00
tool4EvEr
ff3a7e5e73 Fix Pump & Double 2022-01-04 22:42:33 +01:00
Northmoc
91bea1e2a7 eternal_dominion.txt fix Desc 2022-01-04 12:00:14 -05:00
Michael Kamensky
740eea7d95 Merge branch 'goadai' into 'master' 
GoadAi: improve targeting for triggers

See merge request core-developers/forge!6010
 2022-01-04 08:47:14 +00:00
Michael Kamensky
2c78a06f4e Merge branch 'haunt' into 'master' 
Haunt fixes

See merge request core-developers/forge!6009
 2022-01-04 08:46:43 +00:00
Bug Hunter
3d0f7fa1de Merge branch 'TRT-master-patch-90059' into 'master' 
Update forge-gui/res/cardsfolder/e/eternal_dominion.txt

See merge request core-developers/forge!6011
 2022-01-04 08:17:07 +00:00
Bug Hunter
e996849fa7 Update forge-gui/res/cardsfolder/e/eternal_dominion.txt 2022-01-04 08:16:33 +00:00
tool4EvEr
a111ea1617 Fix missing trigger 2022-01-03 16:59:18 +01:00
tool4EvEr
70a8cb6c26 GoadAi: improve targeting for triggers 2022-01-03 16:26:36 +01:00
tool4EvEr
aa66eee6de Haunt fixes 2022-01-03 15:02:11 +01:00
Hans Mackowiak
bb4b8bd0e6 Merge branch 'fixing' into 'master' 
Card fixes

See merge request core-developers/forge!6008
 2022-01-03 10:03:33 +00:00
Bug Hunter
535ea437c1 Card fixes 2022-01-03 10:03:33 +00:00
Michael Kamensky
7aa55f0ff3 Merge branch 'protectionStaticRework' into 'master' 
Protection: use Static CantAttach + CantTarget

See merge request core-developers/forge!6006
 2022-01-02 13:18:05 +00:00
Hans Mackowiak
dc7d226b04 Protection: use Static CantAttach + CantTarget 2022-01-02 13:18:04 +00:00
Hans Mackowiak
6fa3f052ea Merge branch 'epic' into 'master' 
Fix Epic targeting

See merge request core-developers/forge!6007
 2022-01-02 13:13:29 +00:00
tool4EvEr
56f8d7f23a Fix Epic targeting 2022-01-02 12:05:56 +01:00
Michael Kamensky
6a06b81f1b Merge branch 'aifix' into 'master' 
Fix missing trigger with TargetType$ Spell

See merge request core-developers/forge!6004
 2021-12-31 15:31:24 +00:00
Michael Kamensky
bda61cb7fc Merge branch 'discarding' into 'master' 
DiscardEffect: fix discarding 0

Closes #1595

See merge request core-developers/forge!6005
 2021-12-31 15:31:17 +00:00
tool4EvEr
288b53042c DiscardEffect: fix discarding 0 2021-12-31 15:31:06 +01:00
tool4EvEr
1d276c23b9 Fix missing trigger with TargetType$ Spell 2021-12-31 11:53:43 +01:00
Michael Kamensky
06c5a5748e Merge branch 'neo_su' into 'master' 
NEO: Satoru Umezawa and support

See merge request core-developers/forge!5996
 2021-12-30 17:00:24 +00:00
Michael Kamensky
46520bba8a Merge branch 'fixes' into 'master' 
Misc fixes

See merge request core-developers/forge!6002
 2021-12-30 13:49:10 +00:00
tool4EvEr
19e0462069 Clean up 2021-12-30 13:38:13 +01:00
tool4EvEr
b74de630e5 Fix return to hand when Hofri trigger resolves first 2021-12-30 12:51:58 +01:00
tool4EvEr
32fcf697ab Fix wrong bytes missing colorless 2021-12-30 12:50:27 +01:00
tool4EvEr
5c4cfceaa8 Don't check activator (they should also work after Drain Power) 2021-12-30 12:49:41 +01:00
Anthony Calosa
314fb78ff7 Merge branch 'kevlahnota-master-patch-81657' into 'master' 
fix funny card filter, it seems the inclusion of shock lands on funny set...

See merge request core-developers/forge!6000
 2021-12-30 00:12:38 +00:00
Anthony Calosa
7028a0dfae fix funny card filter, it seems the inclusion of shock lands on funny set (Unfinity) causes the filter to fail... 2021-12-30 00:12:01 +00:00
Anthony Calosa
4548d04958 Merge branch 'spacing' into 'master' 
add missing space to revealed message

See merge request core-developers/forge!5998
 2021-12-29 23:32:57 +00:00
Anthony Calosa
4fcfcdfba7 Merge branch 'sld' into 'master' 
SLD update

See merge request core-developers/forge!5999
 2021-12-29 23:32:29 +00:00
paul_snoops
811ba977db SLD update 2021-12-29 21:20:41 +00:00
Northmoc
9c76709d79 add missing space to revealed message 2021-12-29 15:58:29 -05:00
Michael Kamensky
808c278f42 Merge branch 'unf_sih' into 'master' 
UNF: Saw in Half and support

See merge request core-developers/forge!5987
 2021-12-29 17:28:09 +00:00
Michael Kamensky
bfa3911761 Merge branch 'unf_sfg' into 'master' 
UNF: The Space Family Goblinson and support

See merge request core-developers/forge!5988
 2021-12-29 17:27:56 +00:00
Northmoc
e284eb2426 ForgeScript: Support "Whenever you activate a ninjutsu ability" trigger 2021-12-29 09:59:50 -05:00
Northmoc
15f5512df2 SpellAbility: add isNinjutsu boolean 2021-12-29 09:59:09 -05:00
Northmoc
0ddb448f11 satoru_umezawa.txt 2021-12-29 09:57:12 -05:00
Hans Mackowiak
5921f07a03 Merge branch 'sagas' into 'master' 
Fix saga chapters

See merge request core-developers/forge!5995
 2021-12-29 14:38:24 +00:00
tool4EvEr
d17ab3dce1 Fix saga chapters 2021-12-29 15:13:44 +01:00
Michael Kamensky
79346c2049 Merge branch 'master' into 'master' 
Prepare Forge for Android publish 1.6.47.001 [incremental]

See merge request core-developers/forge!5994
 2021-12-29 06:31:57 +00:00
Michael Kamensky
3bd19eeee3 - Prepare Forge for Android publish 1.6.47.001 [incremental] 2021-12-29 09:29:47 +03:00
Michael Kamensky
f61e4c610f [maven-release-plugin] prepare for next development iteration 2021-12-29 09:09:22 +03:00
Michael Kamensky
08efcfbf79 [maven-release-plugin] prepare release forge-1.6.47 forge-1.6.47 2021-12-29 09:09:11 +03:00
Michael Kamensky
8cd19b6919 Merge branch 'master' into 'master' 
Fix imports.

See merge request core-developers/forge!5993
 2021-12-29 06:07:33 +00:00
Michael Kamensky
944716c6d6 - Fix imports. 2021-12-29 09:07:02 +03:00
Michael Kamensky
6dcde6b438 Merge branch 'teferiInstantSpeedRework' into 'master' 
make Teferi's use CastWithFlash for the Effect that allows PW abilities at instant speed

See merge request core-developers/forge!5992
 2021-12-28 19:59:23 +00:00
Michael Kamensky
83bd3eaffc Merge branch 'y22_lh' into 'master' 
Y22: Lupine Harbingers and support

See merge request core-developers/forge!5979
 2021-12-28 19:58:28 +00:00