external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,962 Commits 32 Branches 187 Tags
b3c8901aa1a7aa488d6f38c30b6d08dd5c31b05c
Commit Graph

35962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seravy
b3c8901aa1 Update AiController.java 2018-02-19 17:08:09 +00:00
Seravy
3346cbf0c5 Update AiController.java 2018-02-19 17:05:56 +00:00
Seravy
e3b4c59b9f Update AiController.java 2018-02-19 12:50:15 +00:00
Seravy
cbc0335d90 Trying to get effective cost instead of original cost but doesn't seem to recognize Memory Crystal anyway. I guess it's not that important. 2018-02-18 18:43:23 +01:00
Seravy
537259989f AI will avoid wasting a BUYBACK card without paying the buyback cost when able 2018-02-18 16:47:29 +01:00
Seravy
f16a7ff0b0 incomplete 2018-02-18 15:32:14 +01:00
Seravy
7ff8564077 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2018-02-18 09:35:39 +01:00
Michael Kamensky
6b528a6d99 Merge branch 'DeckResetFixing' into 'master' 
Deck reset fixing

See merge request core-developers/forge!213
 2018-02-18 08:36:08 +00:00
Michael Kamensky
77e79653ba Merge branch 'master' into 'master' 
- Minor cleanup and updating CHANGES.txt.

See merge request core-developers/forge!229
 2018-02-18 08:31:14 +00:00
Agetian
4665503caa - Minor cleanup and updating CHANGES.txt. 2018-02-18 11:29:02 +03:00
Michael Kamensky
1f922362a1 Merge branch 'mobile-dev' into 'master' 
add commandline parsing/options to mobile-dev

See merge request core-developers/forge!216
 2018-02-18 08:25:21 +00:00
Michael Kamensky
f5e095f345 Merge branch 'cantblock' into 'master' 
CantBlockBy as Static Ability

See merge request core-developers/forge!218
 2018-02-18 08:05:59 +00:00
Michael Kamensky
a392fc43f9 Merge branch 'deck-viewer' into 'master' 
improve "Copy to Clipboard" - merge reprinted cards

See merge request core-developers/forge!215
 2018-02-18 07:41:49 +00:00
Michael Kamensky
d444e8896c Merge branch 'Fireslinger' into 'master' 
Fireslinger

See merge request core-developers/forge!211
 2018-02-18 07:36:27 +00:00
Michael Kamensky
935d42af74 Merge branch 'SuddenImpact' into 'master' 
Force use of Sudden Impact during enemy draw step after drawing if enemy holds…

See merge request core-developers/forge!212
 2018-02-18 07:34:03 +00:00
Michael Kamensky
a9e15c2d33 Merge branch 'Guavafix' into 'master' 
The guava fix

See merge request core-developers/forge!217
 2018-02-18 07:17:15 +00:00
Michael Kamensky
b5ae52a3b6 Merge branch 'AiNonstacking' into 'master' 
AI Nonstacking Permanents

See merge request core-developers/forge!222
 2018-02-18 05:54:50 +00:00
Michael Kamensky
abf405fd20 Merge branch 'deck-editor' into 'master' 
add option to foil cards in a deck

See merge request core-developers/forge!219
 2018-02-18 05:50:49 +00:00
Michael Kamensky
3215eb9a8a Merge branch 'CounterFromAbilityAI' into 'master' 
Counter from ability ai

See merge request core-developers/forge!224
 2018-02-18 05:49:09 +00:00
Michael Kamensky
f2ddd697e9 Merge branch 'AICuriosity' into 'master' 
Ai curiosity

See merge request core-developers/forge!225
 2018-02-18 05:47:57 +00:00
Michael Kamensky
9e6fc59505 Merge branch 'Oaths' into 'master' 
Oaths

See merge request core-developers/forge!227
 2018-02-18 05:45:47 +00:00
Michael Kamensky
2dc0e10c34 Merge branch 'TreasureTroveFix' into 'master' 
AI Logic name in code and actual card scripts did not match. Assuming the…

