external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,381 Commits 32 Branches 187 Tags
b2d154e0eb067aef8ff7f97d6c7617725531f48c
Commit Graph

64381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
b2d154e0eb Merge pull request #3195 from tool4ever/tweakresolve 
Follow-up tweak for when triggers are checked during resolve
 2023-06-04 09:29:17 +08:00
Hans Mackowiak
ae15121c4a Update fallaji_excavation.txt (#3196) 2023-06-03 21:25:43 +00:00
tool4EvEr
ab33b81047 Clean up 2023-06-03 22:22:44 +02:00
tool4EvEr
2ec35f7629 Follow-up tweak for when triggers are checked during resolve 2023-06-03 22:20:31 +02:00
Anthony Calosa
c37083a3d6 Merge pull request #3193 from jjayers99/master 
Adventure card inventory update fix
 2023-06-03 21:59:01 +08:00
jjayers99
c31537d66e Adventure card inventory update fix 2023-06-03 09:40:49 -04:00
tool4ever
65d385d531 Fix DeckHints only finding SimpleKeyword (#3191) 
* Fix DeckHints only finding SimpleKeyword

* Reveal clash correctly

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-03 13:58:23 +03:00
Agetian
da71b9480d - Added puzzle PS_MOM3. (#3190) 2023-06-03 08:25:56 +03:00
Anthony Calosa
968be94d55 Merge pull request #3188 from Simisays/GrolnokRework 
Grolnok dungeon rework + new enemies
 2023-06-03 02:55:55 +08:00
Anthony Calosa
6304a0d460 Merge pull request #3189 from kevlahnota/newmaster2 
update winlose
 2023-06-03 02:39:42 +08:00
Anthony Calosa
314b4e8fa7 update winlose 2023-06-03 02:29:35 +08:00
Simisays
424e6891bb Update grove_6.tmx 2023-06-02 19:32:59 +02:00
Simisays
3499760d8b Merge remote-tracking branch 'upstream/master' into GrolnokRework 2023-06-02 19:17:47 +02:00
Anthony Calosa
fbccb97e4e Merge pull request #3184 from Klisz/gandalfthewhite 
LTR: gandalf_the_white.txt
 2023-06-03 00:56:27 +08:00
Anthony Calosa
45107544fe Merge pull request #3180 from Simisays/LTR2 
LTR 10 Cards
 2023-06-03 00:56:06 +08:00
Anthony Calosa
deaf391c5c Merge pull request #3171 from jjayers99/master 
Adventure events initial implementation
 2023-06-03 00:55:36 +08:00
Simisays
945416dcfa update 2023-06-02 17:43:58 +02:00
tool4ever
3883dde561 Update params (#3186) 2023-06-02 11:00:58 +02:00
Klisz
a95c3976d9 Create gandalf_the_white.txt 2023-06-01 18:05:55 -06:00
jjayers99
538dec0b3a Removing extra import 2023-06-01 19:45:50 -04:00
Paul Hammerton
642d24a940 Merge pull request #3183 from paulsnoops/ltr_update 
Edition updates: LTR, LTC, PF23
 2023-06-01 21:53:21 +01:00
paulsnoops
2fce760b17 Edition updates: LTR, LTC, PF23 2023-06-01 21:45:36 +01:00
Anthony Calosa
84f0ba12c6 Merge pull request #3182 from tool4ever/clean6 
Some script updates
 2023-06-02 04:33:58 +08:00
jjayers99
2392be77fd Adventure - Portal activation logic, area effect triggers 2023-06-01 15:16:09 -04:00
tool4EvEr
c1d40f05c6 Some script updates 2023-06-01 20:05:10 +02:00
Simisays
d5246c966c LTR 9 cards (#3176) 2023-06-01 17:55:19 +00:00
Simisays
e817ec581e update 2023-06-01 17:21:00 +02:00
Simisays
7ae39cf273 Update cast_into_the_fire.txt 2023-06-01 16:05:25 +02:00
Simisays
0c22ac84f9 Update bill_the_pony.txt 2023-06-01 16:05:00 +02:00
Simisays
04b83dcd51 Update arwens_gift.txt 2023-06-01 16:04:27 +02:00
Simisays
cba910c4b5 update 2023-06-01 16:02:37 +02:00
Simisays
e54fb638a3 Grolnok (#13) 
* update

* update

* up date

* update

* update
 2023-06-01 11:57:27 +02:00
Simisays
ce170de214 Add files via upload 2023-06-01 11:55:29 +02:00
jjayers99
5ea8245f61 Adventure - cleanup references to renamed enemies 2023-05-31 21:52:17 -04:00
jjayers99
9fa681e784 Fixes for town mob defeat logic in Liliana's Dungeon 2023-05-31 21:36:13 -04:00
jjayers99
8e67b5474f Adventure tavern events, take 2 2023-05-31 16:36:34 -04:00
Anthony Calosa
e61de5819c Merge pull request #3178 from Simisays/freezefix 
Freeze fix mimic
 2023-06-01 03:35:16 +08:00
Simisays
2fa587f114 update 2023-05-31 21:28:20 +02:00
Anthony Calosa
df3dde7516 Merge pull request #3177 from kevlahnota/newmaster2 
fix PaperToken crash on Networkplay (Incubate, etc)
 2023-06-01 02:31:43 +08:00
Anthony Calosa
a52eae4432 fix PaperToken crash on Networkplay (Incubate, etc) 
- exclude cardedition and cardrules for serialization
 2023-06-01 02:26:19 +08:00
Paul Hammerton
f7589b705a Merge pull request #3175 from paulsnoops/ltr_update 
Edition updates: LTR, LTC
 2023-05-31 08:48:50 +01:00
paulsnoops
7371fe325f Edition updates: LTR, LTC 2023-05-31 08:44:20 +01:00
tool4ever
28c0e30559 Update meticulous_excavation.txt (#3172) 2023-05-31 06:01:30 +00:00
Anthony Calosa
98a6c895a3 Merge pull request #3170 from kevlahnota/newmaster2 
update mobile gamestate options
 2023-05-31 12:38:38 +08:00
jjayers99
d6f5bf20f4 Adventure tavern events initial implementation 2023-05-31 00:00:21 -04:00
Anthony Calosa
15a4e28305 remove duplicated code 2023-05-31 12:00:16 +08:00
Anthony Calosa
b45d543e1a include setcode and artid for gamestate 2023-05-31 11:55:59 +08:00
Anthony Calosa
15116add08 remove redundant import 2023-05-30 19:53:10 +08:00
Anthony Calosa
15372e6dd6 update mobile gamestate options 2023-05-30 19:51:39 +08:00
tool4ever
1cef438a22 Update nessian_wilds_ravager.txt 2023-05-30 08:04:44 +02:00