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
49,974 Commits 31 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

2695 Commits

Author SHA1 Message Date
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
Michael Kamensky
d3faa740f1 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.28.002.

See merge request core-developers/forge!2097
 2019-09-07 17:58:28 +00:00
Agetian
f64b59a140 - Preparing Forge for Android publish 1.6.28.002. 2019-09-07 20:51:14 +03:00
Michael Kamensky
f53346eaf7 Merge branch 'master' into 'master' 
Big Refactoring + Android Fix for older phones

See merge request core-developers/forge!2092
 2019-09-07 17:50:01 +00:00
Peter
c690d20604 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into mobile-translations02 2019-09-07 08:56:03 +02:00
Peter
3d53c41208 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-09-07 08:46:19 +02:00
Anthony Calosa
c1d5cfa27e Fix highlight of Planar Conquest start button instead of OldQuest header 2019-09-06 22:13:59 +08:00
swordshine
14ab1714bd Merge branch 'master' into 'master' 
update translation and try to reduce android chinese characters image cache size

See merge request core-developers/forge!2094
 2019-09-06 12:58:05 +00:00
Anthony Calosa
b3ad92530c Fix scaling of background when zoomed in multiplayer mode 2019-09-06 20:51:33 +08:00
Anthony Calosa
00f263b2be Merge remote-tracking branch 'remotes/core/master' 2019-09-06 20:22:07 +08:00
CCTV-1
ca4926f9b4 fix miss ';' 2019-09-06 09:18:23 +00:00
CCTV-1
87b2311fd6 if generate common chinese characters,many mobile phones stuck in generate image(if font file exists chinese characters). 
try only generate what is currently used.
 2019-09-06 07:32:04 +00:00
Agetian
21af87b906 - Preparing Forge for Android publish 1.6.28.001. 2019-09-06 08:08:02 +03:00
Anthony Calosa
e977420ffa Finalization for Refactoring 2019-09-06 12:55:40 +08:00
swordshine
19585aa007 Merge branch 'master' into 'master' 
Refactor/Code Cleanup

See merge request core-developers/forge!2080
 2019-09-06 00:41:16 +00:00
Anthony Calosa
59bf5830fe Big Cleanup 2019-09-06 00:03:04 +08:00
Anthony Calosa
ca28b4d696 Merge remote-tracking branch 'remotes/core/master' 2019-09-05 18:01:47 +08:00
Anthony Calosa
2b0e47dd14 Initial migration 2019-09-05 08:24:58 +08:00
CCTV-1
6070d3f1e3 fix:miss '=' 2019-09-04 10:11:28 +00:00
CCTV-1
3cbb603c24 add generate common chinese characters images 2019-09-04 06:57:34 +00:00
Anthony Calosa
5876ee8220 Removed redundant code 2019-09-04 12:23:36 +08:00