external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,646 Commits 32 Branches 187 Tags
e8728d98b5ab998033159f459a8082abfa3ef57c
Commit Graph

47646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
e8728d98b5 Merge branch 'master' into 'master' 
- Added several AI hints to Mutate cards.

See merge request core-developers/forge!3833
 2021-02-14 08:12:17 +00:00
Michael Kamensky
45e4511b34 - Added several AI hints to Mutate cards. 2021-02-14 11:11:41 +03:00
Michael Kamensky
324eaec0d2 Merge branch 'master' into 'master' 
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!3832
 2021-02-14 07:48:01 +00:00
Michael Kamensky
fe180809d5 - Update ANNOUNCEMENTS.txt 2021-02-14 10:47:29 +03:00
Michael Kamensky
3d868e9003 Merge branch 'python3' into 'master' 
Update EditionTracking to be Python 3 compatible.

See merge request core-developers/forge!3828
 2021-02-14 07:43:17 +00:00
Michael Kamensky
3be8b6122b Merge branch 'fix_nightmare_shepherd' into 'master' 
Fix Nightmare Shepherd with mutated creature

See merge request core-developers/forge!3830
 2021-02-14 07:43:04 +00:00
Michael Kamensky
91945794d8 Merge branch 'merged-gamestate' into 'master' 
Support Mutate (merged cards) in Game State, Add remaining IKO/ZNR/KHM Possibility Storm puzzles.

See merge request core-developers/forge!3831
 2021-02-14 07:42:00 +00:00
Michael Kamensky
2d8173b1f0 - Add 2 KHM puzzles. 2021-02-14 10:38:42 +03:00
Michael Kamensky
64359b09f0 - Add the remaining ZNR puzzles. 2021-02-14 10:25:49 +03:00
Lyu Zong-Hong
567e7571f2 Fix Nightmare Shepherd with mutated creature 2021-02-14 16:19:57 +09:00
Michael Kamensky
96431168a7 Merge branch 'fix_hurkyls_recall' into 'master' 
Fix Hurkyl's Recall

Closes #1706

See merge request core-developers/forge!3829
 2021-02-14 07:17:35 +00:00
Michael Kamensky
a1aac2abac - Add several puzzles. 2021-02-14 10:05:20 +03:00
Michael Kamensky
c790539286 - Revert accidental file changes. 2021-02-14 09:39:22 +03:00
Michael Kamensky
503844279f - Remove an unused variable. 2021-02-14 09:28:24 +03:00
Michael Kamensky
254f08dafe - Support Merged cards in the Game State. 2021-02-14 09:27:01 +03:00
Lyu Zong-Hong
2755dbba50 Fix Hurkyl's Recall 2021-02-14 14:45:12 +09:00
Michael Kamensky
98c11e04f0 - Update EditionTracking to be Python 3 compatible. 2021-02-14 08:11:18 +03:00
Michael Kamensky
a227437169 Merge branch 'master' into 'master' 
Move several Mutate cards into their respective folders.

See merge request core-developers/forge!3827
 2021-02-14 05:00:42 +00:00
Michael Kamensky
f2c543825c - Move several Mutate cards into their respective folders. 2021-02-14 08:00:12 +03:00
Michael Kamensky
160e261eb9 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!3826
 2021-02-14 04:32:13 +00:00
CCTV-1
477e884719 update simplified chinese translation 2021-02-14 12:18:34 +08:00
Anthony Calosa
3feaedfa61 Merge branch 'master' into 'master' 
fix toughness

See merge request core-developers/forge!3825
 2021-02-14 03:03:32 +00:00
Anthony Calosa
c6d44acd22 fix toughness 2021-02-14 11:02:30 +08:00
Anthony Calosa
493a9a287c Merge branch 'master' into 'master' 
fix description

See merge request core-developers/forge!3824
 2021-02-14 02:55:06 +00:00
Anthony Calosa
2be89b205d fix description 2021-02-14 10:53:49 +08:00
Hans Mackowiak
0bf7770cf1 Merge branch 'fixCountersAddedThisTurn' into 'master' 
Enable Trigger/Replacements to use CountersAddedThisTurn

