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

42683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
8997b71c33 Fixed Malakir Familiar Oracle text 2019-09-24 06:44:11 +01:00
swordshine
15a31d0788 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!2164
 2019-09-24 05:11:16 +00:00
Agetian
41d5af8369 - Added puzzle PS_MGOB. 2019-09-24 08:09:00 +03:00
CCTV-1
516510c98f update simplified chinese translation 2019-09-24 13:05:35 +08:00
Anthony Calosa
b2f80b47a9 Display Ability Icons (Mobile & PC) 2019-09-24 12:30:51 +08:00
Anthony Calosa
44eee1c5c4 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-09-24 12:05:57 +08:00
swordshine
1cf37aa460 Merge branch 'patch' into 'master' 
Fix Escape to the Wilds

See merge request core-developers/forge!2162
 2019-09-24 03:23:09 +00:00
swordshine
6571a56a3c Fix Escape to the Wilds 2019-09-24 11:03:01 +08:00
swordshine
c2be7cc7e6 Merge branch 'run-away-together-ai-remove' into 'master' 
Set 'Run Away Together' to AI:RemoveDeck:All

See merge request core-developers/forge!2161
 2019-09-24 02:13:51 +00:00
swordshine
425ecb9a6b Merge branch 'fabled-passage-typo' into 'master' 
Fix typo on Fabled Passage

See merge request core-developers/forge!2160
 2019-09-24 02:03:23 +00:00
Brock Fanning
daa89338aa Set 'Run Away Together' to AI:RemoveDeck:All 2019-09-23 22:01:00 -04:00
swordshine
be3286cd8b Merge branch 'unique-cards-only-option-deck-editor' into 'master' 
Unique cards only option deck editor

See merge request core-developers/forge!2063
 2019-09-24 01:56:49 +00:00
Brock Fanning
bf5ab53678 Fix typo on Fabled Passage 2019-09-23 21:55:05 -04:00
swordshine
c7d6234f5e Merge branch 'mobiletranslation06fix' into 'master' 
Mobile: Fix new bug Add Basic Lands Dialog (sorry)

See merge request core-developers/forge!2159
 2019-09-24 00:39:16 +00:00
Peter
68a8a08709 Mobile: Fix new bug Add Basic Lands Dialog (sorry) 2019-09-23 20:22:08 +02:00
swordshine
41d9cece8a Merge branch 'patch' into 'master' 
Update the edition file because Adventure cards are not split cards.

See merge request core-developers/forge!2158
 2019-09-23 15:23:48 +00:00
Valerio Maggio
e246751cab Added missing Localizer Import 2019-09-23 16:16:21 +01:00
swordshine
80defc5516 Merge branch 'push_down_toStringMap_part_3' into 'master' 
Push down to string map part 3

See merge request core-developers/forge!2139
 2019-09-23 15:16:05 +00:00
Valerio Maggio
e9de55ebc8 Merge Upstream and conflict resolved on ImageView with missing localiser 2019-09-23 16:06:40 +01:00
swordshine
7f8b55fe0f Update the edition file because Adventure cards are not split cards. 2019-09-23 22:36:18 +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
swordshine
e55e160cdb Merge branch 'patch-5' into 'master' 
Add Path to Exile, Act of Treason test

See merge request core-developers/forge!2146
 2019-09-23 11:55:46 +00:00
swordshine
1c89cb6fca Merge branch 'replaceMode' into 'master' 
ReplacementEffect: add Mode for ReplacementType

See merge request core-developers/forge!2150
 2019-09-23 11:53:48 +00:00
Hans Mackowiak
14c9a8ccc3 ReplacementEffect: add Mode for ReplacementType 2019-09-23 11:53:48 +00:00
swordshine
d0fe0640f9 Merge branch 'mobiletranslation06' into 'master' 
Mobile: Translations n.6

See merge request core-developers/forge!2157
 2019-09-23 11:52:30 +00:00
Peter
a4ed3a3f36 Merge remote-tracking branch 'origin/mobiletranslation06' into mobiletranslation06 
# Conflicts:
#	forge-gui/res/languages/zh-CN.properties
 2019-09-23 12:47:57 +02:00
Peter
f4bf120125 Updated chinese (another try...) 2019-09-23 12:46:34 +02:00
Peter
f15e051cc4 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into mobiletranslation06 
 Conflicts:
	forge-gui/res/languages/zh-CN.properties
 2019-09-23 12:45:49 +02:00
klaxnek
9b483eb881 Merge branch 'master' into 'mobiletranslation06' 
# Conflicts:
#   forge-gui/res/languages/zh-CN.properties
 2019-09-23 10:41:02 +00:00
Peter
0a57342524 Updated chinese translation 2019-09-23 12:39:13 +02:00
swordshine
76a0fc6fa2 Merge branch 'ELD_Draft' into 'master' 
Preparation for ELD draft format

See merge request core-developers/forge!2155
 2019-09-23 10:17:18 +00:00
swordshine
ed42c4a675 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!2156
 2019-09-23 10:14:42 +00:00
Peter
8d3b00c3f2 Mobile: More Translations 
Added ¡ and ¿ needed to Spanish
 2019-09-23 11:53:03 +02:00
CCTV-1
9e778d9a69 update simplified chinese translation 2019-09-23 17:21:47 +08:00
Anthony Calosa
1f58279525 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-09-23 14:49:29 +08:00
austinio7116
08129db336 Preparation for ELD draft format 2019-09-23 06:18:32 +01:00
Hans Mackowiak
2aec48a64b Merge branch 'patch-4' into 'master' 
Fix getController()

See merge request core-developers/forge!2142
 2019-09-23 04:53:14 +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
swordshine
b12db3b9a8 Merge branch 'mobiletranslation05' into 'master' 
Mobile: Translated more strings and Views

See merge request core-developers/forge!2154
 2019-09-23 01:10:57 +00:00
swordshine
00c3010319 Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2153
 2019-09-23 00:51:43 +00:00
Peter
4bf837701f Mobile: Translated more strings and Views 
Fixed duplicated Catalog label
Fixed Stack label not found
 2019-09-22 20:49:55 +02: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
9a32e2885a Add Fires of Invention 2019-09-22 22:59:10 +08:00
swordshine
3ca2b8c4be Add Happily Ever After 2019-09-22 22:17:21 +08:00