external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,884 Commits 31 Branches 187 Tags
4e5853e29a22e5d12d51a982fe592bd4d8ef9f8c
Commit Graph

43884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Mocny
049ed5f9c4 Secret Lair Drop Series and Promos 2020-02-13 18:15:02 +00:00
Michael Kamensky
b183862e8d Merge branch 'triggerDamageAll' into 'master' 
TriggerDamageAll: add new Trigger for Mindblade Render

See merge request core-developers/forge!2519
 2020-02-13 15:12:52 +00:00
Hans Mackowiak
57bc3f930a TriggerDamageAll: add new Trigger for Mindblade Render 2020-02-13 15:12:52 +00:00
Michael Kamensky
48a3b4d652 Merge branch '1272-battle-lands-etb-tap-untap-issue' into 'master' 
Resolve "Battle Lands ETB tap/untap issue"

Closes #1272

See merge request core-developers/forge!2521
 2020-02-13 15:12:03 +00:00
Hans Mackowiak
bee93cbab3 Player: update LastState when Land is played 2020-02-13 10:29:00 +00:00
Michael Kamensky
9d0a683db8 Merge branch 'release-updates' into 'master' 
Update some release files

See merge request core-developers/forge!2516
 2020-02-13 05:55:16 +00:00
Michael Kamensky
e163132a1e Merge branch 'bling' into 'master' 
Bling cards

See merge request core-developers/forge!2517
 2020-02-13 05:54:32 +00:00
Tim Mocny
d35cb8de32 Bling cards 2020-02-13 05:54:31 +00:00
Michael Kamensky
162a27f5a1 Merge branch '12Feb2020' into 'master' 
Today's tweaks

See merge request core-developers/forge!2514
 2020-02-13 05:53:48 +00:00
Tim Mocny
d1c2096024 Today's tweaks 2020-02-13 05:53:48 +00:00
Zimtente
50c8e129d0 changed hardcoded symbol WIDTH and HEIGHT to constants 2020-02-12 19:07:45 +01:00
Sol
01bd5e5d54 Update CONTRIBUTORS.txt 2020-02-12 18:05:09 +00:00
Sol
562a9e1f8d Update ANNOUNCEMENTS.txt 2020-02-12 18:04:34 +00:00
Sol
548811b370 Merge branch 'mana_symbols_vanish' into 'master' 
fixed mana symbols vanishing/not being in the right place in card descriptions

See merge request core-developers/forge!2515
 2020-02-12 17:59:25 +00:00
Zimtente
6ae29a311a fixed mana symbols vanishing/not being in the right place in card descriptions 2020-02-12 17:40:50 +01:00
Sol
9934e20f8b Merge branch 'promoarts' into 'master' 
Promo arts – correcting a few errors

See merge request core-developers/forge!2513
 2020-02-12 14:43:40 +00:00
Tim Mocny
e7a5ee57f1 Promo arts – correcting a few errors 2020-02-12 14:43:40 +00:00
Michael Kamensky
06f2f416e0 Merge branch 'brawl_update' into 'master' 
Brawl format update

Closes #1277

See merge request core-developers/forge!2511
 2020-02-12 04:24:38 +00:00
Tim Mocny
8bda30179e Brawl format update 2020-02-12 04:24:38 +00:00
Michael Kamensky
9806c2c63c Merge branch 'promoarts' into 'master' 
Promo arts update (THB, ELD)

See merge request core-developers/forge!2512
 2020-02-12 04:24:23 +00:00
Tim Mocny
9d5d6dd6d2 Promo arts update (THB, ELD) 2020-02-12 04:24:23 +00:00
Michael Kamensky
8fecf07c47 Merge branch '7Feb2020' into 'master' 
2/10/2020 tweaks

See merge request core-developers/forge!2508
 2020-02-11 03:12:46 +00:00
Tim Mocny
a539d9bf5a 2/10/2020 tweaks 2020-02-11 03:12:46 +00:00
friarsol
ddc531c5f2 Updates for Android 2020-02-10 21:30:19 -05:00
friarsol
ef0a1a843d Pop up other zones during targeting 2020-02-09 21:32:24 -05:00
Michael Kamensky
bf200de73b Merge branch 'triggerFixChangedCopy' into 'master' 
Trigger: fix copy need new Map for params

See merge request core-developers/forge!2507
 2020-02-09 19:34:03 +00:00
