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

66835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
602398268b Merge pull request #3474 from Simisays/spriteupdate 
Update magetower overworld icon.
 2023-07-17 11:19:28 +08:00
Anthony Calosa
d2e5482f8c Merge pull request #3479 from kevlahnota/newmaster2 
update translation
 2023-07-17 10:37:11 +08:00
Anthony Calosa
1f9e618da8 Merge pull request #3480 from jjayers99/master 
Adventure Difficulty data storage fix
 2023-07-17 10:36:51 +08:00
TabletopGeneral
8726b2a1ee Merge branch 'Card-Forge:master' into master 2023-07-16 22:02:58 -04:00
jjayers99
0c6ee4992a Adventure - Difficulty data storage fix 2023-07-16 22:01:36 -04:00
jjayers99
dd1285aa3a Adventure - Difficulty data storage fix 2023-07-16 22:00:40 -04:00
Anthony Calosa
51dbd2209d update translation 2023-07-17 09:33:15 +08:00
Anthony Calosa
3d0d08f1a0 Update arwens_gift.txt 2023-07-17 07:32:31 +08:00
Anthony Calosa
b0694d3085 Merge pull request #3476 from kevlahnota/newmaster2 
update GameHUD, RewardActor, MapDialog
 2023-07-16 11:53:25 +08:00
Anthony Calosa
a3d4548654 update GameHUD, RewardActor, MapDialog 
- prevent double Music
- add flip icon indicator to RewardCard
- fadein upon completion of voice dialog
 2023-07-16 11:45:30 +08:00
Simisays
08434c0dc5 update 2023-07-15 20:28:47 +02:00
Anthony Calosa
13252b8bd4 Merge pull request #3470 from Card-Forge/targetUndo 
InputSelectTargets: able to remove Target
 2023-07-14 17:22:45 +08:00
Paul Hammerton
4c3940fddd Merge pull request #3472 from paulsnoops/edition_updates 
Edition updates: CMM, EA3, HA7
 2023-07-14 08:37:20 +01:00
paulsnoops
b565f74b74 Edition updates: CMM, EA3, HA7 2023-07-14 08:32:47 +01:00
Anthony Calosa
90e1d6bb51 Merge pull request #3471 from kevlahnota/newmaster2 
update potential NPE on CardView
 2023-07-14 13:42:07 +08:00
Anthony Calosa
22a7de3622 update potential NPE on CardView 2023-07-14 13:36:14 +08:00
Hans Mackowiak
bc096fcb3c InputSelectTargets: able to remove Target 2023-07-14 07:23:35 +02:00
Anthony Calosa
358dc0955d Merge pull request #3469 from kevlahnota/newmaster2 
fix CardView NPE
 2023-07-14 12:54:23 +08:00
Anthony Calosa
39395eaf06 revert fallback 2023-07-14 12:48:02 +08:00
Anthony Calosa
52aa55b886 update 2023-07-14 12:40:23 +08:00
Anthony Calosa
67969d15fb fix CardView NPE 2023-07-14 12:37:38 +08:00
TabletopGeneral
a710e43bc6 Merge branch 'Card-Forge:master' into master 2023-07-13 20:12:34 -04:00
Anthony Calosa
e4908fde5a Merge pull request #3390 from Simisays/LOTR28 
LTC 4 cards
 2023-07-14 06:50:13 +08:00
Anthony Calosa
be7f837f9a Merge pull request #3463 from Simisays/skepbranch 
Skep, Aerie and cave rework
 2023-07-13 18:32:25 +08:00
Simisays
7cad386934 cleanup 2023-07-13 09:45:50 +02:00
Anthony Calosa
e469bdc354 Update items.json 2023-07-13 15:02:41 +08:00
Anthony Calosa
3cb7f0879f Update blue.json 2023-07-13 14:57:10 +08:00
Anthony Calosa
3b0ce53e66 Update shire_scarecrow.txt 2023-07-13 10:36:23 +08:00
jjayers99
b187a43a36 Adventure - Add Shard Trader to Forest Capital 2023-07-12 16:33:21 -04:00
Anthony Calosa
638c8f2965 Merge pull request #3467 from tool4ever/dcfix 
Fix Doubling Cube producing C out of nothing if floating colors have gap
 2023-07-12 19:18:07 +08:00
tool4EvEr
40c93acbaa Fix Doubling Cube producing C out of nothing if floating colors have gap 2023-07-12 12:05:22 +02:00
Agetian
6caa0ded7f - Fix card name in the LTC edition definition. (#3466) 2023-07-12 10:25:37 +03:00
Simisays
86c1242492 update 2023-07-12 07:41:11 +02:00
tool4ever
7075a3e720 Banding fix (#3464) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-07-12 06:28:25 +03:00
Simisays
fa797a2729 Update gilraen_dunedain_protector.txt 2023-07-11 21:50:18 +02:00
Simisays
f13e7f62c9 Update gilraen_dunedain_protector.txt 2023-07-11 21:38:30 +02:00
Simisays
1ad5058851 more reward rebalance 2023-07-11 20:24:42 +02:00
Simisays
6cedb985c6 Merge remote-tracking branch 'upstream/master' into LOTR28 2023-07-11 20:03:58 +02:00
Simisays
185b2a7c78 Update gilraen_dunedain_protector.txt 2023-07-11 20:03:35 +02:00
Simisays
e5edf3b01c nerf cave spider loot 2023-07-11 17:37:45 +02:00
Simisays
63b632f113 update 2023-07-11 17:30:24 +02:00
Simisays
ffe2374a3a update 2023-07-11 15:47:10 +02:00
Anthony Calosa
e5a09f72c3 Merge pull request #3462 from kevlahnota/newmaster2 
update Card.java getPaperCard
 2023-07-11 20:52:05 +08:00
Simisays
565f2534f7 Update skep_outer.tmx 2023-07-11 14:46:35 +02:00
Simisays
9d856f4c5b Update grove_4.tmx 2023-07-11 14:44:59 +02:00
Anthony Calosa
2771668131 update AIDeckStatistics 2023-07-11 20:36:20 +08:00
Simisays
ed7fb62699 Merge remote-tracking branch 'upstream/master' into skepbranch 2023-07-11 14:18:31 +02:00
Simisays
8778127876 update 2023-07-11 14:18:00 +02:00
Anthony Calosa
939b630dce Merge pull request #3461 from jjayers99/master 
Adventure - map fixes
 2023-07-11 19:42:57 +08:00
Anthony Calosa
da9e1edace update Card.java getPaperCard 2023-07-11 19:40:16 +08:00