external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,763 Commits 32 Branches 187 Tags
3b47b51bb707a161e965199d1587ca9f06c27fa5
Commit Graph

3653 Commits

Author SHA1 Message Date
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
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
Anthony Calosa
f1c3e93548 Update HexproofKey 2019-09-25 21:11:01 +08: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
Ryan1729
eaed235b1b find and replace this.mapParams.containsKey to hasParam 
Using Intellij's structural search.
 2019-09-22 11:30:20 -06:00
Ryan1729
1e1ce95714 replace a containsKey and a simple get with getParamOrDefault 2019-09-22 11:29:20 -06:00
swordshine
3ca2b8c4be Add Happily Ever After 2019-09-22 22:17:21 +08:00
swordshine
79d03abe8c Add Drown in the Loch 2019-09-22 20:26:08 +08:00
swordshine
0f4c1960d9 More fixes 2019-09-21 22:27:21 +08:00
swordshine
bcccf726b5 Fix Kaalia of the Vast 2019-09-21 22:10:57 +08:00
swordshine
facb93945e Add Deathless Knight 2019-09-21 19:17:28 +08:00
Ryan1729
1c11465041 Merge branch 'master' of git.cardforge.org:core-developers/forge into push_down_toStringMap_part_3 2019-09-20 21:06:00 -06:00
swordshine
94e81531db Merge branch 'master' into 'master' 
More ELD cards

See merge request core-developers/forge!2148
 2019-09-21 01:33:27 +00:00
swordshine
dd7b419806 Merge branch 'push_down_toStringMap_part_2' into 'master' 
Push down to string map part 2

See merge request core-developers/forge!2134
 2019-09-21 01:33:20 +00:00
Hanmac
9b3fa50dee Adventure: If an object becomes a copy of an object that has an Adventure, the copy also has an Adventure. 2019-09-20 18:03:06 +02:00
Hanmac
b7b1c3a437 As Foretold: fix the cmc check 2019-09-20 16:20:35 +02:00
Hanmac
1e7ed84522 CardProperty: add AdventureCard for Creature with adventure 2019-09-20 15:54:47 +02:00
Hans Mackowiak
7a504bf3c8 Update CardFactoryUtil.java 2019-09-20 15:54:47 +02:00
Hans Mackowiak
94805103da Spell: add extra check for Adventure cards 2019-09-20 15:54:47 +02:00
Hanmac
378d0e26ab Adventure: add - separator 2019-09-20 15:54:47 +02:00
Hanmac
0c354e8a70 Adventure: add Logic to cast as Spell 2019-09-20 15:54:47 +02:00
swordshine
cb18c22649 Add Hushbringer 2019-09-20 21:29:36 +08:00
Ryan1729
4c43f70ea6 Merge branch 'push_down_toStringMap_part_2' into push_down_toStringMap_part_3 2019-09-19 21:13:03 -06:00
Ryan1729
626df0df1c Merge branch 'master' of git.cardforge.org:core-developers/forge into push_down_toStringMap_part_2 2019-09-19 20:49:44 -06:00
swordshine
80c6c23289 Update ability text if it's not translated 2019-09-19 20:57:49 +08:00
Hans Mackowiak
a90b6033b0 TriggerHandler: fix Dieharmonicon with new TriggerKeys 2019-09-19 10:54:34 +00:00
Ryan1729
7ca72974b6 push toStringMap into performTest, eliminating the need for the toStringMap call. 2019-09-18 22:00:28 -06:00
Ryan1729
bafbe73bd6 convert missed keys to enum 2019-09-18 21:12:13 -06:00
swordshine
a2da91eb3a Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2135
 2019-09-18 10:51:40 +00:00
swordshine
4fe155959e Merge branch 'push_down_toStringMap_part_1' into 'master' 
Push down toStringMap part 1

See merge request core-developers/forge!2127
 2019-09-18 10:48:34 +00:00
swordshine
87fffa0ddd Add Dance of the Manse 2019-09-18 12:29:05 +08:00
swordshine
cf9a72fc42 Add Once Upon a Time 2019-09-18 10:24:04 +08:00
Ryan1729
30d37c11b0 remove import 2019-09-17 19:40:45 -06:00
swordshine
2d9d53a19d Update Hollow One 2019-09-17 21:08:28 +08:00