Hans Mackowiak
9a56fb8998 Trigger: fix copy need new Map for params 2020-02-09 19:34:03 +00:00
Michael Kamensky
4a3740dac7 Merge branch 'staticAbilitySuspendedFix' into 'master' 
StaticAbility: fix ability is removed by other ability

See merge request core-developers/forge!2505
 2020-02-08 17:33:05 +00:00
Hans Mackowiak
31145ef2eb StaticAbility: fix ability is removed by other ability 2020-02-08 17:33:04 +00:00
Michael Kamensky
23ab256f7d Merge branch 'gameActionCloneFix' into 'master' 
GameAction: fix Clone working again

See merge request core-developers/forge!2506
 2020-02-08 17:33:00 +00:00
Hans Mackowiak
0f435b58a1 GameAction: fix Clone working again 2020-02-08 18:17:21 +01:00
Michael Kamensky
5d1a0421fd Merge branch 'fixAddTypeChosen' into 'master' 
StaticAbilityContinuous: fix AddType ChosenType

See merge request core-developers/forge!2504
 2020-02-08 04:44:45 +00:00
Hans Mackowiak
55ed4c1bc0 StaticAbilityContinuous: fix AddType ChosenType 2020-02-08 04:44:45 +00:00
Michael Kamensky
22a6a72f12 Merge branch 'master' into 'master' 
Added puzzle PS_THB2 - Possibility Storm - Theros Beyond Death 02

See merge request core-developers/forge!2503
 2020-02-07 18:14:55 +00:00
Agetian
7c38ac7dfa - Fixed scripted targeting in GameState not remembering targets when necessary. 
- Added puzzle PS_THB2.
 2020-02-07 20:54:36 +03:00
Michael Kamensky
d29dc72831 Merge branch 'fixesGrafCage' into 'master' 
Fixes graf cage

Closes #1195

See merge request core-developers/forge!2377
 2020-02-07 17:29:54 +00:00
Hans Mackowiak
e062c83c02 Fixes graf cage 2020-02-07 17:29:54 +00:00
Hans Mackowiak
c25971bba9 Merge branch '6Feb2020' into 'master' 
tawnos_urzas_apprentice.txt UI tweaks ONLY

See merge request core-developers/forge!2500
 2020-02-07 04:58:58 +00:00
Tim Mocny
92a11d801c tawnos_urzas_apprentice.txt UI tweaks ONLY 2020-02-07 04:58:57 +00:00
Michael Kamensky
87e6b38fa5 Merge branch 'patch-8' into 'master' 
Update new translations es-ES.properties

See merge request core-developers/forge!2491
 2020-02-07 04:09:34 +00:00
Michael Kamensky
2dcc56934d Merge branch 'ashiok' into 'master' 
Improve cleanup on ashiok

See merge request core-developers/forge!2490
 2020-02-07 04:07:39 +00:00
Michael Kamensky
f5cb80cec5 Merge branch 'magicStackSpellAbilityFix' into 'master' 
Magic stack spell ability fix

See merge request core-developers/forge!2501
 2020-02-07 04:06:55 +00:00
Hans Mackowiak
1d71b1efea Magic stack spell ability fix 2020-02-07 04:06:54 +00:00
Michael Kamensky
62e206f8ed Merge branch 'effectUntilCounterRemoved' into 'master' 
Refactor: Effects with "For as long" it has CounterType

Closes #1271

See merge request core-developers/forge!2494
 2020-02-07 04:06:25 +00:00
Hans Mackowiak
0de140538c Refactor: Effects with "For as long" it has CounterType 2020-02-07 04:06:24 +00:00
Michael Kamensky
55167c5dca Merge branch 'master' into 'master' 
Fix AI for Domri's Ambush

Closes #1273

See merge request core-developers/forge!2499
 2020-02-06 18:17:56 +00:00
Michael Kamensky
9c78dbfde4 Merge branch 'pioneerdeckgenthb' into 'master' 
Updated pioneer and standard data for theros metagame

See merge request core-developers/forge!2498
 2020-02-06 17:47:15 +00:00
Agetian
0ca0458656 - Fix AI for Domri's Ambush. 
- Don't reset targets on DamageDealAi if it's parented to an ability with valid number of targets set.
 2020-02-06 20:33:56 +03:00
austinio7116
1b86738d10 Updated pioneer and standard data for theros metagame 
(cherry picked from commit 4b503cb)
 2020-02-06 11:27:52 +00:00
swordshine
ccfbaf5b3d Merge branch '5Feb2020' into 'master' 
2/5/2020 fixes

See merge request core-developers/forge!2497
 2020-02-06 09:37:18 +00:00