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

2265 Commits

Author SHA1 Message Date
Anthony Calosa
72ab3cc690 adjust spacing - rendered icons 2019-10-01 21:47:53 +08: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
e869c6ac6b Remove unused imports 2019-09-30 11:35:18 +02:00
Peter
17fabb0bec Translated strings related to Win/Loose/Concede 2019-09-30 11:25:27 +02:00
Jamin W. Collins
59b01aba8f - Preparing Forge for Android publish 1.6.29.001 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2019-09-29 08:54:32 -06: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
Peter
7bb4e8f6d2 Translated new settings option 'Ability Icons' 2019-09-27 19:46:38 +02: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
c38cb5c3d4 Cleanup 2019-09-25 21:57:19 +08:00
Anthony Calosa
f1c3e93548 Update HexproofKey 2019-09-25 21:11:01 +08: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
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
Anthony Calosa
6556f78c28 Add Hexproof From Icons (TODO: PC code, better Hexproof from Icons) 2019-09-24 22:49:52 +08: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
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
Peter
68a8a08709 Mobile: Fix new bug Add Basic Lands Dialog (sorry) 2019-09-23 20:22:08 +02:00
Peter
8d3b00c3f2 Mobile: More Translations 
Added ¡ and ¿ needed to Spanish
 2019-09-23 11:53:03 +02:00
Anthony Calosa
1f58279525 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-09-23 14:49:29 +08: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
Anthony Calosa
6f5b9ddfff Add card highlighting 2019-09-19 23:23:56 +08:00
Anthony Calosa
73f3a5ff85 Prevent NPE 2019-09-19 23:22:59 +08:00
swordshine
6d73201393 Merge branch 'master' into 'master' 
translation Forge.java and update forge-android supported simplified chinese character

See merge request core-developers/forge!2141
 2019-09-19 06:58:08 +00:00
CCTV-1
1b9bce5165 translation Forge.java 2019-09-19 13:53:55 +08:00
Anthony Calosa
91abbcd3c5 Fix setloadingaMatch prematurely, if the startgame is null there must be an error/showdialog happened. 2019-09-19 04:31:42 +00:00
CCTV-1
aee2ac9ab7 Merge remote-tracking branch 'upstream/master' 2019-09-15 10:27:07 +08:00
Anthony Calosa
ccfbe4d956 countHuman instead of noAIPlayer 2019-09-14 15:05:01 +08:00
CCTV-1
372d9cce94 update forge-android support simplified chinese characters 2019-09-13 19:18:05 +08:00
Anthony Calosa
a107d41fed Merge branch 'master' into 'master' 
# Conflicts:
#   forge-gui-mobile/src/forge/screens/match/MatchScreen.java
 2019-09-13 10:35:22 +00:00
Peter
16da63aa9c Mobile - Translation: Deck Chooser, Deck Editor and Match Screen. 
Fix compare String with equals()
 2019-09-13 11:19:35 +02:00
Anthony Calosa
eda7d435e4 Merge remote-tracking branch 'remotes/core/master' 2019-09-12 20:38:53 +08:00
Anthony Calosa
8e282b16c5 Update Player Name 2019-09-12 20:30:42 +08:00
Anthony Calosa
73b71b18ab Transluscent Overlay for Loader 2019-09-12 20:29:40 +08:00
Anthony Calosa
61f400feac Prevent NPE 2019-09-12 20:28:48 +08:00
CCTV-1
acd8e76037 update forge-android support simplified chinese characters 2019-09-12 10:30:25 +08:00
CCTV-1
9b26f145f7 Merge remote-tracking branch 'upstream/master' 2019-09-11 21:44:26 +08:00
Anthony Calosa
7a28295585 Draw Priority for Multiplayer game (Human 2 players) 2019-09-11 21:30:22 +08:00
swordshine
434027c14f Merge branch 'ui-card-translation' into 'master' 
UI Card Translation (desktop and mobile)

See merge request core-developers/forge!1987
 2019-09-11 13:27:55 +00:00
CCTV-1
eb9e1fb2d9 update Simplified Chinese character set 2019-09-11 19:08:37 +08:00
swordshine
629fa3344b Merge branch 'mobile-translations02' into 'master' 
Mobile: Translate Settings Page

See merge request core-developers/forge!2058
 2019-09-11 07:06:58 +00:00
Anthony Calosa
bfc106b0da Much better implementation to make 1 tap on start button (Constructed) 
on Android (Should prevent issue loading a double match on single view)
 2019-09-10 21:56:20 +08:00
Anthony Calosa
a8d46b1ff0 Try to prevent rapid tap on Start Button causing issues on Android 2019-09-10 00:36:16 +08:00
Anthony Calosa
17b578ae9c Fix Textbounds getBounds, getMultilineBounds, getWrappedBounds 2019-09-09 16:10:51 +08:00
Anthony Calosa
5f78608321 Some codes needed to revert 2019-09-09 13:30:53 +08:00