external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,180 Commits 33 Branches 187 Tags
d5d70b51a7f141091a1047be1d8a37dffc2d00f6
Commit Graph

55180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
1051bea700 conductive_current.txt 2021-12-10 10:00:31 -05:00
Northmoc
0055e661c3 assemble_from_parts.txt remove unneeded 2021-12-10 08:14:03 -05:00
Michael Kamensky
a91a1bb390 Merge branch 'y22' into 'master' 
Y22 Edition File

See merge request core-developers/forge!5927
 2021-12-10 12:10:34 +00:00
Paul Hammerton
5b549e6f9f Y22 Edition File 2021-12-10 08:56:50 +00:00
Northmoc
4cdc7ea3c8 MakeCardEffect: support "DefinedName" for Clone Crafter 2021-12-09 23:26:09 -05:00
Northmoc
d50308e929 clone_crafter.txt 2021-12-09 23:25:33 -05:00
Northmoc
95b2dadd66 antique_collector.txt 2021-12-09 22:27:29 -05:00
Northmoc
70d30e43f2 angel_of_unity.txt 2021-12-09 20:20:14 -05:00
Northmoc
83f72222f6 fearsome_whelp.txt 2021-12-09 19:43:52 -05:00
Northmoc
c3755a111f assemble_from_parts.txt 2021-12-09 19:27:26 -05:00
Northmoc
fdca59d33e absorb_energy.txt 2021-12-09 19:26:33 -05:00
Northmoc
bf061f9ffe begin_anew.txt 2021-12-09 18:24:31 -05:00
Northmoc
bd8ab17c3f support updating remembered cards hidden by Perpetual Effect after they leave the hand 2021-12-09 15:18:27 -05:00
Northmoc
0f3a48b488 hide cards remembered from hand for Perpetual Effect until after they leave the hand 2021-12-09 15:17:42 -05:00
Northmoc
ae5637edba hide cards chosen from hand for Perpetual Effect until after they leave the hand 2021-12-09 15:17:16 -05:00
Northmoc
ba6d1a61fb freyalise_skyshroud_partisan.txt fix 2021-12-09 15:16:05 -05:00
Northmoc
796b5da05e sarkhan_wanderer_to_shiv.txt fix 2021-12-09 15:15:42 -05:00
Northmoc
bac287e2ae geistchanneler.txt fix 2021-12-09 14:20:56 -05:00
Northmoc
f2a4303098 cosmetic changes to Jumpstart digital cards 2021-12-09 14:17:34 -05:00
Michael Kamensky
65b1c2478f Merge branch 'efreet' into 'master' 
Fix Fickle Efreet duplicating itself when dead before flip resolves

See merge request core-developers/forge!5925
 2021-12-09 18:52:49 +00:00
tool4EvEr
00ce9bacdd Fix Fickle Efreet duplicating itself when dead before flip resolves 2021-12-09 19:22:43 +01:00
Michael Kamensky
642ac6f4ec Merge branch 'TRT-master-patch-00429' into 'master' 
Encore: don't sacrifice if you're not the controller

See merge request core-developers/forge!5924
 2021-12-09 17:01:11 +00:00
Michael Kamensky
4b3c961a22 Merge branch 'twosat-master-patch-91620' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5923
 2021-12-09 14:53:22 +00:00
Bug Hunter
2b45f3b000 Encore: don't sacrifice if you're not the controller 2021-12-09 13:33:48 +00:00
Andreas Bendel
418fd4739a Update de-DE.properties 
translated lblChooseCardDraft
 2021-12-09 10:44:59 +00:00
Michael Kamensky
81531b3339 Merge branch 'ordering' into 'master' 
Fix missing zone ordering e.g. Plow Under

See merge request core-developers/forge!5922
 2021-12-09 03:25:31 +00:00
Michael Kamensky
fde571548e Merge branch 'adventure' into 'master' 
Some bugfixes and a new statistic screen

See merge request core-developers/forge!5917
 2021-12-09 03:25:18 +00:00
tool4EvEr
3109745a9d Fix missing zone ordering e.g. Plow Under 2021-12-08 21:49:46 +01:00
Northmoc
4b4c62f77d AbilityUtils: add StartingPlayer Count calculation 2021-12-08 10:50:08 -05:00
Northmoc
920f762a91 Player.java: add isStartingPlayer boolean 2021-12-08 10:49:47 -05:00
Northmoc
0cb66b4a1a GameAction.java: add setStartingPlayer 2021-12-08 10:49:02 -05:00
Northmoc
193834af48 add startingPlayer to Game 2021-12-08 10:48:29 -05:00
Northmoc
82325bd634 forsaken_crossroads.txt 2021-12-08 10:48:04 -05:00
Bug Hunter
3bfe96aaeb Merge branch 'fix' into 'master' 
Fix typo

See merge request core-developers/forge!5920
 2021-12-08 11:36:20 +00:00
tool4EvEr
9a9060c4c0 Fix typo 2021-12-08 12:35:47 +01:00
Michael Kamensky
fedd1439de Merge branch 'a22_7' into 'master' 
A22 - 7 Dec

See merge request core-developers/forge!5919
 2021-12-08 10:22:00 +00:00
Michael Kamensky
c260fffb2d Merge branch 'eber' into 'master' 
A22: Captain Eberhart

See merge request core-developers/forge!5915
 2021-12-08 03:53:44 +00:00
Michael Kamensky
a273663d92 Merge branch 'a22_draft' into 'master' 
A22: Draft mechanic and cards

See merge request core-developers/forge!5914
 2021-12-08 03:52:33 +00:00
Michael Kamensky
66dd08d18f Merge branch 'patch' into 'master' 
Some prompt tweaks

See merge request core-developers/forge!5918
 2021-12-08 03:52:25 +00:00
Michael Kamensky
ec8bfd57bb Merge branch 'a22_6' into 'master' 
A22 - 6 Dec

See merge request core-developers/forge!5916
 2021-12-08 03:51:35 +00:00
Northmoc
2778008d4d eliminate redundant "Select X Card card(s)" 2021-12-07 21:39:46 -05:00
Northmoc
9638983775 HumanPlay allow for customizable OrString 2021-12-07 21:38:16 -05:00
Northmoc
9384a7380c cap lblIfYouDo 2021-12-07 21:37:03 -05:00
Northmoc
e972fc8635 faithful_disciple.txt add SacMe 2021-12-07 21:35:51 -05:00
Northmoc
2e6c73456f tibalt_wicked_tormenter.txt 2021-12-07 21:35:15 -05:00
Northmoc
45d0d646d4 cursebound_witch.txt 2021-12-07 21:33:54 -05:00
Grimm
0f4be415f5 Fixed context menu in shop and deck editor 2021-12-08 03:17:07 +01:00
Grimm
54246b9d36 Fixed statistic save 2021-12-08 00:11:36 +01:00
Grimm
582636b2d0 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-12-07 23:04:03 +01:00
Grimm
58eded5d09 Added 2 small poi 
fixed some crashes in the item view
 2021-12-07 23:03:40 +01:00