external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,079 Commits 33 Branches 187 Tags
baff2a548617ea807d5285da65589dbb87a5f09c
Commit Graph

53079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
962a99f38d Merge branch 'mic_26' into 'master' 
MIC - 27 Sep

See merge request core-developers/forge!5450
 2021-09-28 03:42:23 +00:00
Michael Kamensky
4d315c2c07 Merge branch 'announce' into 'master' 
allow for multi-word AnnounceTitle when the VarName won't do

See merge request core-developers/forge!5460
 2021-09-28 03:42:01 +00:00
Michael Kamensky
7ab272e11a Merge branch 'fixai' into 'master' 
Fix predictThreatenedObjects

See merge request core-developers/forge!5459
 2021-09-28 03:41:39 +00:00
Northmoc
3a52c711bf primitive_justice.txt - add AnnounceTitle 2021-09-27 18:13:00 -04:00
Northmoc
3cec314b9a allow for multi-word AnnounceTitle when the VarName won't do 2021-09-27 18:11:23 -04:00
tool4EvEr
666796c906 Clean up 2021-09-27 23:17:42 +02:00
Michael Kamensky
c39f71bf94 Merge branch 'nickname' into 'master' 
Nickname improvements

See merge request core-developers/forge!5457
 2021-09-27 20:31:56 +00:00
tool4EvEr
c00732f3bb Fix predictThreatenedObjects 2021-09-27 22:20:54 +02:00
Michael Kamensky
baf1b11785 Merge branch 'costfix' into 'master' 
better build for SubCounter<All

See merge request core-developers/forge!5456
 2021-09-27 17:25:57 +00:00
Anthony Calosa
993eb634da Merge branch 'master' into 'master' 
[Mobile] Update fix for exiled facedown

See merge request core-developers/forge!5458
 2021-09-27 17:23:33 +00:00
Anthony Calosa
99c7743e46 Merge remote-tracking branch 'remotes/core/master' 2021-09-28 01:23:07 +08:00
Anthony Calosa
80e9830395 [Mobile] Update fix for exiled facedown 
take into account the sleeves selected for other exiled facedown that are not foretold..
 2021-09-28 01:20:08 +08:00
Northmoc
d4e1d3020a better build for SubCounter<All 2021-09-27 13:09:41 -04:00
Michael Kamensky
b707a23710 Merge branch 'master' into 'master' 
MayView improvement for Foretell on desktop Forge.

See merge request core-developers/forge!5455
 2021-09-27 17:07:14 +00:00
Michael Kamensky
c0efa887f4 - MayView improvement for Foretell on desktop Forge. 2021-09-27 20:06:45 +03:00
Northmoc
93ca04b2aa improved cardscripts 2021-09-27 13:05:49 -04:00
Northmoc
40e9f13806 better regex 2021-09-27 13:02:52 -04:00
Anthony Calosa
1f9048091e Merge branch 'master' into 'master' 
[Mobile] Fix zoom foretell

See merge request core-developers/forge!5454
 2021-09-27 16:48:37 +00:00
Anthony Calosa
4c8cc195cf Merge remote-tracking branch 'remotes/core/master' 2021-09-28 00:47:02 +08:00
Anthony Calosa
d114af3a0b fix zoom for foretold 2021-09-28 00:45:11 +08:00
Michael Kamensky
0b649270e4 Merge branch 'fixes' into 'master' 
goldspan_dragon.txt fix Desc

See merge request core-developers/forge!5453
 2021-09-27 15:49:32 +00:00
Northmoc
f253f50787 goldspan_dragon.txt fix Desc 2021-09-27 11:47:51 -04:00
Northmoc
d179d7512e prowling_geistcatcher.txt improve 2021-09-27 11:38:45 -04:00
Michael Kamensky
a615a2cbed Merge branch 'fixes' into 'master' 
remove unneeded

See merge request core-developers/forge!5452
 2021-09-27 15:22:16 +00:00
Northmoc
8ca4ecab90 bunch of MIC cards from Marvel 2021-09-27 11:17:35 -04:00
Northmoc
fb09401ca3 remove unneeded 2021-09-27 10:47:50 -04:00
Anthony Calosa
a98e5510c6 Merge branch 'master' into 'master' 
[Mobile] update gdx libs 1.10.0

See merge request core-developers/forge!5449
 2021-09-27 05:45:55 +00:00
Anthony Calosa
3ff1a86aed [Mobile] update gdx libs 1.10.0 2021-09-27 13:44:13 +08:00
Anthony Calosa
73995fbde6 Merge branch 'master' into 'master' 
Outlinedtext for better visibility when animating life gained/loss

See merge request core-developers/forge!5448
 2021-09-27 04:05:36 +00:00
Anthony Calosa
939779e847 Outlinedtext for better visibility when animating life gained/loss 2021-09-27 12:04:25 +08:00
Michael Kamensky
53162d45da Merge branch 'foreach' into 'master' 
Fix Clarion Ultimatum and co.

Closes #1980

See merge request core-developers/forge!5446
 2021-09-27 03:50:57 +00:00
Michael Kamensky
186efc854a Merge branch 'fixes' into 'master' 
Fixes

See merge request core-developers/forge!5447
 2021-09-27 03:49:55 +00:00
Northmoc
964da6ac0a stonewise_fortifier.txt remove unneeded IsCombat 2021-09-26 20:15:45 -04:00
Northmoc
7d1c9c8ac3 kurbis_harvest_celebrant.txt prevention as replacement effect instead of keyword 2021-09-26 20:15:10 -04:00
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