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
61,434 Commits 34 Branches 187 Tags
e9d85ff0d1d0affea1e9ab8ecbd61f1ad509b10c
Commit Graph

61434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
b8ea883259 Merge pull request #1902 from Northmoc/spaceb 
UNF: space_beleren.txt and support
 2022-11-22 08:54:01 +08:00
Anthony Calosa
f3966ecfef Merge pull request #1906 from Northmoc/ticket 
UNF: Tickets initial implementation
 2022-11-22 08:50:31 +08:00
Simisays
21e7a3be02 Update distinguished_conjurer.txt 2022-11-21 22:02:41 +01:00
Simisays
dfb5ed2b24 update 2022-11-21 21:59:00 +01:00
JakeLoustone
bf905d8234 fix toughness typo keeper_of_the_cadence.txt (#1943) 
Changed "PT:2/2" to "PT:2/5" to match card scan.
 2022-11-21 20:37:53 +00:00
tool4ever
ac3d9ce8ee Misc cleanup (#1940) 
* Misc cleanup

* Fix check passing with no own creatures

* Improve StackDescription for Unsubstantiate
 2022-11-21 20:37:24 +00:00
Northmoc
35365c0893 Solve issue 1472 (#1528) 
* ManaEffect.resolve add runTriggers boolean

* AbilityManaPart.produceMana incorporate runTriggers boolean

* caged_sun.txt refactor

* AbilityManaPart.produceMana split to add TriggerManaAdded

* TriggerManaAdded.java

* TriggerTapsForMana.java refactor out unneeded

* TriggerType.ManaAdded

* Adjust checks for new Trigger

* Caged Sun fix

* Fix False Dawn only affecting mana abilities

* Rework tapsForMana call

* Clean up

* Support default rules value

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2022-11-21 20:37:01 +00:00
Simisays
76c485286f update 2022-11-21 20:51:21 +01:00
Anthony Calosa
d57794b31d Merge pull request #1941 from kevlahnota/newmaster2 
update Transitionscreen, RewardScene & Hud
 2022-11-22 02:25:32 +08:00
Anthony Calosa
14e1f42164 update Transitionscreen, RewardScene & Hud 2022-11-22 02:15:38 +08:00
Simisays
5f5703ef7b J22 Ashcoat of the Shadow Swarm (#1938) 
* Create ashcoat_of_the_shadow_swarm.txt

* Update ashcoat_of_the_shadow_swarm.txt

* Update ashcoat_of_the_shadow_swarm.txt

* Update ashcoat_of_the_shadow_swarm.txt
 2022-11-21 10:19:53 -05:00
Anthony Calosa
75cb7d43b0 Merge pull request #1937 from kevlahnota/newmaster2 
update SplashScreen NPE
 2022-11-21 15:47:06 +08:00
Anthony Calosa
e2fb34f0d1 update SplashScreen NPE 2022-11-21 15:46:35 +08:00
Anthony Calosa
17039ee4ef Merge pull request #1936 from kevlahnota/newmaster2 
update FSkin file check
 2022-11-21 15:43:20 +08:00
Anthony Calosa
79e5b29b81 update FSkin file check 2022-11-21 15:41:30 +08:00
Anthony Calosa
37c8623082 Merge pull request #1935 from kevlahnota/newmaster2 
update SplashScreen
 2022-11-21 14:56:34 +08:00
Anthony Calosa
3db079d8e3 update SplashScreen 
- Adventure Splashscreen will be used if default startup is Adventure Mode.
 2022-11-21 14:51:16 +08:00
Anthony Calosa
08b72fdc3c update adventure bg 2022-11-21 08:44:12 +08:00
Anthony Calosa
6baf0be760 Merge pull request #1934 from kevlahnota/newmaster2 
update fallback_skin
 2022-11-21 07:16:15 +08:00
Anthony Calosa
6b3cf252b7 Merge pull request #1913 from Northmoc/comet 
UNF: Comet, Stellar Pup and support
 2022-11-21 07:15:49 +08:00
Anthony Calosa
f0f3cb7d08 update fallback_skin 2022-11-21 07:02:20 +08:00
Anthony Calosa
3031e2f942 fix combat arrows on desktop 2022-11-21 06:40:07 +08:00
tool4ever
025070ce97 Update vodalian_hexcatcher.txt 2022-11-20 20:54:56 +00:00
tool4ever
6f4d80ccb9 Update subdue.txt 2022-11-20 13:32:41 +00:00
Anthony Calosa
214a60dead Merge pull request #1931 from Card-Forge/kevlahnota-patch-7 
Show combat arrow for attacked player on desktop
 2022-11-20 21:27:43 +08:00
Anthony Calosa
f81178c82e Merge pull request #1933 from kevlahnota/newmaster2 
update some Adventure UI and BG
 2022-11-20 21:27:21 +08:00
Anthony Calosa
636a0d4a25 Merge branch 'master' into newmaster2 2022-11-20 21:24:29 +08:00
Anthony Calosa
8d5627f02d remove unused import 2022-11-20 21:23:48 +08:00
Anthony Calosa
9527574be6 update some Adventure UI and BG 2022-11-20 21:18:58 +08:00
Paul Hammerton
15b9b0528c Merge pull request #1932 from JohnWilliams77/patch-61 
Update Secret Lair Drop Series.txt
 2022-11-20 08:53:30 +00:00
JohnWilliams77
9f9ee65292 Update Secret Lair Drop Series.txt 2022-11-20 08:37:12 +00:00
Anthony Calosa
1375cfe460 Show combat arrow for attacked player on desktop 2022-11-20 13:43:55 +08:00
Anthony Calosa
12262eebf7 Merge pull request #1930 from kevlahnota/newmaster2 
Adventure mode match BG
 2022-11-20 12:15:12 +08:00
Anthony Calosa
b0531916de additional shaders 2022-11-20 12:09:17 +08:00
Anthony Calosa
76004b726d render base image when needed 2022-11-20 11:45:08 +08:00
Anthony Calosa
ae8ef9dd12 Adventure mode match BG 
- add dynamic match background for adventure mode
 2022-11-20 11:33:09 +08:00
tool4ever
0278b91bd3 Fix Azra Oddsmaker (#1929) 2022-11-19 19:09:14 +00:00
Northmoc
53d517c910 VPlayerPanel fix 2022-11-19 10:48:54 -05:00
Northmoc
78b3a20292 CountersPutEffect.getStackDescription improve for player counters 2022-11-19 10:39:25 -05:00
Northmoc
d886aab45d better ticket icon 2022-11-19 10:39:24 -05:00
Northmoc
acf3e84201 TypeLists.txt add Clowns and Guests 2022-11-19 10:39:23 -05:00
Northmoc
70a7f86249 try to fix Mobile gui for tickets 2022-11-19 10:39:22 -05:00
Northmoc
09fa7c00d8 add {TK} 2022-11-19 10:39:22 -05:00
Northmoc
08f25caab6 ticket_turbotubes.txt 2022-11-19 10:39:21 -05:00
Northmoc
b7c480a0b3 blorbian_buddy.txt 2022-11-19 10:39:20 -05:00
Northmoc
06e9827464 localize sector prompts 2022-11-19 10:37:29 -05:00
Northmoc
2f7ba8faa1 PlayerControllerHuman prompt include card ID 2022-11-19 10:37:28 -05:00
Northmoc
014cb36dc5 GameAction notify of sector assignments 2022-11-19 10:37:27 -05:00
Northmoc
61fef27743 ChooseSectorEffect remove unneeded 2022-11-19 10:37:27 -05:00
Northmoc
0f1a180f40 alluring_scent.txt +StackDesc 2022-11-19 10:37:26 -05:00