external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,973 Commits 32 Branches 187 Tags
ec98d128f128e505c5ca5dba3b0df3379408904c
Commit Graph

42973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
00c51488da Merge branch 'newBranch' into 'master' 
"Hexproof from" Ability Icons

See merge request core-developers/forge!2172
 2019-09-25 19:00:35 +00:00
Anthony Calosa
c38cb5c3d4 Cleanup 2019-09-25 21:57:19 +08:00
Anthony Calosa
f1c3e93548 Update HexproofKey 2019-09-25 21:11:01 +08:00
swordshine
ab6d4575af Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!2178
 2019-09-25 09:46:04 +00:00
CCTV-1
b37f21f751 update simplified chinese translation 2019-09-25 17:11:22 +08:00
swordshine
28d8888b1e Merge branch 'german-translation' into 'master' 
german translation update

See merge request core-developers/forge!2176
 2019-09-25 08:30:37 +00:00
Hans Mackowiak
15e5d68520 Update ManifestAi: unused import 2019-09-25 08:03:32 +00:00
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
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
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
Ryan1729
60fb7d8809 add myself to CONTRIBUTORS.txt 2019-09-24 22:03:09 -06: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