external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,875 Commits 31 Branches 187 Tags
0ac4f98ffaaa4622acacad039145af646d35e14c
Commit Graph

48875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
c0b106c7ef valentin_dean_of_the_vein_lisette_dean_of_the_root.txt 2021-03-27 11:40:28 -04:00
Hythonia
23c8c5da19 Will fix 2021-03-27 15:37:30 +01:00
Hythonia
883f1a7cf8 DeckHas/DeckHints 2021-03-27 15:35:37 +01:00
Michael Kamensky
b2ff43bd9b Merge branch 'twosat-master-patch-55523' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4284
 2021-03-27 14:06:30 +00:00
Michael Kamensky
471bb1cacd Merge branch 'fix_mutate_mdfc' into 'master' 
Fix crash when mutate under an MDFC backside creature.

See merge request core-developers/forge!4286
 2021-03-27 14:05:08 +00:00
Northmoc
de30329a58 prismari_apprentice.txt 2021-03-27 09:23:51 -04:00
Lyu Zong-Hong
c990c8af56 Fix crash when mutate under an MDFC backside creature. 2021-03-27 22:00:20 +09:00
Hythonia
2dbd099c68 STX: Inkling type 2021-03-27 13:55:54 +01:00
Hythonia
25da363d56 STX: Rowan // Will 2021-03-27 13:50:10 +01:00
Hythonia
a957566fc9 STX: Lorehold Apprentice 2021-03-27 13:28:45 +01:00
Michael Kamensky
97db42427e Merge branch 'shaileEnterUnder' into 'master' 
Card: add turnInController to keep track under which control it entered

See merge request core-developers/forge!4282
 2021-03-27 12:14:09 +00:00
Hythonia
34fabaab5f STA: Abundant Harvest 2021-03-27 12:33:41 +01:00
Andreas Bendel
11893e244e Update de-DE.properties 
some Choose-strings
 2021-03-27 11:29:17 +00:00
Hythonia
24f1285a43 Breena and PlayerProperty.java update 2021-03-27 12:02:13 +01:00
Anthony Calosa
2d2e0fd6c0 Merge branch 'kevlahnota-master-patch-21990' into 'master' 
set correct imagekey for rollback

See merge request core-developers/forge!4283
 2021-03-27 10:54:51 +00:00
Anthony Calosa
5ea2aca8a8 set correct imagekey for rollback 2021-03-27 10:51:53 +00:00
Hans Mackowiak
088b4fa07e Card: add turnInController to keep track under which control it entered 2021-03-27 11:35:52 +01:00
Hans Mackowiak
7dcfbc409c STX: fix Execute$ Execute$ 2021-03-27 10:13:06 +01:00
Michael Kamensky
44bb2ff0f5 Merge branch 'drawing' into 'master' 
Move all hidden zone changing after choosing

See merge request core-developers/forge!4256
 2021-03-27 04:37:27 +00:00
Bug Hunter
4effb02219 Move all hidden zone changing after choosing 2021-03-27 04:37:27 +00:00
Michael Kamensky
5d7ad6bb81 Merge branch 'master' into 'master' 
STX: One Ward, two card

See merge request core-developers/forge!4273
 2021-03-27 04:37:13 +00:00
Michael Kamensky
2bef5d7653 Merge branch 'c21_26' into 'master' 
some C21 scripts

See merge request core-developers/forge!4274
 2021-03-27 04:36:54 +00:00
Michael Kamensky
6b76bec480 Merge branch 'new-cards' into 'master' 
Some STX cards

See merge request core-developers/forge!4276
 2021-03-27 04:36:31 +00:00
Michael Kamensky
76ab53078e Merge branch 'stx_26' into 'master' 
STX - 26 Mar (+Lesson type)

See merge request core-developers/forge!4278
 2021-03-27 04:35:36 +00:00
Michael Kamensky
ddf8df9c71 Merge branch 'fixStartDraw' into 'master' 
Don't count draws before game started

Closes #1781

See merge request core-developers/forge!4275
 2021-03-27 04:34:09 +00:00
Michael Kamensky
b312f28ab6 Merge branch 'add_word_of_command' into 'master' 
Add Word of Command

See merge request core-developers/forge!4281
 2021-03-27 04:33:42 +00:00
Michael Kamensky
d9e536b789 Merge branch 'shadrix' into 'master' 
STX: Shadrix, token, and CharmEffect support

See merge request core-developers/forge!4271
 2021-03-27 04:33:01 +00:00
Lyu Zong-Hong
2e768cb77b Add Word of Command 2021-03-27 12:25:20 +09:00
Northmoc
d611dbd386 quandrix_apprentice.txt 2021-03-26 20:30:43 -04:00
Northmoc
8976e238a5 silverquill_apprentice.txt 2021-03-26 20:27:22 -04:00
Northmoc
eb13bb8b6d witherbloom_apprentice.txt 2021-03-26 20:26:05 -04:00
Northmoc
d72eba1602 archmage_emeritus.txt 2021-03-26 20:21:45 -04:00
Northmoc
cd4685c093 eager_first_year.txt 2021-03-26 20:08:19 -04:00
Northmoc
bc3aa56ed9 remove unneeded NoResolvingCheck 2021-03-26 19:50:13 -04:00
Northmoc
903ead9e91 star_pupil.txt 2021-03-26 19:47:33 -04:00
Northmoc
bacbd8baf3 confront_the_past.txt 2021-03-26 19:36:07 -04:00
Bug Hunter
407c742124 Merge branch 'fixNPE' into 'master' 
AI: Fix NPE

See merge request core-developers/forge!4280
 2021-03-26 21:34:09 +00:00
tool4EvEr
34a91b7e3d Fix NPE 2021-03-26 22:33:23 +01:00
Northmoc
65f4724f87 add Lesson type 2021-03-26 16:56:21 -04:00
Northmoc
afafe46221 pest_summoning.txt and token 2021-03-26 16:55:56 -04:00
Northmoc
ff220113af storm_kiln_artist.txt (script by ?) 2021-03-26 15:28:00 -04:00
Adam Pantel
81c2c482cd Treasure Keeper, Kianne, Plargg 2021-03-26 15:25:10 -04:00
tool4EvEr
afb06baa56 Don't count draws before game started 2021-03-26 20:20:24 +01:00
Northmoc
d25ff61f22 dragonsguard_elite.txt (script by ?) 2021-03-26 15:12:08 -04:00
Northmoc
067f0b3a66 bandaid for CharmEffect.java description builder 2021-03-26 14:44:32 -04:00
Northmoc
0f71efd1e9 willowdusk_essence_seer.txt 2021-03-26 14:39:01 -04:00
Hythonia
351f9c1976 STX: Ward's TriggerDescription 2021-03-26 18:14:27 +01:00
Northmoc
a11eff4d9a add Optional param and prompt to CharmEffect.java 2021-03-26 12:44:11 -04:00
Northmoc
fe6a5a700a add optional Charm prompt 2021-03-26 12:43:34 -04:00
Northmoc
87a994b8ce shadrix_silverquill.txt v2 2021-03-26 12:42:52 -04:00