external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,683 Commits 34 Branches 187 Tags
121e079c20fbac6540ab151322a83b15e413d70c
Commit Graph

62683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
616c234574 Merge pull request #2192 from tool4ever/loyaltyact 
Fix NumLoyaltyAct counting limit and additional wrong together
 2023-01-02 09:03:19 +08:00
Anthony Calosa
776c7873af Update CardDetailUtil.java 
fix facedown typeline status
 2023-01-01 21:18:34 +08:00
tool4EvEr
e63ba22630 Fix NumLoyaltyAct counting limit and additional wrong together 2022-12-31 10:48:06 +01:00
Paul Hammerton
fa433ce94e Merge pull request #2191 from JohnWilliams77/patch-69 
Update Secret Lair Drop Series.txt
 2022-12-30 18:20:54 +00:00
Northmoc
f67f5636e0 ONE: Green Sun's Twilight and support (#2175) 2022-12-30 17:48:09 +00:00
tool4ever
a2d93861cf Script fixes (#2189) 
* Update captain_rex_nebula.txt

* Update pirated_copy.txt

* Update face_of_divinity.txt

* Fix Primal Amulet transforming if counter gets replaced
 2022-12-30 17:47:56 +00:00
JohnWilliams77
c3dcd36458 Update Secret Lair Drop Series.txt 2022-12-30 12:44:01 +00:00
JohnWilliams77
6bc950c508 Update Secret Lair Drop Series.txt 2022-12-30 09:15:46 +00:00
Anthony Calosa
7e7f36d1f0 Merge pull request #2186 from kevlahnota/newmaster2 
fix Adventure cards in exile lose "may be cast" when rewinding casting
 2022-12-29 10:18:51 +08:00
Anthony Calosa
4f365848e1 update 2022-12-29 10:11:48 +08:00
Anthony Calosa
dc17e44289 Merge pull request #2139 from asvitkine/cleanup_lobby_ui3 
Clean up lobby code and fix a deck deselect bug.
 2022-12-29 09:46:00 +08:00
Anthony Calosa
952950b8db Merge pull request #2184 from pakoito/patch-2 
Fix language bundle log string
 2022-12-29 09:44:57 +08:00
Anthony Calosa
fb4239196f Merge branch 'master' into newmaster2 2022-12-29 09:44:26 +08:00
Anthony Calosa
21f9223981 fix Adventure cards in exile lose "may be cast" when rewinding casting 
- closes #2176
 2022-12-29 09:34:05 +08:00
tool4ever
24e32e7af6 Clean up (#2185) 2022-12-28 21:45:53 +00:00
asvitkine
d6af6aa68f Fix deck re-randomization on new game. 2022-12-28 14:04:15 -07:00
Paco
64a980b156 Fix loading bundle string 2022-12-28 20:59:53 +00:00
asvitkine
88308ecd5c Support export/import states with arbitrary players. (#2168) 
* Support export/import states with arbitrary players.

Previously, the dump/setup game state dev options were only able to handle a 2-player human vs. AI game. This PR expands the functionality to support any number of players and ignores the type of player (naming them p0,p1,...,pN). The previous names of ai and human are supported for backwards compatibility.
 2022-12-28 14:56:16 +00:00
Anthony Calosa
e20d40a435 Merge pull request #2137 from JohnWilliams77/patch-66 
SLX Variants
 2022-12-28 22:38:25 +08:00
Anthony Calosa
def1c53bda Merge pull request #2161 from HassanSky81/master 
Correct the update of POIChanges for bought cards from shops
 2022-12-28 22:36:22 +08:00
asvitkine
b0d5d952e8 Add "ask simulated ai" dev option. (#2180) 
* Add "ask simulated ai" dev option.

Also moves the setup/dump game state options at the end of the list, as they're different from the other ones and shouldn't just be in the middle.

Also makes the code a bit more concise for the different mouse listeners.

* Fix comment location.
 2022-12-28 10:02:47 +00:00
tool4ever
b51c6a3f1b Clean up (#2182) 2022-12-28 07:15:17 +00:00
HassanSky81
7a3c19992a Update PointOfInterestChanges.java 2022-12-27 22:34:31 +02:00
Mike S
a886305410 ONE: Kaito, Dancing Shadow + Token script (#2163) 
* ONE: Kaito, Dancing Shadow + Token script

ONE: Added script for Kaito, Dancing Shadow, plus his token script.

- Kaito, Dancing Shadow
- 2/2 colorless Drone artifact creature token with deathtouch and "When this creature leaves the battlefield, each opponent loses 2 life and you gain 2 life."

* Update c_2_2_a_drone_deathtouch_leavedrain.txt

* Engine change to DamageDoneOnce

Engine change to accommodate proposed change to Kaito, Dancing Shadow's script

* Update TriggerDamageDoneOnce.java

* Update kaito_dancing_shadow.txt

* Update kaito_dancing_shadow.txt

* Update TriggerDamageDoneOnce.java

fix indention

* Update kaito_dancing_shadow.txt

Co-authored-by: Hans Mackowiak <hanmac@gmx.de>
 2022-12-27 08:50:38 -05:00
Anthony Calosa
a00dc8fc4c Update wicked_guardian.txt 
- closes #2172
 2022-12-27 10:55:59 +08:00
Anthony Calosa
dc348969bc Merge pull request #2171 from DorkmasterFlek/card-set-filter-crash 
Fix crash when filtering card sets in workshop
 2022-12-27 09:31:56 +08:00
DorkmasterFlek
0645b23405 Fix crash when filtering card sets in workshop 
Null pointer exception caused a crash when trying to filter by set in the debug workshop.  Null value was in the limitedSets parameter being passed in.
 2022-12-26 15:44:42 -05:00
Northmoc
ef44210a56 ONE – 21 Dec (leaked card scripts) (#2151) 
* bonepicker_skirge.txt

* sinew_dancer.txt

* quicksilver_fisher.txt

* sawblade_scamp.txt

* furnace_punisher.txt
 2022-12-26 19:14:15 +00:00
Northmoc
59d71045e0 tighten up Adversary cycle from MID (#2162) 2022-12-26 18:40:45 +00:00
Northmoc
abe5828195 YBRO: By Elspeth's Command and Yotian Courier + support (#2114) 
* by_elspeths_command.txt with support v1

* yotian_courier.txt
 2022-12-26 13:25:15 -05:00
Anthony Calosa
f61fec3d02 Update livio changezoneall 2022-12-27 00:54:36 +08:00
tool4ever
037f1d0b7b Some fixes (#2170) 2022-12-26 09:42:03 +00:00
Anthony Calosa
a5decc0b78 Merge pull request #2157 from asvitkine/sim_imprv 
Simulated AI: Fix land pruning logic and skip invalid targets.
 2022-12-26 11:43:34 +08:00
jjayers99
ed51e606da Forest town sprite fix 2022-12-25 18:11:28 -05:00
Paul Hammerton
247ec986a7 Merge pull request #2166 from paulsnoops/sld_update 
SLD Update
 2022-12-25 18:47:20 +00:00
paulsnoops
01780ce433 SLD Update 2022-12-25 18:42:58 +00:00
Paul Hammerton
a14be95989 Merge pull request #2160 from JohnWilliams77/patch-68 
Update Secret Lair Drop Series.txt
 2022-12-25 18:25:46 +00:00
JohnWilliams77
9097acdca5 Update Secret Lair Drop Series.txt 2022-12-25 15:21:04 +00:00
JohnWilliams77
c22eb54dff Update Secret Lair Drop Series.txt 2022-12-25 09:48:12 +00:00
asvitkine
00c6771608 Fix ArrayIndexOutOfBounds exception printed to stderr. (#2141) 2022-12-25 09:11:52 +00:00
JohnWilliams77
34085f22f0 Update Secret Lair Drop Series.txt 2022-12-25 09:11:06 +00:00
jjayers99
9da7f17578 Adventure Mode shop Expansion (Merge fix) 
Slight corrections to waste_town_*.tmx to remove debug shop values.
 2022-12-24 20:39:09 -05:00
jjayers99
cfdb5bea6c Adventure Mode Shop Expansion 
New setting in Settings menu for Expanded Shops. After enabling and restarting app, a much larger pool of card shops will appear in towns, and towns will have a bit more variety within a given biome, divided up into three broad categories per region.
 2022-12-24 18:47:55 -05:00
George
85fa4cd884 Merge remote-tracking branch 'origin/master' 2022-12-24 13:14:04 +02:00
George
cd2582408b Correct the update of POIChanges for bought cards from shops 2022-12-24 13:09:39 +02:00
JohnWilliams77
d77b575ecd Update Secret Lair Drop Series.txt 2022-12-24 09:03:47 +00:00
asvitkine
6e8a21a58a Simulated AI: Copy changed SVars when copying state. (#2159) 2022-12-24 08:51:54 +00:00
asvitkine
4c568f941f Clean up unused vars. 2022-12-23 20:33:01 -07:00
asvitkine
e788d3683a Improve comment. 2022-12-23 20:31:41 -07:00
asvitkine
eb0f426adc Use ComputerUtilAbility.isFullyTargetable() and add more tests. 2022-12-23 20:28:05 -07:00