See merge request core-developers/forge!3821
 2021-02-14 02:01:12 +00:00
Sol
61149d0d77 Merge branch 'nethroifix' into 'master' 
Nethroi code hotfix

See merge request core-developers/forge!3823
 2021-02-14 01:21:04 +00:00
Northmoc
bc5dce6fad remove old unwanted boolean 2021-02-13 20:18:10 -05:00
Northmoc
6749aa271b remove bad Override 2021-02-13 20:17:43 -05:00
Anthony Calosa
0ac5758835 Merge branch 'nethroi' into 'master' 
Nethroi (IKO)

See merge request core-developers/forge!2755
 2021-02-14 00:57:22 +00:00
Tim Mocny
d7f0665bae Nethroi (IKO) 2021-02-14 00:57:22 +00:00
Anthony Calosa
239aa4c78c Merge branch 'mutate' into 'master' 
IKO/C20 - Mutate scripts

See merge request core-developers/forge!2751
 2021-02-14 00:57:03 +00:00
Tim Mocny
bf652c7cad IKO/C20 - Mutate scripts 2021-02-14 00:57:03 +00:00
Anthony Calosa
47fcd88366 Merge branch 'master' into 'master' 
update some cards so they work with mutate properly

See merge request core-developers/forge!3822
 2021-02-13 22:34:45 +00:00
Anthony Calosa
20dcb7a8fe update some cards so they work with mutate properly 2021-02-14 06:32:45 +08:00
tool4EvEr
46525a2369 Enable Trigger/Replacements to use CountersAddedThisTurn 2021-02-13 23:17:45 +01:00
Sol
dbcc277abb Merge branch 'mutate' into 'master' 
Mutate

See merge request core-developers/forge!3772
 2021-02-13 20:13:37 +00:00
Michael Kamensky
5ba8e506f2 Merge branch 'master' into 'master' 
Add and update the XMage cubes (as of Feb 13 2021)

See merge request core-developers/forge!3820
 2021-02-13 16:07:48 +00:00
Michael Kamensky
81f6c2f4a8 - Add and update the XMage cubes. 2021-02-13 19:06:07 +03:00
Michael Kamensky
54a640f871 Merge branch 'master' into 'master' 
Prepare Forge for Android release 1.6.38.001 [incremental]

See merge request core-developers/forge!3819
 2021-02-13 15:18:31 +00:00
Michael Kamensky
c813ca396e - Prepare Forge for Android release 1.6.38.001 [incremental] 2021-02-13 18:17:39 +03:00
Michael Kamensky
da6bf2c358 [maven-release-plugin] prepare for next development iteration 2021-02-13 18:00:08 +03:00
Michael Kamensky
0503686649 [maven-release-plugin] prepare release forge-1.6.38 forge-1.6.38 2021-02-13 17:59:59 +03:00
Michael Kamensky
afb5a3c3c9 Merge branch 'master' into 'master' 
Update Pauper Puzzle 06 (PP06.pzl)

See merge request core-developers/forge!3818
 2021-02-13 14:55:22 +00:00
Michael Kamensky
673b5cf510 - Update Pauper Puzzle 06 (PP06.pzl) 2021-02-13 17:54:19 +03:00
Michael Kamensky
836380d49b Merge branch 'master' into 'master' 
Fix for the Alternate Sound System by kevlahnota

See merge request core-developers/forge!3817
 2021-02-13 13:52:09 +00:00
Michael Kamensky
deea26d985 - Fix for the Alternate Sound System by kevlahnota 2021-02-13 16:49:09 +03:00
Hans Mackowiak
02297189ad Merge branch 'fixChangeling' into 'master' 
Fix changeling check

See merge request core-developers/forge!3812
 2021-02-13 11:57:02 +00:00
Bug Hunter
167b70f41e Fix changeling check 2021-02-13 11:57:02 +00:00
Michael Kamensky
7cd147c909 - Use the same signature for the AI predicate as in other places in code. 2021-02-13 11:28:00 +03:00