Commit Graph

60317 Commits

Author SHA1 Message Date
tool4ever
df9f62d8cc Fix CostAdjustment being run for Unless Costs (#1593) 2022-09-27 19:52:49 +00:00
tool4ever
5de3e3167f Card cleanup (#1594) 2022-09-27 19:52:40 +00:00
Paul Hammerton
cb1f7c17a1 Merge pull request #1592 from JohnWilliams77/patch-42
Update Secret Lair Drop Series.txt
2022-09-27 13:25:09 +01:00
JohnWilliams77
9de484bb64 Update Secret Lair Drop Series.txt 2022-09-27 11:24:55 +01:00
Anthony Calosa
9cc6a0cef2 Merge pull request #1591 from kevlahnota/master
corrected custom card images
2022-09-27 12:09:26 +08:00
Anthony Calosa
a0bfc694da corrected custom card images 2022-09-27 12:08:26 +08:00
Anthony Calosa
8a72ee42eb Merge pull request #1590 from Card-Forge/kevlahnota-patch-6
update custom card images
2022-09-27 11:51:28 +08:00
Anthony Calosa
bd4e3ffa21 Delete deleteme.txt 2022-09-27 11:49:40 +08:00
Anthony Calosa
bafb9da4fc Add files via upload 2022-09-27 11:48:03 +08:00
Anthony Calosa
8c4332efa0 Merge pull request #1589 from TrueFuFLeaderG/adventure
Adventure Castle update
2022-09-27 11:46:01 +08:00
Anthony Calosa
51ba13fe97 Create deleteme.txt 2022-09-27 11:42:23 +08:00
Anthony Calosa
bd4f4051bf Delete forge-gui/res/adventure/Shandalar/custom_card_pics directory 2022-09-27 11:38:24 +08:00
Grimm
34ca9907ca added custom cards to adventure
do not show dialog if all options are invalid
changed castles to have 2 floors
added custom cards for each castle
added possibility for a respawn on maps
2022-09-27 02:04:56 +02:00
Paul Hammerton
85aa57290f Merge pull request #1587 from JohnWilliams77/patch-41
Update Secret Lair Drop Series.txt
2022-09-26 13:18:11 +01:00
JohnWilliams77
540dcccbb7 Update Secret Lair Drop Series.txt 2022-09-26 08:21:43 +01:00
Anthony Calosa
1390568847 Merge pull request #1583 from tool4ever/abilitytriggered
Fix AbilityTriggered failing when cause lacks targets
2022-09-26 08:29:58 +08:00
Anthony Calosa
0d49606041 Merge pull request #1586 from TrueFuFLeaderG/adventure
Adventure ui update and some fixes
2022-09-26 08:29:24 +08:00
Grimm
1734657e4d Merge remote-tracking branch 'origin/adventure' into adventure 2022-09-26 01:41:48 +02:00
Grimm
9d318b257d Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 2022-09-26 01:41:36 +02:00
Grimm
25000faf09 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 2022-09-26 01:23:38 +02:00
Grimm
b0b77f4c88 moved controller support to UIScene and abstract it
uses focus for keyboard and controller
added Keyboard support
Show key hint for buttons
added voice line for dialogs
fixed missing items rewards
fixed some maps
adjusted pile decks
2022-09-26 01:15:49 +02:00
Anthony Calosa
cfe290de89 Merge pull request #1585 from tool4ever/kytheon
Kytheon Fix
2022-09-26 06:46:28 +08:00
tool4EvEr
31c27fb993 Clean up 2022-09-25 23:37:45 +02:00
tool4EvEr
ff5916be38 Kytheon Fix 2022-09-25 23:14:38 +02:00
tool4EvEr
3bca04134c Fix AbilityTriggered failing when cause lacks targets 2022-09-25 21:44:52 +02:00
tool4ever
29fc28be3b Fix Unbound Flourishing triggering for additional X costs (#1581)
* Fix Unbound Flourishing triggering for additional X costs
2022-09-25 19:28:10 +00:00
Anthony Calosa
20827bb7f3 Merge pull request #1531 from Northmoc/40k_squad
40K – Squad keyword and cards
2022-09-25 13:24:46 +08:00
Anthony Calosa
b43d0ec890 Merge pull request #1580 from tool4ever/felidar
Fix resolving trigger check using wrong controller
2022-09-25 13:23:31 +08:00
tool4EvEr
9ff156e070 Fix NPE 2022-09-24 17:35:21 +02:00
tool4EvEr
9509dc5672 Fix resolving trigger check using wrong controller 2022-09-24 17:34:50 +02:00
Simisays
c377913927 40K 10 more + 1Fix (#1575)
* Create their_name_is_death.txt

* Create technomancer.txt

* Create redemptor_dreadnought.txt

* UPDATE

* UPDATE

* update

* Update redemptor_dreadnought.txt

* Update space_marine_scout.txt

* Update their_number_is_legion.txt

* Update redemptor_dreadnought.txt

* Update inquisitorial_rosette.txt

* Update primaris_eliminator.txt

* Update redemptor_dreadnought.txt

* Update redemptor_dreadnought.txt

* Update their_number_is_legion.txt

* Update royal_warden.txt

* Update psychomancer.txt

* Update inquisitorial_rosette.txt

* Update inquisitorial_rosette.txt

* Update psychomancer.txt

* Update space_marine_scout.txt

* Update space_marine_scout.txt

* Update technomancer.txt

* Update their_number_is_legion.txt

* Update space_marine_scout.txt

* Update technomancer.txt

* Update their_number_is_legion.txt

* Update their_number_is_legion.txt

* Update technomancer.txt

* Delete redemptor_dreadnought.txt

* Update rasputin_the_oneiromancer.txt

* Update rasputin_the_oneiromancer.txt

* Update their_number_is_legion.txt

* Update psychomancer.txt

* Update technomancer.txt

* Update technomancer.txt
2022-09-24 07:13:38 +03:00
tool4ever
84589e06c5 Redemptor Dreadnought + some fixes (#1578)
* Redemptor Dreadnought

* Cleanup

* Fix Moorland Rescuer

* Fix AttachedTo returning players for valid card params

* Fix cost

* Fixes

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2022-09-24 07:06:43 +03:00
Paul Hammerton
e9e5303710 Merge pull request #1574 from Northmoc/tweaks
Tweaks
2022-09-23 16:43:25 +01:00
Paul Hammerton
0a8ff73084 Merge pull request #1573 from Simisays/Warhammer-10
40K 11 + 3 tokens + 1 cleanup
2022-09-23 16:43:14 +01:00
Paul Hammerton
e00f1c0866 Merge pull request #1576 from churrufli/master
Net Deck Archive Updates
2022-09-22 20:18:49 +01:00
churrufli
9890be6464 Update net-decks-archive-pauper.txt 2022-09-22 21:03:17 +02:00
Churrufli
378b51dc37 Net Deck Archive Updates 2022-09-22 20:59:22 +02:00
Northmoc
5b271ca87c remove SVar X from Ravenous cards that don't need it 2022-09-22 13:50:36 -04:00
Northmoc
540d616886 CardFactoryUtil Ravenous tidy up 2022-09-22 13:50:11 -04:00
Simisays
d70f198988 Update drach_nyen.txt 2022-09-22 10:44:37 +02:00
Simisays
66e9754d95 Update drach_nyen.txt 2022-09-22 10:34:54 +02:00
Simisays
d0e8d21da3 Update inquisitor_eisenhorn.txt 2022-09-22 08:54:19 +02:00
Simisays
d2271c665a Update c_4_4_a_robot_noblock.txt 2022-09-21 22:48:15 +02:00
Simisays
814fb3c6ae Update company_commander.txt 2022-09-21 22:46:22 +02:00
Simisays
a4969d38a1 Update commissar_severina_raine.txt 2022-09-21 22:24:22 +02:00
Simisays
fc1fef87a9 Update inquisitor_eisenhorn.txt 2022-09-21 22:14:07 +02:00
Simisays
3f41bf07b5 Update inquisitor_eisenhorn.txt 2022-09-21 22:11:55 +02:00
Simisays
183c6a16de Update epistolary_librarian.txt 2022-09-21 22:09:58 +02:00
Simisays
aab97e08b2 Update epistolary_librarian.txt 2022-09-21 22:09:45 +02:00
Simisays
8316aa9c1b Update drach_nyen.txt 2022-09-21 22:09:29 +02:00