external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,577 Commits 33 Branches 187 Tags
e01fa58c6fafb08bed6e45fa23f21ca3aad5d1fe
Commit Graph

56577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
e01fa58c6f Merge pull request #39 from kevlahnota/master 
revert fonts for Adventure Mode
 2022-04-15 15:03:54 +08:00
Anthony Calosa
f8ca5dc46a Merge branch 'master' into newmaster 2022-04-15 15:03:07 +08:00
Anthony Calosa
a2d00eed8c revert fonts for Adventure Mode 
- fixes slowdown/lag introduced since generating thousands of font data and png is not efficient unless cached specially on Japanese, Chinese Glyphs
 2022-04-15 14:59:32 +08:00
Hans Mackowiak
2368370514 Merge pull request #35 from Northmoc/keyword 
Some Keyword reminder text parsing tweaks (mostly Hideaway)
 2022-04-15 07:52:40 +02:00
Anthony Calosa
33a87c5308 Merge pull request #38 from TrueFuFLeaderG/adventure 
Adventure portrait mode update
 2022-04-15 13:37:50 +08:00
Anthony Calosa
6fcdc57b4f Merge pull request #32 from Northmoc/prompt 
clarify ChooseNColors prompt
 2022-04-15 13:36:18 +08:00
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
Grimm
d335e47832 commit merge changes 2022-04-14 23:25:52 +02: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
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
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
Agetian
85d9506deb Merge pull request #29 from tool4ever/NPEfix 
PlayAi: Fix NPE with Invoke Calamity
 2022-04-13 17:35:47 +03:00
Agetian
0739fcd0b0 Merge pull request #23 from dennisvlahos/patch-2 
SNC: All-Seeing Arbiter
 2022-04-13 17:27:57 +03:00
Agetian
372c445557 Merge pull request #21 from Card-Forge/HideawayRework 
SNC: Hideaway as Keyword with Amount
 2022-04-13 17:27:49 +03:00
Agetian
a62a32619e Merge pull request #25 from Northmoc/snc_12 
12 April odds and ends
 2022-04-13 17:21:50 +03:00
Agetian
e7d7106eb3 Merge pull request #16 from paulsnoops/snc_12_april 
SNC - 12 April
 2022-04-13 17:19:36 +03:00
tool4EvEr
889a2ad880 LKI fix 2022-04-13 15:12:43 +02:00
tool4EvEr
41843ddf28 Fix 707.10b 2022-04-13 14:46:59 +02:00
tool4EvEr
12774df929 Fix 107.3j 2022-04-13 12:57:06 +02:00
tool4EvEr
16613fe1d0 set castSA on copy 2022-04-13 11:46:12 +02:00
Dennis Vlahos
1d4bc63837 Add files via upload 2022-04-13 12:16:19 +03:00
Dennis Vlahos
bc4b047534 Add files via upload 2022-04-13 11:49:45 +03:00
tool4EvEr
4e63a9431d PlayAi: Fix NPE with Invoke Calamity 2022-04-13 10:21:48 +02:00
Dennis Vlahos
1dcb2e4ba0 Add files via upload 2022-04-13 11:20:43 +03:00
Dennis Vlahos
211cda6af6 Add files via upload 2022-04-13 10:44:47 +03:00
Dennis Vlahos
ee9ce5b29b Add files via upload 2022-04-13 10:24:25 +03:00
Dennis Vlahos
af85d78743 Add files via upload 2022-04-13 10:03:34 +03:00
Dennis Vlahos
7f24e3e207 Add files via upload 2022-04-13 09:50:22 +03:00
Dennis Vlahos
26f8820fa9 Add files via upload 2022-04-13 09:23:24 +03:00