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
47,916 Commits 33 Branches 187 Tags
1d1483185b621debc16510366c9785d350e4c6a8
Commit Graph

47916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
03c6e06acc - A little AI improvement. 2021-02-13 11:25:09 +03:00
Hans Mackowiak
4d643efdce fix nameless race 2021-02-13 08:42:40 +01:00
Hans Mackowiak
543fa42b29 EffectEffect: fix trigger on Effects 2021-02-13 07:58:14 +01:00
Michael Kamensky
167ff7c82a Merge branch 'master' into 'master' 
Prepare Forge for Android release 1.6.37.001 [incremental].

See merge request core-developers/forge!3814
 2021-02-13 06:08:56 +00:00
Michael Kamensky
350ff98b3b - Prepare Forge for Android release 1.6.37.001 [incremental]. 2021-02-13 09:08:11 +03:00
Lyu Zong-Hong
39659f40c1 Also imprint all merged components 2021-02-13 15:01:36 +09:00
Michael Kamensky
2f8433eb9e [maven-release-plugin] prepare for next development iteration 2021-02-13 08:49:39 +03:00
Michael Kamensky
ab8502e86c [maven-release-plugin] prepare release forge-1.6.37 forge-1.6.37 2021-02-13 08:49:30 +03:00
Michael Kamensky
da2cc2dbe1 - Basic Mutate AI support, first pass. 2021-02-13 08:25:20 +03:00
Michael Kamensky
52bca2ee97 Merge branch 'fixCreatureStack' into 'master' 
[Desktop] Restore creature stacking preference

See merge request core-developers/forge!3811
 2021-02-13 04:26:12 +00:00
Sol
e71bd3b62b Merge branch 'fix-khm-booster' into 'master' 
Update Kaldheim.txt

See merge request core-developers/forge!3813
 2021-02-13 03:28:58 +00:00
Sol
2f5381652e Update Kaldheim.txt 2021-02-13 03:28:37 +00:00
Lyu Zong-Hong
d099ea0828 Minor fixes 2021-02-13 10:36:44 +09:00
Hans Mackowiak
cc5c5a30b5 Merge branch 'card-fixes' into 'master' 
Some minor cleanup

See merge request core-developers/forge!3810
 2021-02-12 21:21:30 +00:00
Adam Pantel
1103b36479 Some minor cleanup 2021-02-12 21:21:29 +00:00
tool4EvEr
c84e83a197 Re-enable creature stacking preference 2021-02-12 22:04:55 +01:00
Hans Mackowiak
5a9984b4b2 fix Aretopolis 2021-02-12 17:30:55 +01:00
Anthony Calosa
923b28b3cb Merge branch 'master' into 'master' 
revert fscreen array changes

See merge request core-developers/forge!3809
 2021-02-12 16:07:04 +00:00
Anthony Calosa
2180f32ae9 Merge remote-tracking branch 'core/master' 2021-02-13 00:06:01 +08:00
Anthony Calosa
d5bc124006 revert fscreen array changes 2021-02-13 00:05:41 +08:00
Lyu Zong-Hong
7938e6bb84 Fix triggered object issue 2021-02-13 00:09:55 +09:00
Lyu Zong-Hong
bca0282cae Merge branch 'master' into mutate 2021-02-12 22:32:58 +09:00
Lyu Zong-Hong
58f27c4466 Fix commander damage record and view, also other bugs 2021-02-12 22:25:47 +09:00
Hans Mackowiak
6ed3f8ab3e Merge branch 'fixCards' into 'master' 
Update more cards with ValidSA

See merge request core-developers/forge!3804
 2021-02-12 13:22:41 +00:00
Bug Hunter
d08a64bb69 Update more cards with ValidSA 2021-02-12 13:22:40 +00:00
Michael Kamensky
23cdccc479 Merge branch 'triggerReplacementSvars' into 'master' 
Trigger & Replacement: ensure abilities

See merge request core-developers/forge!3808
 2021-02-12 12:10:10 +00:00
Hans Mackowiak
c7c9a3b402 GameActionUtil: fix mana with non-mana sub abilities 2021-02-12 12:36:21 +01:00
Hans Mackowiak
8217adbc32 Trigger & Replacement: ensure abilities 2021-02-12 12:21:50 +01:00
Anthony Calosa
53e1d766f2 Merge branch 'master' into 'master' 
[Mobile] Fix exception on dispose texture

See merge request core-developers/forge!3807
 2021-02-12 09:37:19 +00:00
Anthony Calosa
aad88f7d64 Merge remote-tracking branch 'core/master' 2021-02-12 17:35:08 +08:00
Anthony Calosa
9581aec00b [Mobile] Fix exception on dispose 2021-02-12 17:34:45 +08:00
Michael Kamensky
f79e42abfd Merge branch 'manaReplacementEffect' into 'master' 
AbilityMana: better ReplacementEffect logic

Closes #1266

See merge request core-developers/forge!2650
 2021-02-12 08:50:24 +00:00
Hans Mackowiak
d6788b2803 Refactor: Taps for mana to differ between the Player who gets the Mana and the Player to taps the card 2021-02-12 08:50:24 +00:00