external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,109 Commits 31 Branches 187 Tags
08b9b5d66c44ebd2cc80cb00bee8366aab35d47c
Commit Graph

66109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
a59c91d596 Update barrow_blade.txt 2023-08-28 12:10:09 +02:00
TabletopGeneral
028a1cc377 Merge branch 'Card-Forge:master' into master 2023-08-27 18:33:22 -07:00
kevlahnota
0d1f27dce5 Merge pull request #3709 from kevlahnota/newmaster2 
update zh-CN
 2023-08-28 08:04:30 +08:00
Anthony Calosa
45b9a02669 update zh-CN 2023-08-28 08:03:36 +08:00
kevlahnota
49e260a54a Merge pull request #3708 from kevlahnota/newmaster2 
prevent UI lockup
 2023-08-28 08:02:00 +08:00
Anthony Calosa
00df91c73f prevent UI lockup 
- closes #3697
 2023-08-28 07:54:34 +08:00
kevlahnota
d5a6c69fca Merge pull request #3706 from Simisays/wurmpond 
Update points_of_interest.json
 2023-08-28 06:50:23 +08:00
Simisays
1cac268062 Update points_of_interest.json 2023-08-27 18:25:40 +02:00
Simisays
ef77b798ea WOE 8 cards (#3701) 
* update

* Update sentinel_of_lost_lore.txt

* Update aquatic_alchemist_bubble_up.txt

* Update candy_grapple.txt
 2023-08-27 15:06:20 +03:00
Simisays
405d29b19f WOE 10 cards (#3705) 
* update

* Update candy_trail.txt

* Update discerning_financier.txt
 2023-08-27 15:06:10 +03:00
tool4ever
9544d2073e Flash fix (#3704) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2023-08-27 15:05:50 +03:00
Simisays
bcb88736b9 update (#3698) 2023-08-27 10:25:43 +00:00
jjayers99
4c1c783f51 Adventure: Minor map correction 
Removing hidden wall in fort_colorless_2_wizards that prevented access to shards in blue mage's area
 2023-08-27 01:52:27 -04:00
Simisays
530e6c9b15 WOE 12 cards (#3676) 2023-08-26 20:29:31 +00:00
tool4ever
9e02710445 Update seasoned_hallowblade.txt 2023-08-26 20:27:42 +00:00
Paul Hammerton
1b7c89ba07 Merge pull request #3694 from Simisays/decksfix 
NCC commander precon decks fix
 2023-08-26 12:55:19 +01:00
Simisays
a15db5de99 update 2023-08-26 11:43:13 +02:00
tool4ever
9ca8c62c5b Commander Masters Update Bulletin (#3693) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2023-08-26 07:22:29 +03:00
kevlahnota
dfae707071 check for indestructible 2023-08-25 23:17:33 -04:00
kevlahnota
80ce033256 Update GameAction.java 
- closes #3687
 2023-08-25 23:17:33 -04:00
kevlahnota
61f0be7a30 Merge pull request #3691 from jjayers99/master 
Adventure - Blue Mage Tower updates
 2023-08-26 08:08:46 +08:00
jjayers99
3f51f569ec Adventure - file name correction for wolf.png 2023-08-25 20:01:24 -04:00
TabletopGeneral
f6a032f263 Update magetower_8.tmx 
Text update
 2023-08-25 19:53:06 -04:00
jjayers99
9a7b0d5c7b Adventure - Blue Mage Tower updates 
Removed extra collisions including those causing player to get stuck on 2nd level, cleaned up walls, added additional dialog to gate interaction.
 2023-08-25 19:53:06 -04:00
kevlahnota
fa14f2e960 Update graven_archfiend.txt 
-closes #3692
 2023-08-26 07:46:40 +08:00
Paul Hammerton
dfc9453a0e Merge pull request #3690 from paulsnoops/formats_update 
Add WOE, WOC & WOT to formats
 2023-08-25 09:28:20 +01:00
paulsnoops
5fed2383b8 Add WOE, WOC & WOT to formats 2023-08-25 09:21:04 +01:00
Paul Hammerton
614b6365f9 Merge pull request #3689 from paulsnoops/edition_updates 
Edition updates: WOC, WOE, WOT
 2023-08-25 08:47:27 +01:00
paulsnoops
96684ffbb5 Edition updates: WOC, WOE, WOT 2023-08-25 08:41:26 +01:00
kevlahnota
875cea7cb0 Merge pull request #3686 from kevlahnota/newmaster2 
fix GUI for attached panels with each other
 2023-08-24 22:17:24 +08:00
Anthony Calosa
64303f455e fix GUI for attached panels with each other 
- closes #3661
 2023-08-24 22:09:07 +08:00
TabletopGeneral
1ccb76745f Minor Adventure bug fixes (#3683) 
Prevent NPE with invalid event history
Correct transition from aggro to previous movement behavior with dungeon mobs
 2023-08-24 07:15:25 +08:00
kevlahnota
de91e5cb33 Merge pull request #3684 from Simisays/CATFIX 
catlair 3 spawn freeze fix
 2023-08-24 07:06:45 +08:00
Simisays
bc7abbc019 Update catlair_3.tmx 2023-08-23 21:20:12 +02:00
kevlahnota
04e2e6d59e fix broken skep_outer.tmx 2023-08-23 21:09:52 +08:00
kevlahnota
9c97e16c9c Merge pull request #3682 from kevlahnota/newmaster2 
dispose box2dWorld
 2023-08-23 19:42:54 +08:00
Anthony Calosa
308f0ca075 dispose box2dWorld 2023-08-23 19:38:07 +08:00
kevlahnota
812f0c3157 update broken teferi map 2023-08-23 19:32:05 +08:00
kevlahnota
d42bce5e75 Merge pull request #3681 from Simisays/teferifix 
Adventure Teferi Fix
 2023-08-23 19:16:38 +08:00
Simisays
03ebe3b385 Update points_of_interest.json 2023-08-23 13:09:53 +02:00
Paul Hammerton
1c3692be1e Merge pull request #3680 from paulsnoops/edition_updates 
Edition updates: WOC, WOE, WOT
 2023-08-23 11:14:42 +01:00
paulsnoops
ce44d81253 Edition updates: WOC, WOE, WOT 2023-08-23 11:07:22 +01:00
tool4ever
2025487c34 Fix getTotalPreventionShieldAmount (#3654) 
* Fix scripts

* Fix damage prevention display

* Optimize attachment tracking for netplay

* Phasing fix

* Fix NPE

* Tweak logic order

* Clean up

* Fix scripts

* Clean up

* Fix FailedToTarget

---------

Co-authored-by: TRT <>
 2023-08-23 11:34:50 +03:00
kevlahnota
de72773634 Merge pull request #3670 from Simisays/woe5 
WOE 5 cards
 2023-08-23 16:12:07 +08:00
Simisays
5a2a21e3df WOE 10 cards (#3663) 
* update

* update

* update

* update

* Update the_goose_mother.txt

* Update thunderous_debut.txt

* Update thunderous_debut.txt
 2023-08-23 10:09:39 +03:00
TabletopGeneral
168f999a57 Adventure - Pathfinding update (#3675) 
* Adventure - reward scene controller button availability

* Adventure A* & main quest prep

* Update pom.xml

* box2d natives

---------

Co-authored-by: kevlahnota <anthonycalosa@gmail.com>
 2023-08-23 09:56:20 +03:00
Simisays
d246859b52 Update edgewall_inn.txt 2023-08-22 22:01:05 +02:00
Paul Hammerton
74711f6bc5 Merge pull request #3672 from paulsnoops/edition_updates 
Edition updates: SLX, WOE, WOT
 2023-08-22 08:07:51 +01:00
paulsnoops
eeebd71129 Edition updates: SLX, WOE, WOT 2023-08-22 07:59:42 +01:00
Simisays
13a29375b5 Update agathas_soul_cauldron.txt 2023-08-22 08:53:15 +02:00