external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,145 Commits 32 Branches 187 Tags
8eb8c666b6de587667cea97715ecbfaf0da9924d
Commit Graph

16399 Commits

Author SHA1 Message Date
John
f022419ceb Update Resale Promos.txt 2021-05-23 11:42:11 +00:00
Michael Kamensky
9232042b02 Merge branch 'exception-thrown-when-discard-card-when-more-then-eight' into 'master' 
Exception thrown when discard card when more then eight

See merge request core-developers/forge!4732
 2021-05-23 04:17:34 +00:00
brngl
1c642a3cb2 corrected a wrong translation 2021-05-23 02:30:09 +02:00
brngl
b5e86473a4 corrected a wrong translation 2021-05-23 01:24:37 +02:00
Michael Kamensky
6d493aeb9c Merge branch 'paid' into 'master' 
Fix Plumb the Forbidden

Closes #1849

See merge request core-developers/forge!4730
 2021-05-22 09:32:22 +00:00
Michael Kamensky
b4052039e3 Merge branch 'cards-2021-05-20' into 'master' 
Drizzt Do'Urden

See merge request core-developers/forge!4728
 2021-05-22 09:32:00 +00:00
tool4EvEr
727689a3bd Fix Plumb the Forbidden 2021-05-22 11:02:57 +02:00
Hythonia
b86f9792f3 Drizzt: DeckHas 2021-05-22 09:48:26 +02:00
tool4EvEr
6618f71297 PlayEffect: avoid confirmAction 2021-05-21 23:03:33 +02:00
Hythonia
5c1c039188 AFR: Drizzit and the Spider token 2021-05-21 19:51:16 +02:00
Michael Kamensky
af1afb5348 Merge branch 'lki' into 'master' 
Fix Luminate Primordial

See merge request core-developers/forge!4727
 2021-05-21 17:30:23 +00:00
tool4EvEr
5bbd527837 Fix LKI 2021-05-21 12:16:53 +02:00
John
cd31806100 Update 2021 Lunar New Year.txt 2021-05-20 12:48:54 +00:00
Bug Hunter
3b0483752c Update forge-gui/res/cardsfolder/b/battlemages_bracers.txt 2021-05-20 12:43:42 +00:00
Churrufli
08bd2c4724 Net Decks Archive Updates 2021-05-20 12:42:24 +02:00
Michael Kamensky
1c1a4d92f4 Merge branch 'bracers' into 'master' 
Illusionist's Bracers: Fix triggering for Card that's removed while paying activation cost

See merge request core-developers/forge!4721
 2021-05-20 09:21:36 +00:00
Michael Kamensky
37e5dda38f Merge branch 'npefix' into 'master' 
chooseSomeType: Fix NPE

See merge request core-developers/forge!4715
 2021-05-20 04:53:12 +00:00
Michael Kamensky
be6232ee82 Merge branch 'fixcount' into 'master' 
Cleanup xCount

See merge request core-developers/forge!4718
 2021-05-20 04:52:29 +00:00
Michael Kamensky
651fa42e4a Merge branch 'guile' into 'master' 
Kaya's Guile: Fix moving own cards

See merge request core-developers/forge!4720
 2021-05-20 04:52:01 +00:00
Michael Kamensky
c69d261e56 Merge branch 'rescue' into 'master' 
Fix Rescue from the Underworld

See merge request core-developers/forge!4719
 2021-05-20 04:51:55 +00:00
Michael Kamensky
161d4ed314 Merge branch 'angel' into 'master' 
Fix paying negative life

See merge request core-developers/forge!4716
 2021-05-20 04:45:40 +00:00
tool4EvEr
a88c08bf3f Fix triggering for Card that's removed while paying activation cost 2021-05-19 23:07:31 +02:00
tool4EvEr
eae4a0be35 Fix moving own cards 2021-05-19 20:54:58 +02:00
tool4EvEr
0e28b40c25 Fix Rescue from the Underworld 2021-05-19 20:28:42 +02:00
tool4EvEr
f8adbcc252 Cleanup xCount 2021-05-19 20:03:17 +02:00
tool4EvEr
6f9d557a64 Clean up 2021-05-19 16:29:38 +02:00
Michael Kamensky
ac939de42f Merge branch 'italian-translations-fix' into 'master' 
Italian translations fix

