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
43,661 Commits 32 Branches 187 Tags
fe2c3c90d62aab8f44478e9968182c97a13fbd77
Commit Graph

3783 Commits

Author SHA1 Message Date
klaxnek
bbd2940b63 Translated scry log 2019-10-22 14:40:03 +02:00
Anthony Calosa
402885391f Card Sleeves 2019-10-22 16:12:03 +08:00
Hans Mackowiak
40b1f89c8f Resolve "ReduceCost with MinMana does reduce to 0, but shouldn't" 2019-10-16 01:25:33 +00:00
Hans Mackowiak
06b9dffa55 Player keyword rework 2019-10-15 11:12:20 +00:00
Hans Mackowiak
773df25b53 replace .getZone().is with .isInZone, no null check needed 2019-10-14 18:46:43 +00:00
Hans Mackowiak
20069f95ac Adventure as ReplacementEffect 2019-10-13 18:49:48 +00:00
Anthony Calosa
f4d55161b4 Add basic border tint for cards that change color 
(Multicolor Cards will have gold tint if they change color..
Wild Mongrel, Prismatic Lace, etc)
 2019-10-12 05:53:57 +08:00
Hans Mackowiak
0422ec65be BlockEffect.java : fix no method String.join, use Lang.joinHomogenous 2019-10-07 10:30:16 +00:00
Hans Mackowiak
eba9f0d72a better Replacement Effect hasRun with ETB and LKI 2019-10-07 04:50:22 +00:00
Ryan Wiedemann
7fcac4944a change assertTrue to assertEquals as suggested by Intellij, so we get better test failure messages 2019-10-07 02:20:19 +00:00
Hans Mackowiak
6ef38fdcfd TokenEffect: fix Cause Key it should be null in some cases 2019-10-06 13:21:38 +00:00
swordshine
eb82d454b8 Merge branch 'start_replacement_run_keys_refactor' into 'master' 
Start replacement run keys refactor

See merge request core-developers/forge!2175
 2019-10-06 06:22:54 +00:00
Ryan1729
33ccc5c21f remove import 
...
 2019-10-05 23:52:14 -06:00
Ryan1729
5f3a0b3f0b change replacingObjects type 2019-10-05 23:44:22 -06:00
Ryan1729
f6134e3ccf update canReplace method 2019-10-05 22:24:05 -06:00
Hans Mackowiak
f32a8d7bb8 Card: CardTraits are now not added to Card/State anymore but uses timestamp 2019-10-05 19:59:28 +00:00
Hans Mackowiak
937521632d GameAction: better ZoneCheck for Adventure 2019-10-05 11:37:29 +00:00
swordshine
dc000318bd Merge branch 'patch-3' into 'master' 
Refactor String.join -> StringUtils.join

See merge request core-developers/forge!2213
 2019-10-04 03:35:29 +00:00
Anthony Calosa
90e2c08e75 Refactor String.join -> StringUtils.join 2019-10-03 13:54:34 +00:00
Anthony Calosa
c9c27faf8f Prevent NPE casting adventure card as spell 2019-10-03 05:45:44 +00:00
Hans Mackowiak
9fefaa58fc StaticEffect: cleanup old methods 2019-10-02 05:06:15 +00:00
Anthony Calosa
bf5f581cf6 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-01 14:28:38 +08:00
Anthony Calosa
91674ef0b2 Seperate some Sprite Icons, Upscaled sprite_planar_conquest, 
added some ability icons, Enabled texture filter on some textures
 2019-10-01 13:41:52 +08:00
