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
Michael Kamensky
2d86d240a7 Merge branch 'master' into 'master' 
Add ELD achievements by Marek14.

See merge request core-developers/forge!2189
 2019-09-28 08:26:11 +00:00
Agetian
a59b911c56 - Add ELD achievements by Marek14. 2019-09-28 10:14:41 +03:00
Sol
406c82c5a2 Merge branch 'throne-edition-updates' into 'master' 
ELD updates

See merge request core-developers/forge!2187
 2019-09-28 02:32:00 +00:00
Sol
9512728374 Merge branch 'migrate-upcoming-throne' into 'master' 
Migrate throne

See merge request core-developers/forge!2186
 2019-09-28 02:23:58 +00:00
Chris H
fc676f25d7 ELD updates 2019-09-27 22:23:35 -04:00
Chris H
fc8d235529 Migrate throne 2019-09-27 21:54:10 -04:00
swordshine
7e7951d567 Merge branch 'abilitytranslation' into 'master' 
Translated new settings option 'Ability Icons'

See merge request core-developers/forge!2184
 2019-09-28 00:45:06 +00:00
swordshine
ffc7567081 Merge branch 'patch-1' into 'master' 
Update volatile_claws.txt - All Creature Types didn't happen...

See merge request core-developers/forge!2185
 2019-09-28 00:43:36 +00:00
Computica
b2f5b55c0e Update volatile_claws.txt - All Creature Types didn't happen... 2019-09-27 23:39:07 +00:00
Peter
7bb4e8f6d2 Translated new settings option 'Ability Icons' 2019-09-27 19:46:38 +02:00
Hans Mackowiak
939a902f43 Merge branch 'newBranch' into 'master' 
Add feature request

See merge request core-developers/forge!2179
 2019-09-27 12:16:07 +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
swordshine
2d32369082 Merge branch 'patch' into 'master' 
Fix Garenbrig Carver

See merge request core-developers/forge!2182
 2019-09-26 16:02:06 +00:00
swordshine
ec96e1f0c1 Fix Garenbrig Carver 2019-09-26 23:57:20 +08:00
swordshine
c55c083ca2 Merge branch 'patch' into 'master' 
Fix Fae of Wishes

See merge request core-developers/forge!2181
 2019-09-26 15:23:09 +00:00
swordshine
cba9366b14 Fix Fae of Wishes 2019-09-26 23:10:23 +08:00
swordshine
c16014bb93 Merge branch 'patch' into 'master' 
Fix Midnight Clock

See merge request core-developers/forge!2180
 2019-09-26 14:43:39 +00:00
swordshine
c83f81be4a Fix Midnight Clock 2019-09-26 22:39:06 +08:00
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
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