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
56,504 Commits 31 Branches 187 Tags
85a06a7216981b47d1af0c6841c9c455d2a89a6c
Commit Graph

56504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
d9f9a86ed4 Merge branch 'tgtcap' into 'master' 
AbilityFactory :: allow auto TgtPrompt to decap when ValidTgts is CoreType

See merge request core-developers/forge!6472
 2022-04-02 04:55:06 +00:00
Tim Mocny
2e047ee410 AbilityFactory :: allow auto TgtPrompt to decap when ValidTgts is CoreType 2022-04-02 04:55:06 +00:00
Michael Kamensky
b80b559a74 Merge branch 'snc_1' into 'master' 
SNC - 1 Apr

See merge request core-developers/forge!6471
 2022-04-02 04:54:53 +00:00
Tim Mocny
e2c73ab178 SNC - 1 Apr 2022-04-02 04:54:52 +00:00
Michael Kamensky
15157e9cbf Merge branch 'adventure' into 'master' 
New Adventure features

See merge request core-developers/forge!6474
 2022-04-02 04:52:24 +00:00
Grimm
882aa434c4 -added items/equipment 
-added 6 castle
-added dialogs
-fixed collision on maps
-fixed layer rendering
 2022-04-01 21:25:40 +02:00
Grimm
e55f859d19 -added items/equipment 
-added 6 castle
-added dialogs
-fixed collision on maps
-fixed layer rendering
 2022-04-01 21:14:51 +02:00
Grimm
55fd56e7d2 -added items/equipment 
-added 6 castle
-added dialogs
-fixed collision on maps
-fixed layer rendering
 2022-04-01 21:14:22 +02:00
Grimm
6349dcbad8 -added items/equipment 
-added 6 castle
-added dialogs
-fixed collision on maps
-fixed layer rendering
 2022-04-01 20:30:54 +02:00
Sol
fdffb80813 Merge branch 'unused-import' into 'master' 
Fix unused import

See merge request core-developers/forge!6473
 2022-04-01 18:24:30 +00:00
Sol
93f4701592 Fix unused import 2022-04-01 18:21:51 +00:00
Anthony Calosa
c411476ca1 revert check since unselectable doesn't work before selection is made 2022-04-01 15:27:38 +00:00
Anthony Calosa
1f89136475 check if not selectable 2022-04-01 15:22:24 +00:00
Anthony Calosa
9c5a487341 update 2022-04-01 15:18:22 +00:00
Anthony Calosa
36aff0cf6c limit check to hand 2022-04-01 15:00:41 +00:00
Anthony Calosa
467c51cadd update mayplay 2022-04-01 14:33:54 +00:00
Anthony Calosa
041fbfe523 Update check to viewable cards 2022-04-01 13:26:23 +00:00
Anthony Calosa
a4d0f9cdd7 [Mobile] Fix Mobile GUI Illegal cast 
closes #2127
 2022-04-01 12:46:56 +00:00
Anthony Calosa
0f8286ec8f Merge branch 'NewMaster' into 'master' 
[Mobile] update PlayEffect

See merge request core-developers/forge!6467
 2022-04-01 11:27:44 +00:00
Anthony Calosa
68102b8ac3 unused import 2022-04-01 19:10:06 +08:00
Michael Kamensky
4cab7e12d7 Merge branch 'johnwilliams7-master-patch-48044' into 'master' 
Update Pro Tour Promos.txt

See merge request core-developers/forge!6468
 2022-04-01 11:09:51 +00:00
Anthony Calosa
cf9fbcac9d remove duplicate 2022-04-01 19:06:15 +08:00
John Williams
fcd0a6e65e Update Pro Tour Promos.txt 2022-04-01 10:52:55 +00:00
Anthony Calosa
edc4fa78fb remove extras 2022-04-01 18:51:33 +08:00
Anthony Calosa
b7977c628c remove check, add note here since it occurs only on mobile GUI 2022-04-01 18:48:28 +08:00
Anthony Calosa
d0624068f5 update check for mobile 2022-04-01 17:12:37 +08:00
Hans Mackowiak
a9e4e38c9a Merge branch 'ghastNPE' into 'master' 
Fix Shambling Ghast NPE

See merge request core-developers/forge!6469
 2022-04-01 08:49:00 +00:00
Anthony Calosa
746a2ce568 remove unnecessary methods 2022-04-01 16:43:05 +08:00
TRT
69f3859c45 Fix Shambling Ghast NPE 2022-04-01 10:19:29 +02:00
Anthony Calosa
fbc5ea4193 update ProtocolMethod 2022-04-01 12:20:57 +08:00
Anthony Calosa
2516fa6f94 Merge remote-tracking branch 'core/master' 2022-04-01 11:16:25 +08:00
John Williams
ce85b4043a Update Secret Lair Drop Series.txt 2022-04-01 03:12:32 +00:00
John Williams
6881782198 Update Pro Tour Promos.txt 2022-04-01 03:11:02 +00:00
Michael Kamensky
f2a51a98b6 Merge branch 'hasManaAbility' into 'master' 
fix hasManaAbility

Closes #2130

See merge request core-developers/forge!6465
 2022-04-01 03:04:38 +00:00
Anthony Calosa
fa05ab7373 Merge remote-tracking branch 'core/master' 2022-04-01 10:50:24 +08:00
Anthony Calosa
4b20a6cdc7 Update check again 2022-04-01 10:41:02 +08:00
Anthony Calosa
218caf8b33 Update check 2022-04-01 07:08:36 +08:00
tool4EvEr
5d682e9616 Script fix 2022-03-31 22:15:36 +02:00
tool4EvEr
88c7e87095 Use getOverridingAbility 2022-03-31 19:53:32 +02:00
Michael Kamensky
c9b1a8d904 Merge branch 'demonstrate' into 'master' 
Demonstrate: fix copy order

Closes #1957

See merge request core-developers/forge!6463
 2022-03-31 15:02:29 +00:00
Michael Kamensky
273609600c Merge branch 'scriptfix' into 'master' 
Fix missing zone

Closes #2128

See merge request core-developers/forge!6466
 2022-03-31 15:02:06 +00:00
TRT
e3596b279e Clean up 2022-03-31 14:28:57 +02:00
Anthony Calosa
9e2d469263 NPE prevention 2022-03-31 20:18:57 +08:00
TRT
0d5d31625b Gisa fix 2022-03-31 14:12:00 +02:00
Anthony Calosa
c5143c7f34 remove unused variable 2022-03-31 20:07:19 +08:00
Anthony Calosa
438b2f83b2 [Mobile] Fix Mobile GUI getAbilityToPlay 
closes #2127
 2022-03-31 20:04:28 +08:00
TRT
bbacc197ff Fix missing zone 2022-03-31 13:29:47 +02:00
TRT
3d8a008378 fix hasManaAbility 2022-03-31 10:31:37 +02:00
TRT
ef00f41bcc Demonstrate: fix copy order 2022-03-31 09:40:17 +02:00
Michael Kamensky
7ed5ad40c1 Merge branch 'johnwilliams7-master-patch-77036' into 'master' 
Update Judge Gift Cards 2022.txt

See merge request core-developers/forge!6461
 2022-03-31 07:04:39 +00:00