external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 34 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

53916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
1938e65d9c call keywordsToText only once 2021-09-26 20:12:40 -04:00
Northmoc
7114329586 add ActiveZones to LifeReduced replacement effects 2021-09-26 20:04:02 -04:00
Northmoc
020d40bc5c fix Will -3 2021-09-26 20:03:27 -04:00
Northmoc
d1a0d703fe support "QuasiLibrarySearch" to pick multiple cards from libraries for ChangeZone effects 2021-09-26 17:21:53 -04:00
Northmoc
b76f2d4705 support "Searched" for cards that quasi-search many times, then change Defined 2021-09-26 17:21:52 -04:00
Northmoc
bca8f9457f dichotomancy.txt improve 2021-09-26 17:21:52 -04:00
Northmoc
8306361607 doubling_chant.txt improve 2021-09-26 17:21:51 -04:00
Northmoc
21536abda7 clarion_ultimatum.txt improve 2021-09-26 17:21:51 -04:00
Hans Mackowiak
fd9ffbb84b Merge branch '1964-red-mana-battery-should-be-2-steps' into 'master' 
Resolve "Red Mana Battery should be 2 steps"

Closes #1964

See merge request core-developers/forge!5436
 2021-09-26 20:23:52 +00:00
Hans Mackowiak
c5dc50fc38 Mana Battery: better coding for ManaRitualBattery 2021-09-26 22:23:25 +02:00
Bug Hunter
17c925267d Merge branch 'soulecho' into 'master' 
AI: Small fix for Soul Echo

See merge request core-developers/forge!5445
 2021-09-26 19:24:08 +00:00
tool4EvEr
6ba50a9381 AI: Small fix for Soul Echo 2021-09-26 21:23:14 +02:00
Michael Kamensky
dbc3fbdb69 Merge branch 'twosat-master-patch-17025' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5444
 2021-09-26 18:20:51 +00:00
Andreas Bendel
e937da8f82 Update de-DE.properties 
translated new lblChooseCreatureWith strings
 2021-09-26 18:14:44 +00:00
Michael Kamensky
3f1af977a0 Merge branch 'master' into 'master' 
Improve AI logic for Cleaver Skaab.

See merge request core-developers/forge!5443
 2021-09-26 18:02:41 +00:00
Michael Kamensky
66636a47b8 - Improve AI logic for Cleaver Skaab. 2021-09-26 21:01:58 +03:00
Michael Kamensky
00dba3b946 Merge branch 'mic_25' into 'master' 
MIC - 25 Sep

See merge request core-developers/forge!5438
 2021-09-26 17:55:08 +00:00
Michael Kamensky
8755cebaa3 Merge branch 'sacz' into 'master' 
MIC: Some "sacrifice Zombie" cards

See merge request core-developers/forge!5440
 2021-09-26 17:53:36 +00:00
Michael Kamensky
4ba9472a60 Merge branch 'discard' into 'master' 
DiscardAi: Improve targeting

See merge request core-developers/forge!5441
 2021-09-26 17:48:55 +00:00
Michael Kamensky
3967814f0b Merge branch 'master' into 'master' 
Fix Lotus Cobra.

See merge request core-developers/forge!5442
 2021-09-26 15:58:57 +00:00
Michael Kamensky
6c64483c2a - Fix Lotus Cobra. 2021-09-26 18:58:13 +03:00
tool4EvEr
889c5fbf86 Improve targeting 2021-09-26 17:53:41 +02:00
Northmoc
9864b0c880 empty_the_laboratory.txt 2021-09-26 11:38:12 -04:00
Northmoc
593ccf2264 ravenous_rotbelly.txt 2021-09-26 11:37:54 -04:00
Michael Kamensky
90f7d32b7c Merge branch 'master' into 'master' 
Add 2 XMage cubes, update some other cubes.

See merge request core-developers/forge!5439
 2021-09-26 14:46:08 +00:00
Michael Kamensky
6d64381539 - Add 2 XMage cubes, update some other cubes. 2021-09-26 17:44:05 +03:00
Michael Kamensky
eceb60d4a2 Merge branch 'aifix' into 'master' 
Fix Pinnacle of Rage

See merge request core-developers/forge!5437
 2021-09-26 13:45:19 +00:00
