external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,904 Commits 31 Branches 187 Tags
cb1b8024b4162b67a7e40bc376c0038d2213f37e
Commit Graph

43904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
cb1b8024b4 Merge branch '1303-control-change-and-cda-not-reset' into 'master' 
Resolve "Control Change and CDA not reset?"

Closes #1303

See merge request core-developers/forge!2573
 2020-03-01 17:15:39 +00:00
Hans Mackowiak
075a0e99af Merieke Ri Berit: use Effect for Destroy Trigger 2020-03-01 17:37:06 +01:00
Jamin Collins
5f4c86697a Merge branch 'sld37' into 'master' 
SLD - Thalia

See merge request core-developers/forge!2574
 2020-03-01 15:42:59 +00:00
Tim Mocny
1fee06c843 SLD - Thalia 2020-03-01 15:42:59 +00:00
Hans Mackowiak
23bc7a629b Fix controllerChangeZoneCorrection when ControlGain is undone 2020-03-01 11:47:51 +01:00
Hans Mackowiak
86ec94ca0d Merge branch '1300-crash-on-desktop-1-6-32-snapshot-r123-2020-01-27-1-pm' into 'master' 
Resolve "Crash on Desktop 1.6.32 Snapshot r123 (2020-01-27 ~1 PM)"

Closes #1300

See merge request core-developers/forge!2555
 2020-03-01 10:30:45 +00:00
Hans Mackowiak
93f0ade107 MustBlockEffect: use Choose Card for Crashing Boars 2020-03-01 10:30:45 +00:00
Michael Kamensky
40bb3d2750 Merge branch 'newBranch' into 'master' 
Update Sprite Icons (Default Theme)

See merge request core-developers/forge!2564
 2020-03-01 04:16:22 +00:00
Michael Kamensky
86a9cb13d9 Merge branch 'WAR_JP_PW' into 'master' 
WAR with Japanese Planeswalkers added (option 2)

Closes #1305

See merge request core-developers/forge!2566
 2020-03-01 04:15:18 +00:00
Tim Mocny
e1138ff7b5 WAR with Japanese Planeswalkers added (option 2) 2020-03-01 04:15:17 +00:00
Michael Kamensky
52fe82b834 Merge branch 'sliverfixes' into 'master' 
Forum fixes Leap Day

See merge request core-developers/forge!2571
 2020-03-01 04:14:47 +00:00
Tim Mocny
15e3c4f5e5 Forum fixes Leap Day 2020-03-01 04:14:47 +00:00
Michael Kamensky
4e5853e29a Merge branch 'triggerFixStack' into 'master' 
GameAction: fix Trigger for Stack

Closes #1309

See merge request core-developers/forge!2572
 2020-03-01 04:14:44 +00:00
Hans Mackowiak
34d0d143c5 GameAction: fix Trigger for Stack 2020-03-01 04:14:44 +00:00
Michael Kamensky
d37cb22698 Merge branch 'master' into 'master' 
Added puzzle PS_THB5 + AI logic improvement for Kenrith, the Returned King

See merge request core-developers/forge!2568
 2020-03-01 04:13:57 +00:00
Anthony Calosa
b5787407b6 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-01 11:10:55 +08:00
Anthony Calosa
4d1d79098d Better Icon Render 2020-03-01 10:47:48 +08:00
Sol
3fc0c1e20f Merge branch 'fixes' into 'master' 
Fixes

See merge request core-developers/forge!2570
 2020-03-01 02:44:30 +00:00
Jamin Collins
726b8bfbe5 correct sprite load progress bar to 100% max 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-01 02:44:30 +00:00
Anthony Calosa
0306ab97f1 Fix Crash on Desktop, Menu Arrangement, Added some Icons 2020-03-01 07:42:20 +08:00
Jamin Collins
083df572b8 Merge branch 'tinyban' into 'master' 
Tiny Leaders ban - Najeela

See merge request core-developers/forge!2569
 2020-02-29 21:50:28 +00:00