See merge request core-developers/forge!228
 2018-02-18 05:45:14 +00:00
Sol
2a086c8b64 Merge branch 'token-artwork' into 'master' 
Token artwork

See merge request core-developers/forge!214
 2018-02-18 03:08:38 +00:00
Seravy
cf9e3a5f1d "Tap to deal X damage to target player" should be a priority target even if it's a defender or 0 attack creature 2018-02-17 22:58:45 +01:00
Jamin W. Collins
373e11bc41 add option to foil cards in a deck 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-17 12:42:56 -07:00
Seravy
bb27eab819 Merge branch 'Guavafix' 2018-02-17 16:53:49 +01:00
Jamin W. Collins
d99dd5f19f add commandline parsing/options to mobile-dev 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-17 08:50:41 -07:00
Jamin W. Collins
d60d350fcb token-artwork - try removing variant as a fallback 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-17 08:48:46 -07:00
Jamin W. Collins
b1e7e407a7 token artwork - try uppercase set name 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-17 08:48:46 -07:00
Jamin W. Collins
4e7d338144 improve "Copy to Clipboard" - merge reprinted cards 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-17 08:48:45 -07:00
Hanmac
4528541b3f AiController: add orderSa for token and pump effects for Hero of Bladehold 2018-02-17 16:25:41 +01:00
Hanmac
a829dc72bc CardFactoryUtil: make CantBeBlockedBy into new StaticAbility 2018-02-17 15:25:51 +01:00
Seravy
b6395aa463 The guava fix 2018-02-17 12:06:57 +01:00
Hanmac
3f1d6238ff CardFactoryUtil: add Battle cry as trigger 2018-02-17 12:01:53 +01:00
Hanmac
e990c3648e cards: update card scripts for new CantBlockByStatic 2018-02-17 10:29:07 +01:00
Seravy
8650a147aa AI Logic name in code and actual card scripts did not match. Assuming the scripts (6 cards) are correct as no card uses the other name. 2018-02-17 00:46:32 +01:00
Hanmac
8490f8d90b Card: fixed CARDNAME & EFFECTSOURCE on the static abilties 2018-02-16 20:55:17 +01:00
Hanmac
8f1c7bf40a EffectEffect: add AtEOT, remembering host card 2018-02-16 20:44:48 +01:00
Hanmac
ec87b64d0c Blazing Torch: CantBlockBy example 2018-02-16 16:51:37 +01:00
Hanmac
27eee4c8fa Card: show CantBlockBy on affected creature 2018-02-16 16:50:43 +01:00
Hanmac
af32152bcc CantBlockBy: now done as static ability 2018-02-16 16:49:25 +01:00
Hanmac
e72edb95b5 Manifest: fixed check with worms of the earth 2018-02-16 14:02:34 +01:00
Hanmac
efed143a11 ReplaceMoved: fixed zonetype check 2018-02-16 14:01:07 +01:00
Seravy
99f64d7565 Add fear to evasion abilities 2018-02-16 12:34:35 +01:00
Seravy
32ef472b0c AI prefers evasion or "tap to deal damage to player" creatures to enchant with these. 2018-02-16 12:22:50 +01:00
Sol
7ade1b9a52 Merge branch 'multiplayer' into 'master' 
Multiplayer

See merge request core-developers/forge!207
 2018-02-16 01:07:35 +00:00
Sol
cc664d1280 Merge branch 'DefaultFiltersOption' into 'master' 
Default filters option

See merge request core-developers/forge!175
 2018-02-16 01:00:20 +00:00
Jamin W. Collins
84874601a9 Continue but log NullPointerException in getMana 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-15 17:08:01 -07:00
Jamin W. Collins
b47d528bf0 ensure that remote client has trackers defined 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-15 17:07:14 -07:00
Seravy
59612c45ea Resolving conflicts 2018-02-15 10:03:54 +01:00