external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,300 Commits 31 Branches 187 Tags
2f88b45d67a23ceee644b6b6b61b9743e35e94e2
Commit Graph

3230 Commits

Author SHA1 Message Date
Agetian
b091b892e9 - Code simplification. 2018-05-10 22:08:14 +03:00
Agetian
1d4d18566c - Fixed token color information processing which is critical for game states and Puzzle Mode (otherwise all tokens are colorless). 2018-05-10 21:42:11 +03:00
Hanmac
058aabb666 KeywordEnum: replace more String Keywords checks with Enums 2018-05-10 11:53:41 +02:00
Blacksmith
f0ce6277ac [maven-release-plugin] prepare for next development iteration 2018-05-08 00:48:11 +00:00
Blacksmith
95bd867cee [maven-release-plugin] prepare release forge-1.6.10 2018-05-08 00:48:08 +00:00
Agetian
c2ddc8cd87 Resolved merge conflict. 2018-05-07 06:57:13 +03:00
Chris H
52a5f3b0a4 Fix ante to work with RegisterdPlayer 2018-05-06 21:42:56 -04:00
Hanmac
91d80f49f4 Card: add Keyword methods that work with Keyword Enum 2018-05-06 16:54:53 +02:00
Hanmac
438d4f6e38 WrappedAbility: add AdditionalAbilityList methods too 2018-05-06 10:29:59 +02:00
Agetian
473fa088ce - Wrapped abilities should get additional abilities from the underlying SA (fixes MayFlashSac on something like Abattoir Ghoul crashing). 2018-05-06 11:12:09 +03:00
Hanmac
c7fb979fe2 Merge branch 'asFlash' of git.cardforge.org:core-developers/forge into asFlash 2018-05-06 09:03:34 +02:00
Hanmac
198e7adc47 MayFlashSac: rework using MayPlayNotSorcerySpeed 2018-05-06 08:55:10 +02:00
Hanmac
94a9597963 fix player to RegisteredPlayer for AnteResult 2018-05-06 08:48:18 +02:00
Agetian
1296b24960 - A quick patch to make the AI compatible with MayFlashCost (may need a rewrite later when the optional costs are correctly implemented for the AI). 2018-05-06 08:00:51 +03:00
Hanmac
87b8ac38f2 Fix: fixed MayFlashSac 2018-05-05 18:47:20 +02:00
Hanmac
0033edbeda Restriction: fix Bestow with check if it is already animated under lki 2018-05-05 16:47:48 +02:00
Hanmac
d7e701d7a5 SpellRestriction: fixed for LKI, moved Legendary Sorcery 2018-05-05 10:35:44 +02:00
Hanmac
a3f36bd7a4 Spell: do as though it has Flash effects 2018-05-04 23:49:30 +02:00
Hanmac
1258e24ee0 Static Ability: add Ferocious as Condition 2018-05-04 23:46:19 +02:00
Hanmac
f9832a51cf GameAction: check static, use card in preList if able 2018-05-04 23:42:43 +02:00
Agetian
bc63cdd52a - Code simplification. 2018-05-02 15:07:04 +03:00
Agetian
270e25083a - Trigger an unexpected behavior warning instead of crashing the game. 2018-05-02 08:35:09 +03:00
Agetian
9d66d36a78 - Clarification in ManaReflectedEffect. 2018-05-02 07:15:26 +03:00
Agetian
a4133a07a8 - Cleanup and var rename in ManaReflectedEffect. 2018-05-02 07:14:57 +03:00
Agetian
ea547dfd4d - Removed an empty line. 2018-05-02 07:04:33 +03:00
Agetian
c66a8c20d2 - Integrating a reformatted fix by Seravy which makes Mox Amber AI playable (as well as Reflecting Pool) and fixes auto mana payment for these and other cards that use ManaReflected. 2018-05-02 06:55:59 +03:00
Agetian
d664f8abcd - Integrating a reformatted fix by Seravy which makes Mox Amber AI playable (as well as Reflecting Pool) and fixes auto mana payment for these and other cards that use ManaReflected. 2018-05-02 06:55:45 +03:00
Sol
1a3308017a Revert "Merge branch 'temp_dev6' into 'master'" 
This reverts merge request !499
 2018-05-01 01:11:29 +00:00