Michael Kamensky
6cd701bb04 Merge branch 'dif_pow' into 'master' 
MIC: Celestial Judgment, Sigarda's Vanguard, Sigardian Zealot – and support

See merge request core-developers/forge!5418
 2021-09-26 13:43:59 +00:00
Northmoc
82c06711e5 drown_in_dreams.txt 2021-09-26 08:57:37 -04:00
Northmoc
6894a2cca5 enable Charm mode StackDescriptions 2021-09-26 08:56:30 -04:00
Northmoc
3799505e35 cleaver_skaab.txt 2021-09-26 08:48:42 -04:00
tool4EvEr
1331e0ca40 Fix Pinnacle of Rage 2021-09-26 13:08:25 +02:00
Michael Kamensky
4909a1983c Merge branch 'klaxnek-master-patch-87216' into 'master' 
Update es-ES.properties (AnimatedCardTapUntap text)

See merge request core-developers/forge!5433
 2021-09-26 10:35:54 +00:00
Michael Kamensky
b023a14692 Merge branch 'master' into 'master' 
[Mobile] Update Avatar Life Loss/Gain Animation

See merge request core-developers/forge!5435
 2021-09-26 10:35:40 +00:00
Anthony Calosa
da61ae7fac [Mobile] Update Avatar Life Loss/Gain Animation 2021-09-26 17:13:53 +08:00
Hans Mackowiak
988f92e8b7 Merge branch 'changezone' into 'master' 
Fix Animate Dead

See merge request core-developers/forge!5434
 2021-09-26 08:52:54 +00:00
tool4EvEr
dbad0451dc Fix Animate Dead 2021-09-26 10:48:29 +02:00
klaxnek
c2e33519f7 Update es-ES.properties (AnimatedCardTapUntap text) 2021-09-26 08:05:39 +00:00
Michael Kamensky
2d4d8940c5 Merge branch 'attachRework' into 'master' 
Attach rework

Closes #1447

See merge request core-developers/forge!5059
 2021-09-26 03:37:05 +00:00
Hans Mackowiak
6f5a2ccd67 Attach rework 2021-09-26 03:37:04 +00:00
Michael Kamensky
b6b4fc70b5 Merge branch 'master' into 'master' 
[Mobile] Refactor Player Turn/Priority Indicator

See merge request core-developers/forge!5432
 2021-09-26 03:36:54 +00:00
Michael Kamensky
7331507214 Merge branch 'fix-ui-desktop-adds-lands-dialog' into 'master' 
Quick Fix and Improvements to AddBasicLandsDialog

See merge request core-developers/forge!5431
 2021-09-26 03:35:01 +00:00
Anthony Calosa
6ea4c6a084 [Mobile] Refactor Player Turn/Priority Indicator 2021-09-26 10:33:52 +08:00
leriomaggio
a576085e79 Merge remote-tracking branch 'upstream/master' into fix-ui-desktop-adds-lands-dialog 2021-09-26 00:36:29 +01:00
leriomaggio
76b19cc8a4 Quick FIX to AddBasicLandsDialog 
This FIX includes:
- improvements to general UI for better rendering;
- full added support to localisation
- CardEditions in ComboBox are now sorted (using getSortedEditions) in descending order, from recent first.
- inverted order of + and - button (IMHO more intuitive)
 2021-09-26 00:33:34 +01:00
leriomaggio
56358ecbde When current deck is Empty, CardEdition returned is not ZEN anymore but one depending on current Art Preference 2021-09-26 00:30:17 +01:00
leriomaggio
2e35935aca new Predicate to get CardEdition with Basic Lands based on Art Preference 
A new CardEdition.Predicates has been added to return the CardEdition with all basic lands according to current default Card Art Preference.
This predicate will be used in DeckProxy to getDefaultSet whenever None is specified.
Moreover, quick fix to javadoc and made "isCustomEditions" final.
 2021-09-26 00:29:28 +01:00
Michael Kamensky
baa415723b Merge branch 'master' into 'master' 
Mistype fix.

See merge request core-developers/forge!5430
 2021-09-25 17:36:36 +00:00
Michael Kamensky
a320ef24c2 - Mistype fix. 2021-09-25 20:36:03 +03:00
Northmoc
e62044ef04 shadow_kin.txt 2021-09-25 09:36:55 -04:00