external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 33 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

2877 Commits

Author SHA1 Message Date
Michael Kamensky
9546594e8d Merge branch 'target-other-zones' into 'master' 
Show ZoneAreas when targeting non-Stack zones

See merge request core-developers/forge!2492
 2020-02-14 15:01:02 +00:00
friarsol
ec79434759 Improve Android zone restoration 2020-02-13 23:17:26 -05:00
friarsol
ddc531c5f2 Updates for Android 2020-02-10 21:30:19 -05:00
CCTV-1
26fb509cb9 translate FFileChooser 2020-02-10 20:24:01 +08:00
CCTV-1
0ba3cdfe87 translate mobile achievements title 2020-02-07 12:31:27 +08:00
CCTV-1
143ca4ad41 if token is a card clone,still translate it(e.g momir basic token). 2020-02-03 08:50:30 +08:00
CCTV-1
64117ad1fc update translation 2020-02-02 19:48:56 +08:00
CCTV-1
e09faa3b9f when card is token,do not display translation text . 2020-01-30 22:07:28 +08:00
CCTV-1
e5051d2635 Merge remote-tracking branch 'upstream/master' 2020-01-28 22:34:10 +08:00
CCTV-1
56c63bc6d1 translate some text 2020-01-25 13:54:32 +08:00
CCTV-1
313112a488 translate some text 2020-01-25 10:50:39 +08:00
CCTV-1
f212cf1dc8 translate SleeveSelector 2020-01-23 12:53:10 +08:00
CCTV-1
5f8f82fc93 update Simplified Chinese characters list 2020-01-23 11:51:50 +08:00
CCTV-1
dda23854a3 translate some text 2020-01-22 12:51:44 +08:00
CCTV-1
faf9ace2ab update translation 2020-01-21 17:22:27 +08:00
CCTV-1
7256cc2f8f translate mobile PlanarConquest and other some text 2020-01-20 23:45:49 +08:00
CCTV-1
9ee07411d0 Merge remote-tracking branch 'upstream/master' 2020-01-20 09:18:20 +08:00
klaxnek
a0e94f2f51 Mobile: AI Personality Translation 2020-01-19 16:09:47 +00:00
Agetian
3885e02d60 - Preparing Forge for Android publish 1.6.32.001 [incremental]. 2020-01-19 08:11:34 +03:00
CCTV-1
f2f984aff6 Merge remote-tracking branch 'upstream/master' 2020-01-19 10:03:19 +08:00
Blacksmith
b8101d0387 [maven-release-plugin] prepare for next development iteration 2020-01-19 00:54:23 +00:00
Blacksmith
55d02d5adb [maven-release-plugin] prepare release forge-1.6.32 2020-01-19 00:54:18 +00:00
CCTV-1
72d16f0636 translate some text 2020-01-18 14:05:40 +08:00
CCTV-1
33564d023c translate some text 2020-01-15 20:20:25 +08:00
CCTV-1
c0d77a7fdf fix translation key does not match 2020-01-15 16:53:54 +08:00
CCTV-1
1a55341dd3 translate some text 2020-01-14 13:18:43 +08:00
Blacksmith
1b130ab157 [maven-release-plugin] prepare for next development iteration 2020-01-08 02:20:36 +00:00
Blacksmith
74005529f5 [maven-release-plugin] prepare release forge-1.6.31 2020-01-08 02:20:31 +00:00
CCTV-1
ceb892d610 use localization card name in translation text 2019-12-31 21:16:06 +08:00
CCTV-1
cd1d744e1f fix typo 2019-12-26 08:25:06 +08:00
CCTV-1
6c4ceccc30 translate mobile AssignDamage view 2019-12-25 14:07:28 +08:00
CCTV-1
fde7d6ff09 translate dev menu 2019-12-25 14:06:59 +08:00
CCTV-1
ac9f8e3191 translate "Select Order" 2019-12-20 12:31:32 +08:00
CCTV-1
3f1f8321d3 do not translate "for {CR}" 2019-12-18 18:04:50 +08:00
CCTV-1
cbab3e6000 LoadQuestScreen.java "New" should not be use lblNew 2019-12-18 13:21:32 +08:00
CCTV-1
17663bd2c0 translate mobile quest 2019-12-18 12:56:41 +08:00
CCTV-1
3846be2321 translate some text 2019-12-17 19:49:11 +08:00
Anthony Calosa
4fb5e7d305 Add Unstable Set to ExtendedArt 2019-11-29 13:40:25 +08:00
Ryan1729
bebc58d91d Merge branch 'master' of git.cardforge.org:core-developers/forge into remove_some_build_warnings 
# Conflicts:
#	forge-gui-mobile/src/forge/assets/FSkin.java
 2019-11-21 10:24:52 -07:00
Anthony Calosa
0a9078a2ec Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-11-16 17:51:04 +08:00
Anthony Calosa
bf2368ee44 Update 2019-11-16 17:44:56 +08:00
Anthony Calosa
d0a23fbf14 Add support for ".fullborder" cards 
(to differentiate full image cards and full image cards with full borders,
so it will only crop full image cards with full borders)
 2019-11-16 17:36:30 +08:00
klaxnek
cff4a29f1c Merge branch 'master' of https://git.cardforge.org/core-developers/forge into translation11 
 Conflicts:
	forge-gui/res/languages/de-DE.properties
	forge-gui/res/languages/en-US.properties
	forge-gui/res/languages/es-ES.properties
	forge-gui/res/languages/zh-CN.properties
 2019-11-16 09:59:06 +01:00
Anthony Calosa
da3d1d7099 Update 2019-11-15 08:56:35 +08:00
Anthony Calosa
86dd21ae7b Fix permanents not updating when animated to creature. 2019-11-15 06:57:43 +08:00
tehdiplomat
02299a0400 Add 7 Dwarves 2019-11-11 14:12:49 -05:00
Agetian
776b865761 - Preparing Forge for Android publish 1.6.30.001 [incremental]. 2019-11-11 08:10:57 +03:00
Blacksmith
c2db78baf7 [maven-release-plugin] prepare for next development iteration 2019-11-11 02:45:55 +00:00
Blacksmith
9a30d78f54 [maven-release-plugin] prepare release forge-1.6.30 2019-11-11 02:45:50 +00:00
Anthony Calosa
f239755249 Fix "controls" when alternating human vs ai, then ai vs ai play on mobile forge, 
update refreshfield, update targeting arrows on 3 to 4 players
(shows attacked player on 3/4 player match...)
 2019-11-09 19:28:21 +08:00