external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,537 Commits 31 Branches 187 Tags
0762d0877a322170874fc89fa6b40b98b04e94d0
Commit Graph

1877 Commits

Author SHA1 Message Date
CCTV-1
cc5d2c47ee translate some text 2020-02-24 20:05:44 +08:00
CCTV-1
f4dfa6038c fix translation format 2020-02-23 21:10:22 +08:00
CCTV-1
e195fe40b9 translate some message text 2020-02-21 20:47:38 +08:00
CCTV-1
b2526523d8 fix key typo 2020-02-20 18:48:08 +08:00
CCTV-1
f0a6760312 translate quest starting pool type 2020-02-20 10:15:08 +08:00
CCTV-1
11c5283014 translate some desktop quest text 2020-02-19 21:18:58 +08:00
CCTV-1
7ea0a5268c translate deck viewer 2020-02-19 11:37:26 +08:00
CCTV-1
456083d2b0 translate tip text 2020-02-19 11:36:52 +08:00
friarsol
133f1656d8 Some more progress with autoupdate button 2020-02-17 21:51:18 -05:00
friarsol
599d75351c Hook up AutoUpdater to do its thing 2020-02-17 16:51:34 -05:00
CCTV-1
661e41e220 Merge remote-tracking branch 'upstream/master' into display_localization_cardname 2020-02-17 11:37:34 +08:00
CCTV-1
b1ad316134 translate some tab/menu text 2020-02-16 13:28:16 +08:00
CCTV-1
3ff20effc8 translate floating zone title 2020-02-16 12:01:20 +08:00
CCTV-1
eb4ae865d4 Merge remote-tracking branch 'upstream/master' 2020-02-16 12:00:01 +08:00
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
Zimtente
50c8e129d0 changed hardcoded symbol WIDTH and HEIGHT to constants 2020-02-12 19:07:45 +01:00
Zimtente
6ae29a311a fixed mana symbols vanishing/not being in the right place in card descriptions 2020-02-12 17:40:50 +01:00
CCTV-1
c140ae7647 Merge remote-tracking branch 'upstream/master' 2020-02-10 20:21:23 +08:00
friarsol
ef0a1a843d Pop up other zones during targeting 2020-02-09 21:32:24 -05:00
Hans Mackowiak
55ed4c1bc0 StaticAbilityContinuous: fix AddType ChosenType 2020-02-08 04:44:45 +00:00
Hans Mackowiak
e062c83c02 Fixes graf cage 2020-02-07 17:29:54 +00:00
CCTV-1
5dd0edb317 translate Statistics 2020-02-07 12:30:42 +08:00
CCTV-1
2bb6379232 translate desktop some DragTab 2020-02-07 12:30:06 +08:00
CCTV-1
9c8a96a98a get right card face name 2020-01-29 07:58:03 +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
74ed34b6dd Merge remote-tracking branch 'upstream/master' 2020-01-21 17:22:43 +08:00
friarsol
659b1c7a63 Auto download from Quest WinLose screen 2020-01-20 21:55:12 -05:00
CCTV-1
72d16f0636 translate some text 2020-01-18 14:05:40 +08:00
CCTV-1
1a55341dd3 translate some text 2020-01-14 13:18:43 +08:00
Hans Mackowiak
d5cc3289dc Resolve "Test failure: testCloneTransform" 2020-01-10 10:24:07 +00:00
Sol
41844ee7e3 Extracting two bugfixes from Lerio's MR 2020-01-07 04:12:37 +00:00
CCTV-1
fde7d6ff09 translate dev menu 2019-12-25 14:06:59 +08:00
CCTV-1
a050b584ac Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-12-21 12:38:06 +08:00
Alexei Svitkine
4384b1621b Switch card types lists to sets to avoid costly look ups and 
optimize getParamOrDefault() to do a single look up, instead of
two. These were showing up in profiles when using simulation AI.
 2019-12-20 11:15:38 -05:00
Myrd
5cb8502566 Revert "Merge branch 'master' into 'master'" 
This reverts merge request !2334
 2019-12-20 15:48:04 +00:00
CCTV-1
19d4f36faa translate desktop AddBasicLandDialog.java 2019-12-20 12:34:28 +08:00
CCTV-1
ac9f8e3191 translate "Select Order" 2019-12-20 12:31:32 +08:00
Alexei Svitkine
3d59118b94 Use Sets instead of Lists for card types to avoid slow lookups. 2019-12-19 20:49:29 -05:00
CCTV-1
c226a4dbd5 Merge remote-tracking branch 'upstream/master' 2019-12-18 12:44:02 +08:00
friarsol
d63106a71a Save completed puzzles, and sort them to the bottom of the screen 2019-12-17 21:16:17 -05:00
CCTV-1
3846be2321 translate some text 2019-12-17 19:49:11 +08:00
Alessandro Coli
f3ff419462 Changes for the stack effect notifications - request by Michael Kamensky 
@Agetian in merge  request
https://git.cardforge.org/core-developers/forge/merge_requests/2294
 2019-11-23 12:05:08 +01:00
Alessandro Coli
d79c2469ec Merge remote-tracking branch 'upstream/master' 2019-11-23 09:44:59 +01:00
Chris H
a9d9c800b8 Fix start crash 2019-11-22 21:02:02 -05:00
Alessandro Coli
5b64b41f21 Merge remote-tracking branch 'upstream/master' 2019-11-22 13:40:18 +01: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
Alessandro Coli
2c70b8b7e0 End of the stack modal panel implementation, rollback about the Wild 
Quests implementation
 2019-11-21 16:49:50 +01:00
Ryan1729
f0076117df respond to code review 2019-11-19 19:38:51 -07:00