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,709 Commits 31 Branches 187 Tags
17fabb0bec10213d0ba3840e2e1685a0264c438c
Commit Graph

42709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dagin Svezek
7d61198d81 german translation update 2019-09-25 07:14:41 +00:00
Anthony Calosa
b6ed045c21 Add Show Ability Icons Preference 
(Overlay Menu on PC, Settings Page on Mobile)
 2019-09-25 14:49:41 +08:00
Anthony Calosa
c24f4b59ec Update Icons 2019-09-25 12:28:40 +08:00
Anthony Calosa
9888faa271 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-09-25 12:26:10 +08:00
swordshine
bd41937c49 Merge branch 'indexofoutboundsfix' into 'master' 
Mobile: Fix IndexOutOfBoundsException bug trying to get a card that doesn't exist.

See merge request core-developers/forge!2174
 2019-09-25 03:55:06 +00:00
Anthony Calosa
8df2022a87 Add Hexproof From Icons (TODO: better Hexproof from Icons) 2019-09-25 09:31:08 +08:00
klaxnek
34c3c3b71c Mobile: Fix IndexOutOfBoundsException bug trying to get a card that doesn't exist. 
java.lang.IndexOutOfBoundsException: Index: 2, Size: 2
 at java.util.ArrayList.get(ArrayList.java:437)
 at forge.screens.match.views.VCardDisplayArea.setSelectedIndex(VCardDisplayArea.java:193)
 at forge.screens.match.views.VZoneDisplay.setSelectedIndex(VZoneDisplay.java:100)
 at forge.card.CardZoom.setVisible(CardZoom.java:89)
 at forge.toolbox.FOverlay.hide(FOverlay.java:85)
 at forge.toolbox.FOverlay$1.run(FOverlay.java:75)
 at com.badlogic.gdx.backends.android.AndroidGraphics.onDrawFrame(AndroidGraphics.java:487)
 at android.opengl.GLSurfaceView$GLThread.guardedRun(GLSurfaceView.java:1571)
 at android.opengl.GLSurfaceView$GLThread.run(GLSurfaceView.java:1270)
 2019-09-25 00:52:15 +02:00
Michael Kamensky
448b4ef959 Merge branch 'master' into 'master' 
Added MTGO Grixis Cube submitted by dolphi5.

See merge request core-developers/forge!2173
 2019-09-24 17:49:21 +00:00
Agetian
1ff41ec7c3 - Update the cube name 2019-09-24 20:13:33 +03:00
Agetian
4d1572a76a - Added MTGO Grixis Cube submitted by dolphi5. 2019-09-24 20:03:42 +03:00
Anthony Calosa
6556f78c28 Add Hexproof From Icons (TODO: PC code, better Hexproof from Icons) 2019-09-24 22:49:52 +08:00
swordshine
30702a22e0 Merge branch 'german-translation' into 'master' 
german translation update

See merge request core-developers/forge!2171
 2019-09-24 14:45:08 +00:00
Dagin Svezek
dbb34e06e6 german translation update 2019-09-24 14:11:06 +00:00
Hans Mackowiak
8820097b9d Merge branch 'patch-4' into 'master' 
Update belle_of_the_brawl.txt

See merge request core-developers/forge!2170
 2019-09-24 13:45:36 +00:00
Hans Mackowiak
0c88765fce Update belle_of_the_brawl.txt 2019-09-24 13:45:36 +00:00
swordshine
ddc9f05059 Merge branch 'translation07' into 'master' 
Translate InputBase and PlayerControllerHuman.

See merge request core-developers/forge!2168
 2019-09-24 13:22:13 +00:00
Hans Mackowiak
d71d63ade8 Merge branch 'newBranch' into 'master' 
Fix NPE

Closes #1164

See merge request core-developers/forge!2169
 2019-09-24 12:11:17 +00:00
Anthony Calosa
bc5e5a731d Fix NPE 2019-09-24 12:11:16 +00:00
Anthony Calosa
6ad34fed2c Better Fix NPE 2019-09-24 20:07:22 +08:00
Anthony Calosa
028880e026 Fix NPE 2019-09-24 19:47:17 +08:00
Peter
ee2aa50e07 Translate InputBase and PlayerControllerHuman. 
PlayerControllerHuman translation pending (only translated safe ones by now)
 2019-09-24 13:45:12 +02:00
swordshine
829eae7c97 Merge branch 'darkredfontfix' into 'master' 
Updated Darkred font skin.

See merge request core-developers/forge!2167
 2019-09-24 09:32:12 +00:00
Peter
e763a1d662 Updated Darkred font skin. 
Used Darkforge font. Now supports ¿ and ¡ characters. Agreed with Churrufli, darkred skin author.
 2019-09-24 11:27:58 +02:00
swordshine
d7d706d862 Merge branch 'newBranch' into 'master' 
Display Ability Icons

See merge request core-developers/forge!2163
 2019-09-24 06:42:20 +00:00
swordshine
a1059f7304 Merge branch 'master' into 'master' 
Added puzzle PS_MGOB - Possibility Storm - Special Guest Puzzle - Modern Goblins

See merge request core-developers/forge!2165
 2019-09-24 06:40:54 +00:00
swordshine
1434bc1499 Merge branch 'malakir' into 'master' 
Fixed Malakir Familiar Oracle text

See merge request core-developers/forge!2166
 2019-09-24 06:40:47 +00:00
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