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
65,761 Commits 32 Branches 187 Tags
6d70d76efd9c76f4b9fc3d1353db00ac0c48fb0c
Commit Graph

65761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4ever
aa0317efcb Merge branch 'master' into LOTR23 2023-06-29 21:41:58 +02:00
tool4ever
5ccf038a90 Fix logic (#3365) 2023-06-29 19:40:36 +00:00
Simisays
b0e0f360cb update 2023-06-29 21:07:21 +02:00
Simisays
e6edc4fab8 update 2023-06-29 20:31:51 +02:00
Anthony Calosa
ee311cec93 Merge pull request #3363 from kevlahnota/newmaster2 
Fix switching secondary audio
 2023-06-29 22:57:27 +08:00
Anthony Calosa
048426050b unused import 2023-06-29 22:54:01 +08:00
Anthony Calosa
65bba54900 .. 2023-06-29 22:48:35 +08:00
Anthony Calosa
f5d4c7c87a Merge pull request #3362 from kevlahnota/newmaster2 
Quest location on MapViewScene
 2023-06-29 20:04:42 +08:00
Anthony Calosa
3956fa6584 reset index 2023-06-29 20:01:16 +08:00
Anthony Calosa
49507b9b3b add quest button on MapViewScene 
-to scroll available quests
 2023-06-29 19:51:25 +08:00
Anthony Calosa
60c79a32c3 Quest location on MapViewScene 2023-06-29 16:34:57 +08:00
tool4ever
2215d26b13 Fix scripts (#3361) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-29 11:06:50 +03:00
Anthony Calosa
acc4f7361a Merge pull request #3360 from kevlahnota/newmaster2 
fix typo
 2023-06-29 13:04:54 +08:00
Anthony Calosa
c6f6e09d98 fix typo 2023-06-29 13:03:57 +08:00
Agetian
89f67ce26c AI logic for Minsc & Boo, Timeless Heroes. (#3356) 
* - AI logic for Minsc & Boo, Timeless Heroes.

* - Logic update as suggested.

* - Make sure the AI actually selects the right card for lethal damage.
 2023-06-29 06:53:35 +03:00
TabletopGeneral
d026e9324e MOM jumpstart typo, adventure event patch (#3357) 
* Adventure - draft fixes

* Update AdventureEventData.java

cleanup

* Adventure map updates

Adding collision barriers around several maps, expanding entry objects to prevent moving outside the map

minor Temple of Gideon progress

* Adventure draft set filtering

Preventing sealed-only sets from being selected only for drafts

* Adventure mob spawn rate adjustment

Making enemy spawn allocation more reasonable while still allowing for higher and lower rates.

* Adventure - Map updates

Removing unneeded collision layers from dungeons

* Adventure - Fix for missing event rewards

getHumanPlayer() is backed by a transient field and will lose track of game wins if saved / reloaded

* Removal of unneeded collision layers

* Adventure - Event bugfix

Preventing NPE if event was created with an enemy participant that is no longer found in enemies.json

* MOM Red Jumpstart insert typo fix

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
 2023-06-29 09:59:15 +08:00
Anthony Calosa
5aed0da21d Merge pull request #3351 from squee1968/LTC-5-Cards 
LTC 5 Cards
 2023-06-29 02:44:16 +08:00
Anthony Calosa
361d86267c Merge pull request #3341 from Simisays/LOTR21 
LTC 6 cards
 2023-06-29 02:43:46 +08:00
Anthony Calosa
17b147a831 Merge pull request #3336 from Simisays/LOTR20 
LTC 10 cards
 2023-06-29 02:43:30 +08:00
EldritchBimbo
f63a7fb75d Merge branch 'Card-Forge:master' into Gwyn_DungeonDev 2023-06-28 12:44:21 -04:00
Simisays
e7c7a99ba2 update 2023-06-28 17:34:16 +02:00
Simisays
e8269277ff update 2023-06-28 17:30:54 +02:00
Alwayssnarky
00234a3ace Improved custom card art, tweaked Valyx's boss ability 2023-06-28 10:57:46 -04:00
tool4ever
01e9282bca Update arwen_weaver_of_hope.txt 2023-06-28 13:47:41 +00:00
Simisays
bd92659773 Update crown_of_gondor.txt 2023-06-28 14:55:01 +02:00
Simisays
d6790a5e78 Update crown_of_gondor.txt 2023-06-28 14:02:08 +02:00
tool4ever
73f05b9fa1 Update pippin_warden_of_isengard.txt 2023-06-28 11:22:40 +00:00
Simisays
48578d517a LOTR 17 cards (#3319) 2023-06-28 11:21:10 +00:00
squee1968
0d0bc73dd6 Update gimli_of_the_glittering_caves.txt 2023-06-28 03:33:18 -05:00
squee1968
2f45eaefeb Update legolas_greenleaf.txt 2023-06-28 03:32:07 -05:00
squee1968
766fd63794 Rename treebeard,_gracious_host.txt to treebeard_gracious_host.txt 2023-06-28 03:22:54 -05:00
squee1968
5fc4a746cf Update merry_warden_of_isengard.txt 2023-06-28 02:55:13 -05:00
squee1968
62c07265ea Update treebeard,_gracious_host.txt 2023-06-28 02:49:45 -05:00
squee1968
a70a352aa3 Update merry_warden_of_isengard.txt 2023-06-28 02:48:34 -05:00
squee1968
125c6099f3 Update legolas_greenleaf.txt 2023-06-28 02:45:49 -05:00
squee1968
4b15db960f Update legolas_greenleaf.txt 2023-06-28 02:40:47 -05:00
squee1968
858ed761c6 Update gimli_of_the_glittering_caves.txt 2023-06-28 02:38:17 -05:00
Anthony Calosa
557dc7c356 Merge pull request #3352 from kevlahnota/newmaster2 
restrict menus when DuelScene or RewardScene is loading
 2023-06-28 12:02:31 +08:00
Anthony Calosa
dd1d5d09fe simplify 2023-06-28 12:01:00 +08:00
Anthony Calosa
cc4342b356 update 2023-06-28 11:58:01 +08:00
Anthony Calosa
d3a3c5ae69 restrict menus when DuelScene or RewardScene is loading 2023-06-28 11:37:24 +08:00
Anthony Calosa
56b8ae612a Delete Thumbs.db 2023-06-28 08:26:06 +08:00
Anthony Calosa
5a8c197129 Delete upcoming - Shortcut.lnk 2023-06-28 08:25:53 +08:00
Anthony Calosa
62b1590ffc Delete Thumbs.db 2023-06-28 08:25:23 +08:00
squee1968
2cb3485791 LTC 5 Cards 2023-06-27 18:52:44 -05:00
Simisays
3023b57b64 Adventure update (#3348) 
* update 1

* update

* update

* update
 2023-06-27 17:11:08 +03:00
tool4ever
0294564ef4 Fix wrong decider when copying trigger (#3347) 
Co-authored-by: TRT <>
 2023-06-27 17:03:52 +03:00
Simisays
b8aa7f5f55 update 2023-06-27 16:01:14 +02:00
Paul Hammerton
0bab2edbc9 Merge pull request #3346 from paulsnoops/update_sld 
Edition update: SLD (Summer Superdrop 2023)
 2023-06-27 08:42:01 +01:00
paulsnoops
f22a3bc7d8 Edition update: SLD (Summer Superdrop 2023) 2023-06-27 08:38:41 +01:00