external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +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
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
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
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
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
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
Hans Mackowiak
931d08d3ac AttachEffect: ChooseAnObject if list is empty and chosen is null, don't add to list 2020-02-26 11:05:23 +00:00
Michael Kamensky
ea582088a6 Merge branch 'newBranch' into 'master' 
Updated Sprite Buttons on Mobile Forge

See merge request core-developers/forge!2552
 2020-02-26 04:00:34 +00:00
Sol
468dd46205 Merge branch 'bronzetablet' into 'master' 
Bronze Tablet

Closes #37

See merge request core-developers/forge!2493
 2020-02-25 16:39:46 +00:00
Tim Mocny
b03f263fce Bronze Tablet 2020-02-25 16:39:45 +00:00
Hans Mackowiak
8004892058 Merge branch '1298-wrong-player-controls-etb-trigger-of-clone' into 'master' 
Resolve "Wrong player controls ETB trigger of Clone"

Closes #1302 and #1298

See merge request core-developers/forge!2553
 2020-02-25 15:03:21 +00:00
Hans Mackowiak
f03e386399 Resolve "Wrong player controls ETB trigger of Clone" 2020-02-25 15:03:20 +00:00
Anthony Calosa
40478a45ac Update Icons 2020-02-25 18:43:57 +08:00
Anthony Calosa
01a17b4b2c Upscaled Zone Icons and FlipCard Icons 2020-02-25 12:23:04 +08:00
Michael Kamensky
c916c4da31 Merge branch 'tempest_efreet' into 'master' 
Tempest Efreet

Closes #115

See merge request core-developers/forge!2550
 2020-02-24 09:01:45 +00:00
Tim Mocny
9e79d7810f Tempest Efreet 2020-02-24 09:01:44 +00:00
Michael Kamensky
0dbbcd4edc Merge branch 'newBranch' into 'master' 
Upscaled Start Button

See merge request core-developers/forge!2549
 2020-02-24 09:00:58 +00:00
Anthony Calosa
eb039b3bdd Update Start Button 2020-02-23 22:38:33 +08:00
Michael Kamensky
9be6a5a6a3 Merge branch 'newBranch' into 'master' 
Add Support for HD Buttons on Mobile Forge

See merge request core-developers/forge!2547
 2020-02-23 12:44:06 +00:00
Anthony Calosa
81c06f230a Add Support for Upscaling Buttons on Mobile Forge 2020-02-23 19:10:11 +08:00
Michael Kamensky
645a11f9c3 Merge branch 'master' into 'master' 
Initial logic implementation for Mercenaries

See merge request core-developers/forge!2546
 2020-02-23 05:19:38 +00:00
Agetian
68ca9ec622 - Initial logic implementation for Mercenaries 2020-02-23 08:14:48 +03:00
Michael Kamensky
b4883eb77e Merge branch 'mercenaries' into 'master' 
Mercenaries!

See merge request core-developers/forge!2545
 2020-02-23 04:39:16 +00:00
Tim Mocny
7e57ffb62d Mercenaries! 2020-02-23 04:39:14 +00:00
Michael Kamensky
820666b278 Merge branch 'fumble' into 'master' 
Fumble - Ready!

See merge request core-developers/forge!2535
 2020-02-23 04:31:23 +00:00