CCTV-1
|
544b653a90
|
Merge remote-tracking branch 'upstream/master'
|
2019-09-12 10:31:47 +08:00 |
|
swordshine
|
fdd0814786
|
Merge branch 'master' into 'master'
add Simplified Chinese cards translation support
See merge request core-developers/forge!2112
|
2019-09-12 02:30:26 +00:00 |
|
CCTV-1
|
acd8e76037
|
update forge-android support simplified chinese characters
|
2019-09-12 10:30:25 +08:00 |
|
CCTV-1
|
b4f54dd150
|
update translation
|
2019-09-12 10:29:10 +08:00 |
|
swordshine
|
a9728725a3
|
Merge branch 'patch' into 'master'
ELD cards
See merge request core-developers/forge!2111
|
2019-09-12 02:28:59 +00:00 |
|
swordshine
|
d7e0dd3e54
|
Add forgescribed cards
|
2019-09-12 10:01:52 +08:00 |
|
swordshine
|
35b887de14
|
Update Lochmere Serpent
|
2019-09-12 09:17:49 +08:00 |
|
CCTV-1
|
b5f95ccf77
|
update de-De es-ES card name translation
|
2019-09-12 09:10:38 +08:00 |
|
CCTV-1
|
5bf55abd49
|
add Simplified Chinese cards translation support
|
2019-09-12 09:08:43 +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
|
764f2d903b
|
Merge branch 'master' into 'master'
update Simplified Chinese translation
See merge request core-developers/forge!2109
|
2019-09-11 09:22:53 +00:00 |
|
CCTV-1
|
85da019bf8
|
update translation
|
2019-09-11 16:43:55 +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 |
|
swordshine
|
3c97a43898
|
Merge branch 'patch' into 'master'
ELD cards
See merge request core-developers/forge!2107
|
2019-09-11 06:11:37 +00:00 |
|
swordshine
|
867222ffc2
|
Merge branch 'master' into 'master'
Forge-Desktop LanguageComboBox content automatic generated
See merge request core-developers/forge!2108
|
2019-09-11 06:11:32 +00:00 |
|
swordshine
|
7b7616834f
|
Merge branch 'master' into 'master'
Prevent MultiTap on Start Button (Android)
See merge request core-developers/forge!2106
|
2019-09-11 06:11:24 +00:00 |
|
swordshine
|
51117558ac
|
Merge branch 'update_run_trigger_callers_part_1' into 'master'
Update run trigger callers part 1
See merge request core-developers/forge!2103
|
2019-09-11 06:11:18 +00:00 |
|
swordshine
|
80f15cadfb
|
Add more forgescribed cards
|
2019-09-11 13:13:03 +08:00 |
|
swordshine
|
89daf161a5
|
Add more forgescribed cards
|
2019-09-11 12:10:51 +08:00 |
|
swordshine
|
b10f0b9366
|
Add Enchanted Carriage
|
2019-09-11 09:51:41 +08:00 |
|
CCTV-1
|
0b244b0b40
|
language list is generated from an res/languages existing file(consistent with Andorid behavior)
|
2019-09-11 09:37:00 +08:00 |
|
CCTV-1
|
04f6302e18
|
adjust indentation
|
2019-09-11 09:15:07 +08:00 |
|
swordshine
|
e509f82599
|
Add forgescribed ELD cards
|
2019-09-11 09:09:26 +08:00 |
|
CCTV-1
|
a4bed16d2d
|
update translation
|
2019-09-11 09:07:04 +08:00 |
|
CCTV-1
|
65ea561462
|
add zh-CN language option
|
2019-09-11 09:05:12 +08: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 |
|
Michael Kamensky
|
3e5e6a5981
|
Merge branch 'master' into 'master'
Fix Textbounds getBounds, getMultilineBounds, getWrappedBounds
See merge request core-developers/forge!2105
|
2019-09-09 17:11:31 +00: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 |
|
swordshine
|
af6c826cc4
|
Merge branch 'master' into 'master'
Some codes needed to revert
See merge request core-developers/forge!2104
|
2019-09-09 06:25:53 +00:00 |
|
Anthony Calosa
|
5f78608321
|
Some codes needed to revert
|
2019-09-09 13:30:53 +08:00 |
|
Ryan1729
|
29aef01a99
|
update several callers of runTriggerOld to runTrigger
|
2019-09-08 23:17:58 -06:00 |
|
Ryan1729
|
f311c3b53c
|
mark runTriggerOld as @Deprecated
|
2019-09-08 22:34:52 -06:00 |
|
Ryan1729
|
311bbea70f
|
remove more null literals where overloads that pass null exist
|
2019-09-08 21:34:46 -06:00 |
|
Ryan1729
|
2f45d0050b
|
Find that many methods are always passed null for their params and so start removeing those params since they are getting in the way of my intended refactor.
|
2019-09-08 21:34:41 -06:00 |
|
Ryan1729
|
25031e5d4e
|
Add helper method and chip away at refactor
|
2019-09-08 21:34:14 -06:00 |
|
Sol
|
32f9ad9157
|
Merge branch 'start_trigger_run_params_refactor' into 'master'
Setup to begin refactoring Trigger runParams to use Enum keys
See merge request core-developers/forge!2085
|
2019-09-09 02:27:27 +00:00 |
|
Hans Mackowiak
|
82dd917899
|
Merge branch 'master' into 'master'
Fix KeywordsChange
See merge request core-developers/forge!2101
|
2019-09-08 07:33:19 +00:00 |
|
Anthony Calosa
|
302ddb11e3
|
Fix KeywordsChange
|
2019-09-08 07:33:19 +00:00 |
|
swordshine
|
8520fcf471
|
Merge branch 'master' into 'master'
Revert URL Decode to support older phone
See merge request core-developers/forge!2099
|
2019-09-08 03:23:12 +00:00 |
|
Anthony Calosa
|
1321bcd125
|
Revert URL Decode to support older phone
|
2019-09-08 10:45:13 +08:00 |
|
swordshine
|
e9794036ad
|
Merge branch 'master' into 'master'
Added puzzle PS_M208 - Possibility Storm - Magic Core Set 2020 08
See merge request core-developers/forge!2098
|
2019-09-08 00:47:16 +00:00 |
|
Ryan Wiedemann
|
3d51a6e962
|
Merge branch 'master' into 'start_trigger_run_params_refactor'
# Conflicts:
# forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java
|
2019-09-07 23:36:05 +00:00 |
|
Agetian
|
d2e7fa62d1
|
- Added puzzle PS_M208.
|
2019-09-07 22:39:02 +03:00 |
|
Michael Kamensky
|
847195c9f5
|
Merge branch '1138-refactor-canblock-numbers' into 'master'
Resolve "Refactor "canBlock" Numbers"
Closes #1138
See merge request core-developers/forge!2078
|
2019-09-07 19:36:40 +00:00 |
|
Hanmac
|
51e231a08e
|
CanBlockAdditional: moved to CardView for better display
|
2019-09-07 20:50:28 +02:00 |
|
Agetian
|
d11fc1b6fe
|
- Rewire AI logic for AiAttackController.
|
2019-09-07 20:50:28 +02:00 |
|