swordshine
|
ce4fe0239f
|
Merge branch 'patch' into 'master'
More ELD cards
See merge request core-developers/forge!2124
|
2019-09-15 02:24:46 +00:00 |
|
swordshine
|
5b176b93d0
|
Merge branch 'master' into 'master'
Various Improvement (Android)
See merge request core-developers/forge!2110
|
2019-09-15 02:24:26 +00:00 |
|
Hans Mackowiak
|
47d3a74387
|
Resolve "multiple StaticAbility Pump on same creature does conflict"
|
2019-09-14 16:33:56 +00:00 |
|
swordshine
|
efac184ffb
|
add more forgescribed cards
|
2019-09-14 23:29:40 +08:00 |
|
Ryan1729
|
827e035286
|
delete unused imports
|
2019-09-14 01:10:38 -06:00 |
|
Ryan1729
|
aaf1919905
|
more mechanical transformations
|
2019-09-14 01:05:16 -06:00 |
|
Ryan1729
|
d8ffcbb132
|
simplify Integer to int
|
2019-09-14 01:04:58 -06:00 |
|
Ryan1729
|
b532d1a0ca
|
more mechanical transformations
|
2019-09-14 00:03:12 -06:00 |
|
Ryan1729
|
a9c020d2ac
|
remove code that has been commented out since 2019-05-04 (commit 38178cfb)
|
2019-09-13 22:52:43 -06:00 |
|
Anthony Calosa
|
eda7d435e4
|
Merge remote-tracking branch 'remotes/core/master'
|
2019-09-12 20:38:53 +08:00 |
|
swordshine
|
207eaf482d
|
Merge branch 'patch' into 'master'
ELD cards
See merge request core-developers/forge!2113
|
2019-09-12 06:52:22 +00:00 |
|
Ryan1729
|
520c5290ac
|
remove unneeded imports
|
2019-09-11 22:22:55 -06:00 |
|
Ryan1729
|
d4ad098293
|
add helper method for the common case of passing down the card
|
2019-09-11 22:13:02 -06:00 |
|
Ryan1729
|
bbcb59f64f
|
more mechanical transformations
|
2019-09-11 22:00:38 -06:00 |
|
Ryan1729
|
1dc5dc1ff6
|
automatically inline redundant variable
|
2019-09-11 21:24:11 -06:00 |
|
Ryan1729
|
b76a3c3efa
|
several mechanical refactorings
|
2019-09-11 21:23:27 -06:00 |
|
swordshine
|
3f9001267e
|
Add Outlaws' Merriment
|
2019-09-12 10:39:08 +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 |
|
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 |
|
Anthony Calosa
|
302ddb11e3
|
Fix KeywordsChange
|
2019-09-08 07:33:19 +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 |
|
Hanmac
|
51e231a08e
|
CanBlockAdditional: moved to CardView for better display
|
2019-09-07 20:50:28 +02:00 |
|
Hanmac
|
e21f23f9ab
|
Card: fix code
|
2019-09-07 20:50:27 +02:00 |
|
Hanmac
|
357f146742
|
CanBlockAny: rewrite for 'can block an additional' and 'can block any number'
|
2019-09-07 20:50:27 +02: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 |
|
Anthony Calosa
|
a0b71d60a1
|
Revert Android 8 codes to support older Android phones.
Hope I didn't miss any. :)
(tested with Android Marshmallow phone with 2gb RAM and mediatek cpu)
|
2019-09-07 22:54:53 +08: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 |
|
swordshine
|
e8e115ae1a
|
Use a simple template for Silverflame Ritual
|
2019-09-06 20:51:55 +08:00 |
|
swordshine
|
56d0982fb1
|
Add Slaying Fire
|
2019-09-06 13:36:18 +08:00 |
|
swordshine
|
0f9ed8638b
|
Add Silverflame Ritual
|
2019-09-06 13:24:14 +08:00 |
|
Anthony Calosa
|
e977420ffa
|
Finalization for Refactoring
|
2019-09-06 12:55:40 +08:00 |
|
swordshine
|
d3d41d7c1f
|
Add Adamant cards
|
2019-09-06 12:34:53 +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
|
efbd2a08eb
|
Updated codes
|
2019-09-05 20:56:17 +08:00 |
|
Anthony Calosa
|
0f62a297c7
|
Updated some codes
|
2019-09-05 18:20:36 +08:00 |
|
Anthony Calosa
|
ca28b4d696
|
Merge remote-tracking branch 'remotes/core/master'
|
2019-09-05 18:01:47 +08:00 |
|
Hans Mackowiak
|
79f768e88a
|
Update PumpAllEffect: update view on Until Command
|
2019-09-05 07:28:48 +00:00 |
|
Ryan1729
|
3c47659c20
|
fix comment
|
2019-09-04 23:18:47 -06:00 |
|
Ryan1729
|
9d2e92157c
|
move and rename TriggerKey to AbilityKey
|
2019-09-04 22:53:32 -06:00 |
|
Ryan1729
|
ef5b7e902b
|
rename runTrigger to runTriggerOld and add new runTrigger method
|
2019-09-03 22:52:38 -06:00 |
|
Blacksmith
|
10877ca143
|
[maven-release-plugin] prepare for next development iteration
|
2019-09-04 01:51:10 +00:00 |
|
Blacksmith
|
367dab571d
|
[maven-release-plugin] prepare release forge-1.6.28
|
2019-09-04 01:51:04 +00:00 |
|
Anthony Calosa
|
efa606783c
|
Cleanup
|
2019-09-03 22:13:35 +08:00 |
|