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
43,770 Commits 34 Branches 187 Tags
d1c2096024d2bc3757604923e56f693ecb41fde0
Commit Graph

43770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Mocny
d1c2096024 Today's tweaks 2020-02-13 05:53:48 +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
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
Tim Mocny
16ecae29f0 2/5/2020 fixes 2020-02-06 09:37:18 +00:00
Michael Kamensky
7a9fb7a4d8 Merge branch '4Feb2020' into 'master' 
Today's tweaks

See merge request core-developers/forge!2495
 2020-02-05 03:45:14 +00:00
Tim Mocny
aef84aed51 Today's tweaks 2020-02-05 03:45:14 +00:00
klaxnek
a8b1ce3c32 Update es-ES.properties 2020-02-04 20:39:51 +00:00
klaxnek
7dde40beff Update new translations es-ES.properties 2020-02-03 20:15:15 +00:00
Adam Pantel
ccf39adde4 Improve cleanup on ashiok 2020-02-03 14:24:48 -05:00
Michael Kamensky
5b37a6fb53 Merge branch 'rebirth' into 'master' 
Rebirth

See merge request core-developers/forge!2487
 2020-02-03 16:00:50 +00:00
Tim Mocny
942225291f Rebirth 2020-02-03 16:00:50 +00:00
Michael Kamensky
4787784d15 Merge branch 'master' into 'master' 
translate some text and fix Localizer

Closes #1270

See merge request core-developers/forge!2450
 2020-02-03 15:05:28 +00:00
Sol
093f157f77 Merge branch 'master' into 'master' 
MillAI logic for Rebirth.

See merge request core-developers/forge!2489
 2020-02-03 14:55:17 +00:00
Agetian
78f3614c0a - Smaller life threshold for AILogic Rebirth. 2020-02-03 17:49:01 +03:00
Agetian
ae060a1b76 - MillAI logic for Rebirth. 2020-02-03 17:29:46 +03:00
Michael Kamensky
244b3d6d24 Merge branch 'staticKeywordChangeList' into 'master' 
refactor Keywords using Chosen Values

See merge request core-developers/forge!2462
 2020-02-03 11:35:28 +00:00
Hans Mackowiak
01bf10c719 refactor Keywords using Chosen Values 2020-02-03 11:35:28 +00:00