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
65,186 Commits 33 Branches 187 Tags
cb5e05f8ad3669b47748db37b2df40fc7d0c829c
Commit Graph

65186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
da9e1edace update Card.java getPaperCard 2023-07-11 19:40:16 +08:00
TabletopGeneral
15ece3cc8d Merge branch 'Card-Forge:master' into master 2023-07-11 07:13:52 -04:00
jjayers99
53d2dba63e Adventure - map fixes 2023-07-11 07:12:03 -04:00
Anthony Calosa
e8d5675e4d Merge pull request #3452 from tool4ever/fixes10 
Some fixes
 2023-07-11 18:55:56 +08:00
tool4EvEr
0d338a4a5b Fix script 2023-07-11 12:32:20 +02:00
Paul Hammerton
6bbdd854b1 Merge pull request #3456 from paulsnoops/ea_and_ha 
Add editions: HA7 & EA3 (also added to formats; also fixed Denethor script)
 2023-07-11 08:43:27 +01:00
paulsnoops
1e24fae0c5 Add editions: HA7 & EA3 2023-07-11 08:18:46 +01:00
Paul Hammerton
ab0558deeb Merge pull request #3454 from schnautzr/angelic-page-jmp-fix 
Angelic Page (JMP) was printed at common, not uncommon.
 2023-07-11 08:02:57 +01:00
Rob Schnautz
8c197d0e6b Angelic Page (JMP) was printed at common, not uncommon. 2023-07-10 23:04:04 -05:00
Simisays
410501a9d2 Squashed commit of the following: 
commit b8c05c468bf6f24e4a4ea0d07ae208f993aa727a
Merge: 7863f7f7f7 e0ac62e518
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 22:24:14 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 7863f7f7f727e2fb1c5e837afd14aa2340ebce98
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 22:24:03 2023 +0200

    update

commit 1b081579d2647b7d81736724259e7b9d433a0abf
Merge: 5d77df87d7 b437d9764d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 13:35:30 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 5d77df87d7426df792e428c5f17bda2d33ed6f3d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 13:35:24 2023 +0200

    update

commit a2ad5160c661da24dc158a1b6e734216403b529f
Merge: 0326d4321d 49e5ce974d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 9 08:51:51 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 0326d4321dfa63a42cc5452527b25cab182f018e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 9 08:51:44 2023 +0200

    update

commit 1d713086f2032b04d0e2ed7fc25dc079bb0987f6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jul 8 16:52:33 2023 +0200

    update

commit a7840d878e321e6c512155c69b34aa71f41c46f6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jul 7 20:38:42 2023 +0200

    update

commit 76e34825185c536d0f7cbd102ada692dc6c4d20e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 5 21:02:29 2023 +0200

    update

commit 89f79fa47dbb3780c7cf9c6aa075cfe0cead404f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 5 15:20:36 2023 +0200

    update

commit 3e2bda59936cfd2fdd3a14baa0e3c87bdf65c838
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jul 4 16:56:31 2023 +0200

    update

commit 74ff2ba0bbf87fd343be3a118f63ab433597352f
Merge: 51323d9f8e 7f4705e6be
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 3 22:45:19 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 51323d9f8ee780d854dad586333ce45c8849bf98
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 3 22:45:14 2023 +0200

    update

commit 588b3a3e86b27ae1a5f71e69053285d8e391698d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 20:40:53 2023 +0200

    update

commit 63cae02800cb3b4ce44e3f198c366ea8bc659ca3
Merge: 7348cfb517 7c2e3d2a47
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 20:40:49 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 7348cfb517bb859f8850c3df2624bb8f5a128e7a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 16:00:31 2023 +0200

    update

commit dd05b537484ff3e4fda310109e58fd02f37ab985
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 09:09:07 2023 +0200

    updqte

commit 73f72462db817e9be9df6ab6f2a8ad3920e1b41b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jun 29 20:53:45 2023 +0200

    update

commit 361fa91ebbfbff17e346d4b530cb4d6e2e18f57e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 28 16:39:23 2023 +0200

    update
 2023-07-10 22:24:48 +02:00