Tim Mocny
12c705476d Tiny Leaders ban - Najeela 2020-02-29 21:50:28 +00:00
Agetian
4880d70129 - Simple modification for AI PumpAll on Kenrith 2020-02-29 19:33:35 +03:00
Agetian
f49d5e2352 - Better AI targeting for Kenrith, the Returned King's {4}{B} ability. 2020-02-29 19:25:24 +03:00
Agetian
f8b9a31bf2 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2020-02-29 17:06:04 +03:00
Michael Kamensky
808a43b44d Merge branch 'editions28feb' into 'master' 
Editions support for Grand Prix Promos, Unsanctioned

See merge request core-developers/forge!2562
 2020-02-29 14:02:09 +00:00
Tim Mocny
f2c523c267 Editions support for Grand Prix Promos, Unsanctioned 2020-02-29 14:02:09 +00:00
Michael Kamensky
b847f7f8c9 Merge branch 'immolation' into 'master' 
Mask of Immolation typos fix

See merge request core-developers/forge!2560
 2020-02-29 14:01:26 +00:00
Tim Mocny
a9f13ee503 Mask of Immolation typos fix 2020-02-29 14:01:26 +00:00
Agetian
e0b7ea4960 - Added puzzle PS_THB5. 2020-02-29 16:49:53 +03:00
Sol
a41c0454fa Merge branch 'update-modern-banned' into 'master' 
updating the Modern banned list

See merge request core-developers/forge!2565
 2020-02-29 04:39:58 +00:00
Jamin W. Collins
226716c816 updating Pioneer ban list 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-02-28 19:18:59 -07:00
Jamin W. Collins
3c6f82294b updating the Modern banned list 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-02-28 19:05:27 -07:00
Anthony Calosa
600d672b4a Update Sprite Icons on Mobile Forge 
(Default theme)
 2020-02-29 05:05:51 +08:00
Anthony Calosa
48cb11566f Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-02-28 23:16:14 +08:00
Anthony Calosa
c3be51c117 Fix Missing Translation on Planar Conquest 2020-02-28 23:15:29 +08:00
Hans Mackowiak
841808d99a Merge branch 'combo_attack' into 'master' 
Band Together / Combo Attack

See merge request core-developers/forge!2551
 2020-02-28 15:12:42 +00:00
Tim Mocny
258f0a2072 Band Together / Combo Attack 2020-02-28 15:12:42 +00:00
Michael Kamensky
0b2e60b0c1 Merge branch 'maddening_imp' into 'master' 
Maddening Imp round 2

See merge request core-developers/forge!2559
 2020-02-28 05:11:31 +00:00
Tim Mocny
669bc9ceaa Maddening Imp round 2 2020-02-28 05:11:31 +00:00
Michael Kamensky
93d9d12879 Merge branch 'maddening_imp' into 'master' 
Today's fixes

See merge request core-developers/forge!2558
 2020-02-27 04:34:47 +00:00
Tim Mocny
9d0f3f325b Today's fixes 2020-02-27 04:34:47 +00:00
Michael Kamensky
d66b61f0a3 Merge branch 'quenchable_fire' into 'master' 
Quenchable Fire - Ready!

Closes #580

See merge request core-developers/forge!2533
 2020-02-26 20:01:06 +00:00
Tim Mocny
9d79b6c262 Quenchable Fire - Ready! 2020-02-26 20:01:06 +00:00
Michael Kamensky
7721b227cb Merge branch '24Feb2020' into 'master' 
Nahiri, the Lithomancer +2 ability (cosmetic only)

See merge request core-developers/forge!2554
 2020-02-26 19:58:08 +00:00
Tim Mocny
d1106f8df7 Nahiri, the Lithomancer +2 ability (cosmetic only) 2020-02-26 19:58:07 +00:00
Michael Kamensky
794fcdafe5 Merge branch 'sld51' into 'master' 
SLD - IWD 2020 cards

See merge request core-developers/forge!2557
 2020-02-26 19:57:31 +00:00
Tim Mocny
344126d5aa SLD - IWD 2020 cards 2020-02-26 19:57:31 +00:00
Anthony Calosa
2a72a87ef4 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-02-26 23:42:42 +08:00
Michael Kamensky
7b1af4035d Merge branch 'attachNPEfix' into 'master' 
AttachEffect: ChooseAnObject if list is empty and chosen is null, don't add to list

See merge request core-developers/forge!2556
 2020-02-26 11:05:24 +00:00