external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,835 Commits 33 Branches 187 Tags
bada43b901b55a573d245800f1ec53e474917ef1
Commit Graph

66835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
a43c20e63f Merge branch 'master' into newmaster2 2023-08-17 20:58:36 +08:00
kevlahnota
46e1edd370 Merge pull request #3648 from kevlahnota/newmaster2 
add new legacy genetic ai for adventure
 2023-08-17 20:58:14 +08:00
Anthony Calosa
a63c455ff7 Merge branch 'master' into newmaster2 2023-08-17 20:57:32 +08:00
Anthony Calosa
7bda006955 add new legacy genetic ai for adventure 2023-08-17 20:51:33 +08:00
kevlahnota
eccbeea164 Merge pull request #3646 from kevlahnota/newmaster2 
add new genetic ai decks for adventure (Modern, Standard)
 2023-08-17 18:47:10 +08:00
Anthony Calosa
9cfac8b719 add new genetic ai decks for adventure (Modern, Standard) 2023-08-17 18:41:20 +08:00
Paul Hammerton
2403911598 Merge pull request #3645 from paulsnoops/edition_updates 
Edition updates: WOE, WOT
 2023-08-17 08:32:38 +01:00
paulsnoops
196f0d84a0 Edition updates: WOE, WOT 2023-08-17 08:14:11 +01:00
tool4ever
78ed8480cb Update scripts (#3644) 
* Improve performance

* Fix KW

---------

Co-authored-by: TRT <>
 2023-08-16 18:48:36 +03:00
Paul Hammerton
f829a98d7f Merge pull request #3643 from paulsnoops/fix_editions 
Edition updates: P30A, P30M
 2023-08-16 11:42:17 +01:00
paulsnoops
9aa88167df Edition updates: P30A, P30M 2023-08-16 11:36:25 +01:00
Paul Hammerton
161509332e Merge pull request #3641 from paulsnoops/edition_updates 
Edition updates: WOE, WOC, WOT
 2023-08-16 09:00:49 +01:00
paulsnoops
4ca0d33078 Edition updates: WOE, WOC, WOT 2023-08-16 08:48:00 +01:00
tool4ever
7e106db045 Fix creature haunting (#3637) 
Co-authored-by: TRT <>
 2023-08-15 17:40:44 +03:00
Paul Hammerton
26b2c31555 Merge pull request #3634 from pfirpfel/booster-fixes 
Fix Core Set 2019/2020 booster
 2023-08-15 12:32:25 +01:00
pfirpfel
4f04b39b43 Fix Core Set 2019 booster 2023-08-15 12:48:25 +02:00
pfirpfel
97f5aeea92 Fix Core Set 2020 booster 2023-08-15 12:47:52 +02:00
Paul Hammerton
f70ea3495f Merge pull request #3633 from JohnWilliams77/JohnWilliams77-patch-1-3 
Update Secret Lair Drop Series.txt
 2023-08-15 11:22:07 +01:00
JohnWilliams77
69d20f34f0 Update MagicFest 2023.txt 2023-08-15 09:38:23 +01:00
JohnWilliams77
aa42443f2d Update Secret Lair Drop Series.txt 2023-08-15 09:35:31 +01:00
TRT
6b282cde54 Fix puzzle 2023-08-14 21:43:47 -04:00
TRT
0f002e6526 Fix AI never casting paired commanders 2023-08-14 21:43:47 -04:00
friarsol
e9f825f3c0 Change how playback speed works for ai vs ai matches 2023-08-14 15:02:35 -04:00
kevlahnota
698a3815b8 Merge pull request #3629 from Card-Forge/kevlahnota-patch-8 
Update AiController.java
 2023-08-14 18:44:04 +08:00
kevlahnota
69adfc6e46 Update AiController.java 
prevent crash
- closes #3626
 2023-08-14 18:37:41 +08:00
tool4ever
07e90c94eb Fix scripts (#3627) 
Co-authored-by: TRT <>
 2023-08-14 09:20:46 +03:00
Chris H
7bff8666b3 Update ringwraiths.txt 2023-08-13 22:15:30 -04:00
kevlahnota
c1f13a5713 Merge pull request #3619 from jjayers99/master 
Adventure updates / bugfixes
 2023-08-13 08:52:32 +08:00
kevlahnota
a2a1d9893a Merge pull request #3622 from Simisays/fortupdate 
[Adventure] More map reworks + new enemies
 2023-08-13 08:51:40 +08:00
kevlahnota
e439616f8b NPE prevention 2023-08-13 08:44:01 +08:00
kevlahnota
82c2e5a334 Merge pull request #3624 from pfirpfel/fix-elvish_impersonators 
Fix Elvish Impersonators: remove flying
 2023-08-13 08:21:55 +08:00
Simisays
71b146001a Update xira.dck 2023-08-13 00:14:48 +02:00
Simisays
9b39d2a9ac Update zombietown.tmx 2023-08-12 23:14:27 +02:00
pfirpfel
fd1409b33e Fix Elvish Impersonators: remove flying 2023-08-12 21:41:07 +02:00
friarsol
2ef2526d56 Removing invalid toxic check 2023-08-12 14:58:13 -04:00
friarsol
6a99aee1b1 Add more AI for TurboFog cards 2023-08-12 14:58:13 -04:00
friarsol
efc3c2c159 Add ai usage for Maze of Ith 2023-08-12 14:58:13 -04:00
jjayers99
e872a15f65 Adventure - Named cards in card union rewards 2023-08-12 11:41:40 -04:00
Simisays
0c8bea86c1 Delete Cloaker Sprite Sheet.png 2023-08-12 16:42:05 +02:00
Simisays
cb7bd6fadd Squashed commit of the following: 
commit aa1dedcceebf540eafeea60fdd45daa6440726f2
Merge: 535ffa4d68 a2f7f512ee
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Aug 12 16:38:52 2023 +0200

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

commit 535ffa4d68f66808b0b044636c4e8d61ed7e6f66
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Aug 12 16:38:44 2023 +0200

    update

commit a9154396b72ea558f6225cb46245b3c29f7e6aa3
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Aug 11 18:38:24 2023 +0200

    update

commit 4267b664d7012d2f82d9977568acc409bb4777fe
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Aug 9 20:54:05 2023 +0200

    m

commit 38d3012328b6323ea90953beb2b6936296c0b12e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Aug 9 08:08:45 2023 +0200

    update

commit 2580f75c7f3795d99db6da3a7544a6723db2c7f7
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Aug 8 13:31:45 2023 +0200

    update

commit 40d1e3307f9254efffa902ec15884be4ab84d171
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Aug 7 22:37:16 2023 +0200

    update

commit 2bcf176b48e1e0b1de7f63ce6ae584b403b7ea88
Merge: d43ad56a62 efe6195f1f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Aug 7 17:50:55 2023 +0200

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

commit d43ad56a620f5d06da76f85936e81d94faa51f07
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Aug 7 17:50:49 2023 +0200

    update

commit 827f536676a4ddaa3d53afcd5d31daf5921547e0
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Aug 7 00:00:57 2023 +0200

    update

commit e7bab337b4533c59e5a725fcb0607f3bd6983f63
Merge: e8eeed5496 670e08bd42
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Aug 6 14:07:34 2023 +0200

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

commit e8eeed5496889e2f7bbd29b96d0cb0809f70ec63
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Aug 6 11:46:21 2023 +0200

    update

commit ed34c9c21c13e88d6f6e6fa07f2ff3c128cfd63a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Aug 5 16:09:44 2023 +0200

    update

commit 4776f522c1d2b207dec0de75ca838af3a84cafff
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Aug 4 16:47:41 2023 +0200

    update

commit 8763aad502b14e505e8310bd5659f4ab07c2c6d7
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Aug 3 17:08:17 2023 +0200

    update

commit 580e81a63f953d78595fc609e2e40c5ff392268a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Aug 3 15:37:36 2023 +0200

    Update lavaforge_3.tmx

commit 0929fc1074ea6b7040ef76658797041c75d0d771
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Aug 3 08:57:14 2023 +0200

    updqte

commit 6020873093477907bdc13f1b572f1cf66afc683f
Merge: 6fc718d160 c8d7e3d4f0
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Aug 2 17:19:19 2023 +0200

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

commit 6fc718d1602c5daa8751705f694320baf36bd6c1
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Aug 2 17:19:12 2023 +0200

    update

commit fe5c4b1b8d0e39b2415ccbb244b6a54a077aa6e5
Merge: 3c06a261f9 dff8492bf8
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 31 20:14:56 2023 +0200

    update

commit 3c06a261f92ebfce57d1db412454e5d9f1f4fa37
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 31 20:14:21 2023 +0200

    update
 2023-08-12 16:39:18 +02:00
kevlahnota
626a8bf020 Update fiery_inscription.txt 2023-08-12 18:04:42 +08:00
tool4ever
a2f7f512ee Logic for Tyvar the Bellicose (#3620) 
* Fix Rocco

* Tyvar logic

---------

Co-authored-by: TRT <>
 2023-08-11 22:14:16 +03:00
Simisays
a4011d8500 WHO 6 cards (#3578) 2023-08-11 18:28:51 +00:00
TabletopGeneral
ea73e6a4e7 Merge branch 'Card-Forge:master' into master 2023-08-11 08:44:55 -07:00
jjayers99
148a5dfb58 Adventure updates / bugfixes 2023-08-11 11:44:22 -04:00
jjayers99
4c5d74ba22 Adventure updates / bugfixes 2023-08-11 11:35:12 -04:00
Paul Hammerton
70c424d407 Merge pull request #3618 from paulsnoops/new_editions 
New editions: PMDA, RVR
 2023-08-11 07:55:00 +01:00
paulsnoops
52386168bc New editions: PMDA, RVR 2023-08-11 07:50:30 +01:00
kevlahnota
50a2147198 Update garruk_boss_effect_phasetwo.txt 2023-08-11 06:59:58 +08:00
jjayers99
1288f5d6d3 Merge branch 'master' of https://github.com/jjayers99/forge-updates into master-local 2023-08-09 23:15:46 -04:00