tool4ever
e0ac62e518 support LKI of cause (#3451) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-07-10 22:43:08 +03:00
tool4EvEr
3f72a00319 Rewrite trigger 2023-07-10 21:39:43 +02:00
tool4EvEr
03cdbb0ef7 Clean up 2023-07-10 20:38:41 +02:00
tool4EvEr
927c3f619d Some fixes 2023-07-10 20:35:36 +02:00
Anthony Calosa
b437d9764d Merge pull request #3444 from schnautzr/default-card-back 
change default card back for mobile to MtG official card back, move purple mana version to first empty slot.
 2023-07-10 18:58:59 +08:00
Agetian
66af38b81a Basic AI for Chalice of the Void, minor DamageDealAi improvement (#3438) 
* - Basic AI for Chalice of the Void.

* - Improved card filter for Chalice of the Void.

* - DamageDealAi: improve decision to deal damage when able to target an opponent

* - DamageDealAi: get rid of a redundant call, remove obsolete planeswalker redirection code

* - Fix imports

* - Update logic
 2023-07-10 13:39:34 +03:00
Rob Schnautz
8d1df8ced7 change default card back for mobile to MtG official card back, move 6-color fan art to first empty slot. 2023-07-09 22:22:53 -05:00
Anthony Calosa
998ebbcc57 Merge pull request #3443 from jjayers99/master 
Adventure - Updated draft set filtering
 2023-07-10 11:09:21 +08:00
TabletopGeneral
9bee1838d6 Merge branch 'Card-Forge:master' into master 2023-07-09 22:51:31 -04:00
jjayers99
75ef4be4be Adventure - Updated draft set filtering 2023-07-09 22:50:31 -04:00
tool4ever
491ccd1719 Fix missing reorder (#3435) 
* Fix missing reorder

* Fix Ward check for all subs
 2023-07-09 11:09:37 +00:00
Agetian
62e3472d6a Implement AI for Arena (#3434) 
* - AI: Shouldn't miss Grothama's triggers even when it doesn't want to activate them.

* - Consolidate the logic in FightAi

* - Clean up

* - Fix imports

* - Clean up

* - Implement AI for Arena.

* - Hook up the AI for Magus of the Arena
- Simplify implementation for the relevant cards
 2023-07-09 13:04:44 +03:00
Anthony Calosa
49e5ce974d Merge pull request #3436 from kevlahnota/newmaster2 
format win/loss ratio
 2023-07-09 11:20:40 +08:00
Anthony Calosa
0c8b51ccf2 Update TextUtil.java 2023-07-09 11:14:53 +08:00
Anthony Calosa
3ec52cae4b move decimal format to TextUtil 2023-07-09 10:48:34 +08:00
Anthony Calosa
f757192df5 format win/loss ratio 2023-07-09 10:34:31 +08:00
Simisays
a62b5a911f Update gandalf_westward_voyager.txt 2023-07-08 23:31:42 +02:00
Simisays
d805c47422 Update gandalf_westward_voyager.txt 2023-07-08 23:19:33 +02:00
Simisays
f0926c204c Update gandalf_westward_voyager.txt 2023-07-08 22:55:27 +02:00
Simisays
567111174c update 2023-07-08 22:36:27 +02:00
Simisays
717472cb30 Merge branch 'LOTR28' of https://github.com/Simisays/forge into LOTR28 2023-07-08 22:22:28 +02:00
Simisays
add0f986af Update gandalf_westward_voyager.txt 2023-07-08 22:22:26 +02:00
Simisays
0a5b3f35c5 update 2023-07-08 17:31:51 +02:00
tool4ever
e242003d4c Update amethyst_dragon_explosive_crystal.txt 2023-07-08 14:15:47 +00:00
Anthony Calosa
a808bc948b Merge pull request #3431 from jjayers99/master 
Adventure fixes
 2023-07-08 19:44:54 +08:00
Anthony Calosa
0fa5a6cfa6 Update NewGameScene.java 
add imports
 2023-07-08 19:41:25 +08:00
TabletopGeneral
c8ae4246b2 Merge branch 'Card-Forge:master' into master 2023-07-08 07:08:27 -04:00
jjayers99
95fd4b3112 Adventure - Ensure spawn map is loaded on new game 2023-07-08 07:07:54 -04:00
squee1968
72d72b1b03 6 LTC + Tokens (#3421) 
* 6 LTC + Tokens

* Update shelob_dread_weaver.txt

* Update and rename gríma_sarumans_footman.txt to grima_sarumans_footman.txt

* Update gwaihir_greatest_of_the_eagles.txt

* Update haldir_lorien_lieutenant.txt

* Update lobelia_defender_of_bag_end.txt

* Update lord_of_the_nazgul.txt

* Update shelob_dread_weaver.txt

* Delete w_3_3_bird_flying_jump.txt

* Delete b_3_3_wraith_menace.txt

* Update grima_sarumans_footman.txt

* tokens

* Update lord_of_the_nazgul.txt

* Update lobelia_defender_of_bag_end.txt

* Update gwaihir_greatest_of_the_eagles.txt

* Update grima_sarumans_footman.txt

* Update lobelia_defender_of_bag_end.txt
 2023-07-08 09:11:19 +01:00
Anthony Calosa
31c705e1bb Merge pull request #3430 from schnautzr/golem 
Remove steam animation from golem and golem_2.
 2023-07-08 07:58:28 +08:00
Anthony Calosa
abf080fae4 Merge pull request #3412 from schnautzr/amonkhet 
Amonkhet
 2023-07-08 07:57:20 +08:00
Anthony Calosa
e28becb576 Merge pull request #3343 from EldritchBimbo/Gwyn_DungeonDev 
Unhallowed Abbey Dungeon
 2023-07-08 07:56:58 +08:00
Anthony Calosa
527f0097c6 update items.png 2023-07-08 07:42:18 +08:00
Rob Schnautz
98494d8630 Remove steam animation from golem and golem_2. 2023-07-07 15:45:38 -05:00
Simisays
565c94b909 update 2023-07-07 21:47:13 +02:00
Simisays
bd861a1632 Merge remote-tracking branch 'upstream/master' into LOTR28 2023-07-07 21:26:40 +02:00
tool4ever
054a885b33 Fix effect getting cleaned up directly if source was exiling (#3426) 
Co-authored-by: TRT <>
 2023-07-07 12:41:10 +03:00
Agetian
a2dd864047 AI shouldn't miss Grothama's triggers even when it doesn't want to activate them (#3424) 
* - AI: Shouldn't miss Grothama's triggers even when it doesn't want to activate them.

* - Consolidate the logic in FightAi

* - Clean up

* - Fix imports

* - Clean up
 2023-07-07 11:05:18 +03:00
tool4ever
449e456843 Clean up (#3422) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-07-07 07:09:11 +03:00
Anthony Calosa
e0b030fc95 Update bill_the_pony.txt 
- closes #3423
 2023-07-07 09:34:34 +08:00