See merge request core-developers/forge!4717
 2021-05-19 03:53:12 +00:00
Michael Kamensky
82756e1073 Merge branch 'cardfixes' into 'master' 
Minor card fixes

See merge request core-developers/forge!4714
 2021-05-19 03:52:38 +00:00
brngl
1b14148b0f corrected some wrong translations 2021-05-19 00:23:18 +02:00
brngl
0cfb5eff0e corrected some wrong translations 2021-05-19 00:15:38 +02:00
tool4EvEr
ce3bab8a33 Fix for Temporal Extortion 2021-05-19 00:09:55 +02:00
tool4EvEr
ac7fc21db5 Fix NPE 2021-05-18 22:58:56 +02:00
Hythonia
1f13b8d43d Minor card fixes 2021-05-18 20:11:24 +02:00
CCTV-1
442ea94cde translate "AltZoneTabs" 2021-05-18 18:47:29 +08:00
Bug Hunter
66d0141fae Merge branch 'fixcard' into 'master' 
Fix card

See merge request core-developers/forge!4707
 2021-05-16 13:02:04 +00:00
tool4EvEr
57cf7a582b Fix card 2021-05-16 15:02:00 +02:00
Michael Kamensky
706827fc0c Merge branch 'Williams-master-patch-55192' into 'master' 
Update Secret Lair Ultimate Edition.txt

See merge request core-developers/forge!4706
 2021-05-16 12:51:43 +00:00
Michael Kamensky
54009dcb06 Merge branch 'aicleanup' into 'master' 
Minor cleanup

See merge request core-developers/forge!4705
 2021-05-16 12:43:17 +00:00
John
1049deb299 Update Secret Lair Ultimate Edition.txt 2021-05-16 12:43:06 +00:00
tool4EvEr
4aafafb5bd Minor cleanup 2021-05-16 12:52:02 +02:00
Alumi
419a513d8f Deal damage use damage map 2021-05-16 06:51:38 +00:00
Michael Kamensky
f996c90653 Merge branch 'nextturn' into 'master' 
Refactor addUntilCommand

See merge request core-developers/forge!4702
 2021-05-15 17:33:05 +00:00
Bug Hunter
be2a7f5a51 Refactor addUntilCommand 2021-05-15 17:33:03 +00:00
Hans Mackowiak
ff7f81c307 Card property targeted player 2021-05-15 15:27:15 +00:00
Michael Kamensky
cad42948cd Merge branch '1836-npe-at-forge-game-gameaction-sacrificedestroy-gameaction-java-1709' into 'master' 
Resolve "NPE at forge.game.GameAction.sacrificeDestroy(GameAction.java:1709)"

Closes #1836

See merge request core-developers/forge!4699
 2021-05-15 12:40:13 +00:00
Hans Mackowiak
5ad88099e1 Resolve "NPE at forge.game.GameAction.sacrificeDestroy(GameAction.java:1709)" 2021-05-15 12:40:12 +00:00
Sol
c849c2b867 Merge branch 'scourge' into 'master' 
Fix Boneyard Scourge

See merge request core-developers/forge!4700
 2021-05-15 03:23:35 +00:00
tool4EvEr
c78c182e32 Fix trigger 2021-05-14 15:15:50 +02:00
Michael Kamensky
8ff5d05078 Merge branch 'wall' into 'master' 
Fix trigger running with no zone for Wall of Stolen Identity

See merge request core-developers/forge!4666
 2021-05-14 05:39:09 +00:00
Bug Hunter
80a1c13a07 Fix trigger running with no zone for Wall of Stolen Identity 2021-05-14 05:39:08 +00:00