Sol
64e8dd35c2 Merge branch 'temp_dev6' into 'master' 
Allow for Seeded RNG in simulation games!

See merge request core-developers/forge!499
 2018-05-01 01:01:30 +00:00
Michael Kamensky
3eead9da4e Merge branch 'saga2' into 'master' 
Saga: use better state based action

See merge request core-developers/forge!502
 2018-04-30 06:24:17 +00:00
Hanmac
cc654b56a1 GameAction: add canBeSacrificed check, no need to do the other checks later 2018-04-30 07:17:11 +02:00
Hanmac
66ac3ee63c WA: fixed Saga abilities 2018-04-30 06:51:01 +02:00
Sol
ab2d284dee Merge branch 'temp_dev5' into 'master' 
Remove unusual "reproducable" attack declaration from AI

See merge request core-developers/forge!498
 2018-04-30 00:16:30 +00:00
Michael Kamensky
f72c5aa59c Merge branch 'temp_dev4' into 'master' 
Android updates

See merge request core-developers/forge!491
 2018-04-29 20:16:28 +00:00
Hanmac
910dc4fb26 Saga: use better state based action: it only cares about chapter abilities, and get the final chapter nr from the triggers 2018-04-29 20:59:16 +02:00
Chris H
758dbb689a When playing non-team matches, display Player name as winner in Game Recap screen 2018-04-28 23:22:23 -04:00
Meerkov
792fdad4be Tiny Update: Removes dead code. 
Just removes some code that does nothing.


(cherry picked from commit b462c41dff99f0173b7e228f826ca0bf0d8103cb)
 2018-04-28 17:01:42 +00:00
Meerkov
0a717bb9be Fix more RNG. 
(cherry picked from commit 61dd5661a728e08ae14911a3518cd1e10d574037)
 2018-04-28 16:54:53 +00:00
Agetian
084f45393e - Code tweak suggested by Hanmac. 2018-04-28 15:08:53 +03:00
Agetian
90a1a5f058 - (Experimental) Attempting to fix the interaction of text-changing abilities with keyworded effects that use overriding abilities (e.g. Fabricate and Artificial Evolution). 2018-04-28 13:56:53 +03:00
Agetian
ce165f4234 - Updating DrainMana ability description. 2018-04-28 13:42:51 +03:00
Agetian
445625ba1e - Removing references to mana pool in other parts of the code. 2018-04-28 13:34:16 +03:00
Meerkov
8f68266585 Update Guava to 24.1 
This updates Guava 16 to 24.1. Currently 16 is a 4 year old version, so there are a lot of bug fixes. The Android .pom has 24.1-android instead of 24.1-jre, for compatability reasons.

I did not test the android build, however the desktop build works.

Also resovles two warnings and drops a "TODO" on a comment that was highlighting a possible bug but wasn't easily marked to discover later.


(cherry picked from commit be578af80467c1850d9dcec0af6fe18840fff7e9)
 2018-04-28 08:42:22 +00:00
Michael Kamensky
7df7703c50 Merge branch 'assorted-fixes' into 'master' 
- Fix the implementation of Exalted.

See merge request core-developers/forge!483
 2018-04-26 04:45:21 +00:00
Agetian
33bc3557e5 - Fix the implementation of Exalted. 2018-04-26 07:44:38 +03:00
austinio7116
acef14aadc Merge branch 'fix_outcome_memory_leak' into 'master' 
Memory leak within a match

See merge request core-developers/forge!458
 2018-04-25 22:35:02 +00:00
Chris H
f7a739a023 Fix incompatibilities with Android API 2018-04-23 15:21:41 -04:00
Agetian
9ffad0437a - Updating the card cache directly is no longer needed after the fix in CardFactoryUtil is complete. 2018-04-23 22:04:15 +03:00
Agetian
844c083ee4 - Attempting to fix issues with Suspend not working in different ways (not being able to cast a spell with suspend, not being able to resuspend a card returned from graveyard). 2018-04-23 20:35:44 +03:00
Chris H
ade17c5eaf Fix Memory leak within a match 2018-04-22 15:18:22 -04:00