external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,262 Commits 32 Branches 187 Tags
a2d8e98bc2cecf3c8f71f5b9683a2def0fa17bcc
Commit Graph

59262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
92bf495ee5 Merge pull request #1199 from kevlahnota/master 
refactor loading defaultImage
 2022-07-26 09:05:01 +08:00
Anthony Calosa
9b37b25a74 Update CardImageRenderer.java 2022-07-26 08:18:52 +08:00
Anthony Calosa
052a2bd16a refactor defaultImage 
- use assetmanager to handle defaultImage
 2022-07-26 08:11:13 +08:00
Northmoc
0157000144 popular_entertainer.txt fix Desc 2022-07-25 18:43:23 -04:00
Northmoc
c4fd300369 beacon_bolt.txt streamline 2022-07-25 18:42:47 -04:00
Northmoc
c161fab748 sailors_bane.txt streamline 2022-07-25 18:41:43 -04:00
Northmoc
4b16dccd4a tavern_brawler.txt 2022-07-25 16:53:09 -04:00
Northmoc
7330e27839 popular_entertainer.txt 2022-07-25 16:50:48 -04:00
Northmoc
55f742d32a passionate_archaeologist.txt 2022-07-25 16:49:31 -04:00
Northmoc
8b14f69da6 sapphire_dragon_psionic_pulse.txt 2022-07-25 16:48:14 -04:00
Northmoc
f88e3ab59a sailors_bane.txt 2022-07-25 16:47:47 -04:00
Anthony Calosa
e612076a4d Merge branch 'master' into newmaster 2022-07-26 02:29:17 +08:00
Anthony Calosa
ca1de6aacf prevent NPE 2022-07-26 02:25:23 +08:00
Anthony Calosa
9d2024b1ab Merge branch 'master' into newmaster 2022-07-26 01:19:39 +08:00
Anthony Calosa
bcb9ba16e8 Merge pull request #1195 from Card-Forge/kevlahnota-patch-2 
update rewardactor
 2022-07-26 01:17:55 +08:00
Anthony Calosa
637744e3cc update imagecache 2022-07-26 01:10:16 +08:00
Anthony Calosa
dd42977ac0 update reward actor 2022-07-26 01:08:25 +08:00
Anthony Calosa
027312e34c Merge branch 'master' into newmaster 2022-07-26 00:03:34 +08:00
Anthony Calosa
b2a0bf8a3a clear cardartCache on image fetched 2022-07-25 23:36:54 +08:00
Anthony Calosa
4601db0939 Merge branch 'master' into newmaster 2022-07-25 22:44:50 +08:00
Northmoc
c28a1f0f98 CLB - 22 Jul (more) (#1174) 
* druidic_ritual.txt

* en-US.properties better Mill prompt

* fraying_line.txt

* barrowin_of_clan_undurr.txt should not target

* emerald_dragon_dissonant_wave.txt

* flaming_fist.txt

* drillworks_mole.txt

* CounterEnumType.ROPE

* druidic_ritual.txt just one ChangeZone

* ChangeZoneEffect.changeZonePlayerInvariant support ChangeType$ EACH X & Y

* ChangeZoneEffect.changeHiddenOriginStackDescription improve Yard -> Hand
 2022-07-25 09:58:47 +03:00
Anthony Calosa
350af10aa7 Merge branch 'master' into newmaster 2022-07-25 07:51:43 +08:00
Anthony Calosa
bc8388ba3b Update MANUAL.txt 2022-07-25 07:49:11 +08:00
Anthony Calosa
dc810ae1cf Merge pull request #1184 from Northmoc/clb_23 
CLB - 23 Jul
 2022-07-25 07:02:56 +08:00
Anthony Calosa
9c67c1e797 Merge pull request #1187 from Northmoc/protect 
Protection from player display updates (CLB Noble Heritage)
 2022-07-25 07:02:22 +08:00
Anthony Calosa
0e79ddf8d8 fix check imagekey 2022-07-25 07:00:48 +08:00
Anthony Calosa
613deeddb7 Merge pull request #1192 from tool4ever/spectra 
Fix Spectra Ward preventing attaching more aura (indirectly)
 2022-07-25 06:56:56 +08:00
Anthony Calosa
d4c450b14f Merge branch 'master' into newmaster 2022-07-25 06:30:19 +08:00
tool4EvEr
df2341fc66 Fix Spectra Ward preventing attaching more aura (indirectly) 2022-07-24 21:01:12 +02:00
squee1968
f1c69d5275 Update baeloth_barrityl_entertainer.txt (#1191) 2022-07-24 17:31:28 +00:00
Paul Hammerton
1dee82a7f0 Merge pull request #1190 from paulsnoops/unf_edition_update 
UNF edition update
 2022-07-24 17:56:58 +01:00
paulsnoops
403131bdc9 UNF edition update 2022-07-24 17:52:40 +01:00
Anthony Calosa
dcf91806b5 Merge branch 'master' into newmaster 2022-07-24 18:18:20 +08:00
Anthony Calosa
744bf3ef4e Merge pull request #1188 from tool4ever/baeloth 
Fix Baeloth and some others
 2022-07-24 18:13:29 +08:00
tool4EvEr
c86c1d7c1b Fix Baeloth and some others 2022-07-24 11:49:37 +02:00
Anthony Calosa
5d719cad5d Merge branch 'master' into newmaster 2022-07-24 17:45:01 +08:00
Anthony Calosa
0eabb47003 Update kopala_warden_of_waves.txt 2022-07-24 17:41:33 +08:00
Anthony Calosa
da435cd8b9 Update kopala_warden_of_waves.txt 2022-07-24 17:41:19 +08:00
Anthony Calosa
33fd254229 Merge pull request #1186 from Northmoc/clb_23a 
CLB - 23 Jul (more)
 2022-07-24 16:36:22 +08:00
Anthony Calosa
a74fa5a39a Merge branch 'master' into newmaster 2022-07-24 14:27:33 +08:00
Northmoc
0c3375c36a eon_frolicker.txt update 2022-07-24 00:59:23 -04:00
Northmoc
36e1a8a5a3 noble_heritage.txt 2022-07-24 00:59:06 -04:00
Northmoc
4da6f5039d Player.updateKeywordCardAbilityText improve Protection keyword parsing 2022-07-24 00:58:23 -04:00
Northmoc
773bd38a5f PumpEffect.resolve clarify parse of DefinedKW for Protection from specific players 2022-07-24 00:54:14 -04:00
Northmoc
e8806920d4 PlayerFactoryUtil minor fix 2022-07-24 00:52:54 -04:00
Northmoc
521c8b6da4 pack_attack.txt 2022-07-24 00:43:27 -04:00
Anthony Calosa
c2abcf52e6 update HumanCostDecision (#1185) 
shows card intended for confirmaction
- closes #1177
 2022-07-24 07:36:20 +03:00
Northmoc
7fdea62fcb selvalas_charge.txt fix bad param 2022-07-24 00:20:19 -04:00
Anthony Calosa
0db7825c58 Merge branch 'master' into newmaster 2022-07-24 10:15:29 +08:00
Northmoc
d287aa2b66 nautiloid_ship.txt 2022-07-23 18:21:08 -04:00