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 |
|
Alessandro Coli
|
cc3c631cad
|
Introduction of modal popup to notify when something is added to the
stack, including images for cards, complete with sources and targets.
|
2019-11-17 17:26:31 +01:00 |
|
Hans Mackowiak
|
6c9cf02884
|
Merge branch 'newBranch' into 'master'
Fix Amass ability (Woodland Champion and Dreadhorde Invasion)
See merge request core-developers/forge!2279
|
2019-11-12 12:13:36 +00:00 |
|
Anthony Calosa
|
0c904e208a
|
Add AmassTrigger Test
(If Woodland Champion will trigger from Eternal Skylord Amass Ability)
|
2019-11-12 19:49:01 +08:00 |
|
tehdiplomat
|
02299a0400
|
Add 7 Dwarves
|
2019-11-11 14:12:49 -05:00 |
|
Michael Kamensky
|
3a7e35c51d
|
Merge branch 'cardtranslationforgecore' into 'master'
Moved CardTranslation to forge-core.
See merge request core-developers/forge!2253
|
2019-11-07 04:02:57 +00:00 |
|
austinio7116
|
02969cfe5b
|
Pioneer archetype deck generation added to UI
|
2019-11-05 23:02:58 +00:00 |
|
Anthony Calosa
|
3b58d6df42
|
refactor rename
|
2019-11-01 17:46:14 +08:00 |
|
Anthony Calosa
|
31182289b7
|
Update dependency and use custom de/encoder for netty
|
2019-11-01 12:41:30 +08:00 |
|
Anthony Calosa
|
42f4126aff
|
Prepare Sleeve for Desktop...
|
2019-10-25 15:37:13 +08:00 |
|
klaxnek
|
fa6fce9589
|
Moved CardTranslation to forge-core. We need it to translate card info in forge-game.
|
2019-10-23 11:47:21 +02:00 |
|
Anthony Calosa
|
402885391f
|
Card Sleeves
|
2019-10-22 16:12:03 +08:00 |
|
Hans Mackowiak
|
773df25b53
|
replace .getZone().is with .isInZone, no null check needed
|
2019-10-14 18:46:43 +00:00 |
|
swordshine
|
c7a1aae06b
|
Merge branch 'deck-editor-unique-filter' into 'master'
Deck editor filters bug
See merge request core-developers/forge!2214
|
2019-10-07 03:45:17 +00:00 |
|
Ryan Wiedemann
|
7fcac4944a
|
change assertTrue to assertEquals as suggested by Intellij, so we get better test failure messages
|
2019-10-07 02:20:19 +00:00 |
|
Ryan1729
|
ea25ad2c3b
|
use setVisible(true) instead of show to get rid of the warning
|
2019-10-06 01:49:06 -06:00 |
|
Ryan1729
|
ac7f34d3f5
|
Cast to Object as recommended by warning
|
2019-10-06 01:40:15 -06:00 |
|
Ryan1729
|
6808be7a42
|
route all capitalize calls through a new method
|
2019-10-06 01:33:52 -06:00 |
|
Ryan1729
|
70986149ef
|
do less stuff since we know what the arguments will be.
|
2019-10-06 01:05:42 -06:00 |
|
Ryan1729
|
bc859b3e52
|
inline wrap
|
2019-10-06 00:56:12 -06:00 |
|
Ryan1729
|
eb376b8eb3
|
pull all still needed WordUtils.wrap calls into one method
|
2019-10-06 00:55:29 -06:00 |
|
swordshine
|
eb82d454b8
|
Merge branch 'start_replacement_run_keys_refactor' into 'master'
Start replacement run keys refactor
See merge request core-developers/forge!2175
|
2019-10-06 06:22:54 +00:00 |
|
Valerio Maggio
|
c07230c447
|
workaround to fix Deck Editor extra space for label
|
2019-10-03 18:50:37 +01:00 |
|
Valerio Maggio
|
27565d4cc0
|
fixed bug that was keep on creating filters in deck editor every tab switch (issue 1174)
|
2019-10-03 18:33:12 +01:00 |
|
Anthony Calosa
|
bf5f581cf6
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-10-01 14:28:38 +08:00 |
|