Commit Graph

63487 Commits

Author SHA1 Message Date
tool4EvEr
9c90b19c82 Fix Reverse Polarity 2023-03-01 00:05:03 +01:00
tool4EvEr
29522de5ae Fix Oblivion Ring 2023-03-01 00:05:03 +01:00
tool4EvEr
11ef4dd2f6 Clean up 2023-03-01 00:05:03 +01:00
Simisays
5e9b0f5048 Merge branch 'Card-Forge:master' into YONE3 2023-02-28 22:30:06 +01:00
Simisays
5737c40d8e update 2023-02-28 21:27:20 +01:00
Northmoc
2c4f5e9a7e magmatic_scorchwing.txt phyresis_roach.txt (#2589)
* magmatic_scorchwing.txt phyresis_roach.txt

* fix magmatic_scorchwing.txt

* phyresis_roach.txt organize better

* fix missing 'Valid'
2023-02-28 22:55:15 +03:00
Simisays
91be5e58bf Update ghalma_the_shaper.txt 2023-02-28 20:11:40 +01:00
Simisays
f067bdbc12 Update jaces_signature_hoodie.txt 2023-02-28 17:40:47 +01:00
Simisays
b2edbb6b3f Merge branch 'Card-Forge:master' into XIRA 2023-02-28 16:08:24 +01:00
Simisays
c89c6ce6a3 update 2023-02-28 16:06:46 +01:00
tool4ever
1b655458e7 Fix remembering players leading to crash for AI with Shifting Shadow (#2587)
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2023-02-28 13:02:54 +03:00
Anthony Calosa
0997762008 Merge pull request #2586 from kevlahnota/newmaster2
minor adjustments
2023-02-28 17:37:21 +08:00
Simisays
8c30d318ae Update ichor_aberration.txt 2023-02-28 10:36:31 +01:00
Anthony Calosa
0cc5677094 minor adjustments 2023-02-28 13:30:22 +08:00
Chris H
621a08252e Update zeriam_golden_wind.txt (#2585) 2023-02-28 07:48:26 +03:00
tool4ever
8482e5a4c8 Improve applying attack requirements in multiplayer (#2582)
* Fix bad player position

* Recover clean up

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2023-02-28 07:48:08 +03:00
Paul Hammerton
5dcd91843b Merge pull request #2584 from paulsnoops/update_yone
YONE artist fix
2023-02-28 02:08:25 +00:00
paulsnoops
86a77d3c20 YONE artist fix 2023-02-28 02:03:23 +00:00
TabletopGeneral
2ede795f9b Merge branch 'Card-Forge:master' into master 2023-02-27 18:22:48 -05:00
Simisays
c8efd0164e update 2023-02-27 21:11:00 +01:00
Simisays
510b963d5a Update norns_fetchling.txt 2023-02-27 18:59:35 +01:00
Simisays
60557a2d2d Update kembas_outfitter.txt 2023-02-27 18:57:37 +01:00
Simisays
38b2508493 Update ichor_aberration.txt 2023-02-27 18:56:36 +01:00
Simisays
27be3d2cc4 Update hexgold_sledge.txt 2023-02-27 18:55:37 +01:00
Simisays
f8f1afbf53 update 2023-02-27 18:53:44 +01:00
Anthony Calosa
a11da1c7fb Merge pull request #2579 from kevlahnota/newmaster2
update item description for starting cards
2023-02-27 19:59:58 +08:00
Anthony Calosa
d92302f0cd update item description for starting cards 2023-02-27 19:54:39 +08:00
Anthony Calosa
7003e1c090 Add files via upload
update card art
2023-02-27 19:08:58 +08:00
Anthony Calosa
0e46b9c390 Merge pull request #2578 from kevlahnota/newmaster2
Update custom card pics, NPE prevention on cardart
2023-02-27 18:06:14 +08:00
Anthony Calosa
d71b8d3109 Merge pull request #2577 from paulsnoops/gos_decks
Add some net decks by gös
2023-02-27 18:02:39 +08:00
paulsnoops
1489c386fc Add some net decks by gös 2023-02-27 09:56:59 +00:00
Anthony Calosa
86c546bd88 Update custom card pics, NPE prevention on cardart 2023-02-27 17:56:07 +08:00
tool4ever
6153eb61a2 Kura fix (#2576)
Co-authored-by: TRT <>
2023-02-27 11:57:51 +03:00
Anthony Calosa
b60075c64f Merge pull request #2575 from cicoa/work
Updated golden_argosy.txt
2023-02-27 14:12:20 +08:00
cicoa
1c29d2f162 Updated golden_argosy.txt 2023-02-27 12:43:19 +08:00
Anthony Calosa
b3606feb3f Merge pull request #155 from Agetian/ai-countersput-shouldpump
CountersPutAI: shouldPumpCard is too restrictive for instant speed PutCounter
2023-02-27 12:31:52 +08:00
Northmoc
1d11638331 New arena cards and one tweak (#2568)
* darksteel_hydra.txt glistening_extractor.txt

* gyox_brutal_carnivora.txt

* agent_of_raffine.txt tidy

* refactor
2023-02-27 06:07:59 +03:00
Simisays
b0b0b951c0 [[SQUASH MERGE]] Teferi,Nahiri and Garruk dungeon + update other four dungeons (#2526)
* update

* update

* Adventure updates

Adventure items can now spawn cards in command zone via startBattleWithCardInCommandZone - Updated Mana Shard based items to do so.

Added new map objects:  Mana Shard rewards, generic collision zone, intended for use in upcoming map updates.

Fixed mismatched wall tile in green castle.

* update

* Update teferis_staff.txt

* update

* update

* update

* update

* update

* nahiri update

map needs more work

* update

* update

* update

* update

* update

* update

* update

* update

* Update garruk_boss_effect_phasetwo.txt

* card update

* update

* update

* update

* update

* update

---------

Co-authored-by: jjayers99 <56438137+jjayers99@users.noreply.github.com>
2023-02-27 06:07:49 +03:00
Anthony Calosa
41afe9e074 Merge pull request #2574 from kevlahnota/newmaster2
update fix for bleeding
2023-02-27 09:37:48 +08:00
Anthony Calosa
fbfde2be91 update fix for bleeding 2023-02-27 09:02:59 +08:00
tool4EvEr
ebd0c64687 Clean up 2023-02-26 23:35:30 +01:00
tool4EvEr
1fa03b09b7 Some counter checks 2023-02-26 22:07:40 +01:00
tool4EvEr
fd2d425d23 Logic tweak 2023-02-26 18:29:45 +01:00
TabletopGeneral
317dc6e4b8 Merge branch 'Card-Forge:master' into master 2023-02-26 10:58:13 -05:00
Paul Hammerton
5852d65b70 Merge pull request #2573 from paulsnoops/small_fixes
Some small card QoL fixes
2023-02-26 13:15:06 +00:00
paulsnoops
f81c8b62b0 Some small card QoL fixes 2023-02-26 13:11:08 +00:00
Simisays
d3fb521390 YONE 5 cards (#2561)
* update

* Update arek_false_goldwarden.txt

* update

* update

* Update bladehold_cleaver.txt

* Update arek_false_goldwarden.txt
2023-02-26 13:46:36 +03:00
Paul Hammerton
b03564fe41 Merge pull request #2572 from paulsnoops/yone_formats
Formats update: Add YONE
2023-02-26 10:07:40 +00:00
Anthony Calosa
57bc988e0a Merge pull request #2570 from tool4ever/NPEfixes
Fix 4 NPE from Sentry
2023-02-26 18:05:01 +08:00
paulsnoops
d4bea5aa5c Formats update: Add YONE 2023-02-26 10:00:07 +00:00