Commit Graph

66835 Commits

Author SHA1 Message Date
Anthony Calosa
198180eec5 fix share text/data to Forge app
- add additional launcher activity to prevent GLES Context loss (when sharing data via intent)
- fix passing data from another app to Forge via share text / share file / share deck
2023-06-25 13:54:32 +08:00
Simisays
cf4b087b88 update 2023-06-24 17:29:34 +02:00
Rob Schnautz
2e7ba8c8a3 add support for music in common folder. currently only Shandalar may override, not Amonkhet. Need to add support for current plane to override instead of hard-coding Shandalar. 2023-06-24 10:27:09 -05:00
schnautzr
9627deea06 Merge branch 'Card-Forge:master' into working 2023-06-24 08:17:41 -05:00
Anthony Calosa
b144b593b4 Merge pull request #3330 from kevlahnota/newmaster2
fix json
2023-06-24 18:19:22 +08:00
Anthony Calosa
8468f5a21e fix json 2023-06-24 18:17:41 +08:00
Anthony Calosa
f008e61123 Merge pull request #3329 from kevlahnota/newmaster2
update teleporter paths
2023-06-24 17:46:25 +08:00
Anthony Calosa
aa68b4e4a0 update debug map 2023-06-24 17:29:34 +08:00
Anthony Calosa
e09176ec10 update teleporter paths 2023-06-24 17:07:09 +08:00
Anthony Calosa
2593bdd4f8 Merge pull request #3328 from kevlahnota/newmaster2
update adventure shell script
2023-06-24 16:46:17 +08:00
Anthony Calosa
c227f4b369 update adventure shell script 2023-06-24 16:44:48 +08:00
Anthony Calosa
7a2c41c71d Merge pull request #3327 from kevlahnota/newmaster2
update default plane
2023-06-24 15:53:17 +08:00
Anthony Calosa
87c02b42d3 Merge branch 'master' into newmaster2 2023-06-24 15:39:23 +08:00
Anthony Calosa
e57566e7df update default plane 2023-06-24 15:33:46 +08:00
Anthony Calosa
ecabf2844a Merge pull request #3301 from Tillerino/enforce-explicit-plugin-versions
Enforce explicit plugin versions
2023-06-24 15:29:01 +08:00
Klisz
96259e5ba0 Update palantir_of_orthanc.txt (#3326) 2023-06-23 20:21:35 +00:00
Agetian
f777cfc0e1 - Fix a mistype in lblUpdateMainFromSideboard. (#3325) 2023-06-23 20:10:26 +03:00
schnautzr
58ce178122 fix Giant Fly hunting tip (#3324) 2023-06-23 20:06:43 +03:00
Anthony Calosa
eebd42a96b Update rosie_cotton_of_south_lane.txt 2023-06-23 18:38:24 +08:00
Rob Schnautz
4aea888649 Merge branch 'working' of https://github.com/schnautzr/forge into working 2023-06-23 00:27:35 -05:00
Rob Schnautz
6b5aeca9d4 fix Giant Fly hunting tip 2023-06-23 00:27:20 -05:00
Anthony Calosa
0b8377fc1a Merge pull request #3323 from kevlahnota/newmaster2
Adventure Updates
2023-06-23 12:34:57 +08:00
Anthony Calosa
05e488c263 from @jjayers99 2023-06-23 12:26:51 +08:00
Anthony Calosa
a113bfcdd3 Merge pull request #3314 from LAHardman/master
Added Bilbo, Birthday Celebrant
2023-06-23 11:59:18 +08:00
Anthony Calosa
dd6e94a29d Merge pull request #3317 from schnautzr/working
COMMON MAPS/DECKS and Drake, Hellion, Warrior
2023-06-23 11:58:58 +08:00
tool4ever
e6524f9e3f Support for The Balrog, Durin's Bane (#3321)
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2023-06-23 05:55:09 +03:00
tool4ever
8f2fc0c7bf Update optimus_prime_hero_optimus_prime_autobot_leader.txt 2023-06-22 19:41:28 +00:00
Rob Schnautz
ad4b3ae42b resolve paths in Amonkhet TMX files, separate world resources into intelligible library 2023-06-22 14:41:20 -05:00
tool4ever
a3af985349 Fix valid (#3320) 2023-06-22 19:02:08 +00:00
Rob Schnautz
3fb98d9853 Remove main.tiled-project from the repository. 2023-06-22 14:00:37 -05:00
Rob Schnautz
8877780b60 TileMapScene: use common maps (dungeons, cities, etc) 2023-06-22 13:55:15 -05:00
Rob Schnautz
545b8486db CardUtil use common decks 2023-06-22 11:28:10 -05:00
Rob Schnautz
4a1a19a4c9 Merge branch 'working' of https://github.com/schnautzr/forge into future 2023-06-22 09:45:11 -05:00
Rob Schnautz
cdc7f06008 Merge branch 'future' of https://github.com/schnautzr/forge into future 2023-06-22 09:42:57 -05:00
Rob Schnautz
69ff3eaff1 rename Sandwurm to "Hellion" (since it doesn't look like or move like a wurm), scale the monster larger, give it a hellion deck, add to desert and mountain, change the non-patrolling ones in the white nest dungeon to Greater Sandwurm 2023-06-22 09:42:25 -05:00
LAHardman
df26f6985a Added exile cost 2023-06-22 09:58:30 -04:00
Anthony Calosa
0605ebd96c Merge pull request #3316 from kevlahnota/newmaster2
move CustomCards and Pics to common
2023-06-22 19:21:04 +08:00
Anthony Calosa
918a38ece2 move CustomCards and Pics to common 2023-06-22 19:14:35 +08:00
Anthony Calosa
0f88548360 Merge pull request #3282 from schnautzr/working
Support common adventure resources, relocate resources to common directory, sorting, and groundwork for Amonkhet
2023-06-22 19:00:52 +08:00
LAHardman
e0fecfc174 Fixed ability description not showing 2023-06-22 00:29:10 -04:00
schnautzr
3b2a67991e Merge branch 'Card-Forge:master' into future 2023-06-21 23:18:56 -05:00
LAHardman
ae836ff553 Reformatted slightly 2023-06-21 23:56:57 -04:00
LAHardman
69c3147875 Fixed Variable Issue 2023-06-21 23:55:43 -04:00
LAHardman
3911e5f14b Merge branch 'master' of https://github.com/LAHardman/forge 2023-06-21 23:49:07 -04:00
LAHardman
195c1a1dfb Added Bilbo, Birthday Celebrant 2023-06-21 23:48:09 -04:00
Simisays
1a3917859a LOTR 10 cards (#3310)
* update

* update

* Update ugluk_of_the_white_hand.txt
2023-06-22 06:06:21 +03:00
Simisays
0e897d7d6e LOTR 11 cards (#3302)
* update

* Add files via upload

* update

* update

* Update rosie_cotton_of_south_lane.txt

* update

* Update press_the_enemy.txt

* Update press_the_enemy.txt

---------

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
2023-06-22 06:06:03 +03:00
Rob Schnautz
736c6f1f11 Merge branch 'future' of https://github.com/schnautzr/forge into future 2023-06-21 22:00:43 -05:00
Rob Schnautz
971724fb0f deck for warrior, add drake sprite 2023-06-21 22:00:31 -05:00
schnautzr
c821a3d1a7 Merge branch 'Card-Forge:master' into future 2023-06-21 21:58:16 -05:00