Peter
17fabb0bec Translated strings related to Win/Loose/Concede 2019-09-30 11:25:27 +02:00
Hanmac
3c3a7f3f62 GameAction: ignore isTemporary StaticAbilities 2019-09-29 22:03:23 +02:00
Blacksmith
d028cd2918 [maven-release-plugin] prepare for next development iteration 2019-09-29 00:23:27 +00:00
Blacksmith
4803d74c33 [maven-release-plugin] prepare release forge-1.6.29 2019-09-29 00:23:21 +00:00
Hans Mackowiak
398796999f Resolve "Questing Beast and Damage Prevention" 2019-09-29 00:03:10 +00:00
Ryan1729
a3355ba05a remove imports 2019-09-27 17:27:36 -06:00
Ryan1729
4728b5ad76 Merge branch 'master' of git.cardforge.org:core-developers/forge into start_replacement_run_keys_refactor 2019-09-27 17:17:26 -06:00
Ryan1729
df4b0b03b9 remove runOld and getReplacementListOld 2019-09-27 17:13:44 -06:00
Anthony Calosa
6551ebcce5 Add feature request 
Can duplicate tokens with summoning sickness not be in same pile as
tokens without it OR the ones without it be on the top? It's really
annoying on Android to equip/enchant a token that can attack this turn
(need to zoom in, then out).
(https://www.slightlymagic.net/forum/viewtopic.php?f=26&t=1516&start=2190#p230560)
 2019-09-27 12:16:07 +00:00
Ryan1729
a3b0d8ac3c do the remaining easy repRunParams changeovers 2019-09-27 01:25:04 -06:00
Hans Mackowiak
a9e97d6508 Update Player: use some mapFromAffected 2019-09-26 12:29:52 +00:00
Ryan1729
c9b66d9743 add mapFromAffected convenience function 2019-09-25 19:50:00 -06:00
Anthony Calosa
f1c3e93548 Update HexproofKey 2019-09-25 21:11:01 +08:00
Ryan1729
9d39ce5dda remove unused import 2019-09-25 00:31:35 -06:00
Ryan1729
94b39d7261 do the first couple runOld to `run refactors 2019-09-25 00:17:14 -06:00
Ryan1729
5298b8666d refactor getReplacementList to use AbiltyKey as much as currently possible 2019-09-25 00:04:28 -06:00
Ryan1729
6da178c8ae use the same methodNameOld trick as before with runTrigger 2019-09-24 23:33:14 -06:00
Anthony Calosa
6556f78c28 Add Hexproof From Icons (TODO: PC code, better Hexproof from Icons) 2019-09-24 22:49:52 +08:00
Anthony Calosa
b2f80b47a9 Display Ability Icons (Mobile & PC) 2019-09-24 12:30:51 +08:00
Ryan1729
16074a65b0 fix incorrect runParams keys 2019-09-23 08:24:31 -06:00
Ryan Wiedemann
308c75e60e Merge branch 'master' into 'push_down_toStringMap_part_3' 
# Conflicts:
#   forge-ai/src/main/java/forge/ai/AiController.java
#   forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
#   forge-game/src/main/java/forge/game/card/CardFactory.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDrawCards.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceSurveil.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java
 2019-09-23 14:18:52 +00:00
Hans Mackowiak
14c9a8ccc3 ReplacementEffect: add Mode for ReplacementType 2019-09-23 11:53:48 +00:00
Anthony Calosa
7d5b8d2d5e Fix getController() 
(Donate -> Illusions of Grandeur -> bounce Illusions of Grandeur, or Path to Exile taken by any player via Act of Treason etc... the effect should be on the controller)
 2019-09-23 04:53:14 +00:00
Ryan1729
80506954f1 more replacing getMapParams().containsKey with hasParam 2019-09-22 12:13:40 -06:00
Ryan1729
329d6145be manually reduce usage of getMapParams 2019-09-22 12:06:51 -06:00
Ryan1729
d8c27ccb14 find and replace .getMapParams().get(...) to getParam(...) 
Using Intellij's structural search.
 2019-09-22 11:50:19 -06:00
Ryan1729
52b697e47e find and replace this.mapParams.get to getParam 
Using Intellij's structural search.
 2019-09-22 11:43:18 -06:00