external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,403 Commits 33 Branches 187 Tags
66bcff8eeab034c31bf232b533cc39c4777bc3cc
Commit Graph

57403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
dc1ed3f840 Update zh-CN.properties 2022-04-15 13:35:03 +08:00
Anthony Calosa
8ce490ec82 Update ja-JP.properties 2022-04-15 13:33:55 +08:00
Grimm
113997443d adjusted style to work with android 
fixed android touch
fixed save load issues between portrait mode
 2022-04-15 06:03:50 +02:00
Northmoc
805711cd02 maestros_initiate.txt 2022-04-14 23:28:17 -04:00
Northmoc
cda4eabf1f maestros_diabolist.txt 2022-04-14 23:08:45 -04:00
Northmoc
38d00ef845 mages_attendant.txt and token (thanks Suthro) 2022-04-14 22:46:26 -04:00
Northmoc
2b8fafe488 Hideaway cards - don't try to play the card if it isn't there 2022-04-14 22:39:58 -04:00
Northmoc
fed7c2d29c PhaseHandler reset numDrawnThisDrawStep at beginning of draw step 2022-04-14 22:27:05 -04:00
Northmoc
9bd25b2053 xyris_the_writhing_storm.txt refactor 2022-04-14 22:26:26 -04:00
Northmoc
002c587dc8 wiretapping.txt - don't try to play it if it isn't there 2022-04-14 22:26:08 -04:00
Northmoc
e5bbfa1d36 TriggerDrawn consolidate NotFirstCardInDrawStep into FirstCardInDrawStep 2022-04-14 22:25:28 -04:00
Northmoc
813fef50d5 Player.java add resetNumDrawnThisDrawStep 2022-04-14 22:24:02 -04:00
Magpie
8573608ec8 Big map update 7.1 
Better check.
 2022-04-15 02:55:51 +02:00
Northmoc
79e61123ba cemetery_tampering.txt 2022-04-14 20:24:19 -04:00
Magpie
67e03ded58 Big map update 7 
Dungeon-wide effects, step 1.
 2022-04-15 02:14:44 +02:00
Northmoc
46234d9237 fight_rigging.txt 2022-04-14 20:02:00 -04:00
Grimm
d335e47832 commit merge changes 2022-04-14 23:25:52 +02:00
Northmoc
5ef7840ec0 rabble_rousing.txt 2022-04-14 17:19:31 -04:00
Northmoc
7505b174d8 TriggerDrawn support "FirstCardInDrawStep" 2022-04-14 17:02:51 -04:00
Northmoc
f520477248 wiretapping.txt 2022-04-14 17:02:26 -04:00
Northmoc
3dd234d039 Card.java : move Hideaway to list with other Amount keywords 2022-04-14 15:17:47 -04:00
Northmoc
b22694751c CardFactoryUtil simplify Hideaway TriggerDesc 2022-04-14 15:16:54 -04:00
Northmoc
7b30001da6 KeywordInstance use "a/an" instead of "one" 2022-04-14 15:16:26 -04:00
Northmoc
0ff819962b Keyword: Hideaway rem. text use number word parsing 2022-04-14 15:15:57 -04:00
Grimm
65914f18db commit merge changes 2022-04-14 21:14:58 +02:00
Grimm
673f8e5351 commit merge changes 2022-04-14 21:06:35 +02:00
Grimm
bb4a3342a1 -moved ui positions from code to json 
-added separate ui for portrait mode
-removed add to deck/sideboad in shop in inventory view
-moved skin to ttf font
 2022-04-14 21:03:24 +02:00
Grimm
0a7d5c334a -moved ui positions from code to json 
-added separate ui for portrait mode
-removed add to deck/sideboad in shop in inventory view
-moved skin to ttf font
 2022-04-14 21:00:27 +02:00
Northmoc
7e4bfe3080 urabrask_heretic_praetor.txt (thanks SladeWilson) 2022-04-14 12:59:50 -04:00
Magpie
f3300f44f4 Merge remote-tracking branch 'upstream/master' 2022-04-14 09:56:04 +02:00
Magpie
54a14a757a Big map update 6.1 
Case sensitivity.
 2022-04-14 09:55:16 +02:00
Magpie
9ec78812a6 Big map update 6 
Changed item properties to a new Effect class. This can allow effects to be defined for a whole dungeon and/or a single individual.
Which will be the next update.
 2022-04-14 09:55:02 +02:00
Magpie
079d3f1f71 Big map update 5.3 
Give the gate template a default message.
 2022-04-14 09:53:13 +02:00
tool4ever
96e70df477 Merge pull request #28 from dennisvlahos/master 
SNC: Eleven Upcoming Cards
 2022-04-14 08:48:14 +02:00
tool4ever
96add2711f Merge pull request #18 from Northmoc/cz_sd 
avoid "Card card" in ChangeZone StackDesc
 2022-04-14 08:47:15 +02:00
Magpie
936c3a84c5 Big map update 5.2 
Added a proper check.
 2022-04-14 07:46:05 +02:00
Magpie
119cec82d9 Big map update 5.1 
Added a check for empty loctext.
Restored colorless castle.
 2022-04-14 05:16:56 +02:00
Magpie
3f42c6b0f3 Big map update 5 
Allow defining dialogs and actions directly in maps.
 2022-04-14 04:58:58 +02:00
Dennis Vlahos
0b708b8967 ' fix 2022-04-14 05:28:22 +03:00
Northmoc
74a5e460b1 clarify ChooseNColors prompt 2022-04-13 22:09:47 -04:00
Anthony Calosa
434837e564 Merge pull request #22 from tool4ever/costfix 
707.10: Copied spells incomplete
 2022-04-14 08:49:57 +08:00
Anthony Calosa
be3868db7d Merge pull request #31 from tool4ever/cleanup 
xCount Cleanup
 2022-04-14 08:49:07 +08:00
Dennis Vlahos
d54415e2ae Made requested changes, updated All-Seeing Arbiter 2022-04-14 03:10:38 +03:00
tool4EvEr
b29e26cdc5 One more 2022-04-13 21:29:01 +02:00
tool4EvEr
9c33c3a27e xCount Cleanup 2022-04-13 21:16:10 +02:00
Dennis Vlahos
5ee01ffe9e Made requested changes 2022-04-13 22:11:17 +03:00
Dennis Vlahos
66ba8005f8 Merge branch 'Card-Forge:master' into master 2022-04-13 22:10:02 +03:00
tool4ever
c320688b73 Merge pull request #27 from magpie514/master 
Adventure mode map changes (part 1)
 2022-04-13 20:09:59 +02:00
tool4EvEr
234484bbfc Mana isn't an object that can be copied 2022-04-13 20:04:59 +02:00
Northmoc
7c4f1c3d7e Merge pull request #24 from Northmoc/diffManaValue 
Sudden Insight without Pump (Count$DifferentManaValue) - needs to be merged so other merged cards will work @Agetian
 2022-04-13 12:56:56 -04:00