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

56874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
2f3fd97a9c maestros_ascendancy.txt better 2022-04-15 12:08:30 -04:00
Anthony Calosa
97abc93c22 Merge pull request #43 from TrueFuFLeaderG/adventure 
fixed font rendering on pixmaps and gamehud
 2022-04-15 22:16:08 +08:00
Grimm
33e0269833 fixed skin 2022-04-15 16:12:07 +02:00
Grimm
54747e9264 fixed touchpad 2022-04-15 16:01:01 +02:00
Grimm
06bd269ea5 removed Scaling.fit for now, to many issues 2022-04-15 15:43:59 +02:00
Grimm
54108d372a fixed game hud again 
fixed font rendering on pixmaps
 2022-04-15 14:50:49 +02:00
Northmoc
a89e394d08 urabrask_heretic_praetor.txt add ExileOnMoved 2022-04-15 08:48:44 -04:00
Northmoc
566603cac1 maestros_ascendancy.txt 2022-04-15 08:35:02 -04:00
Grimm
d3ea7dc2ee fixed game hud 2022-04-15 13:16:37 +02:00
Grimm
55b941fd2f fixed game hud 2022-04-15 13:11:03 +02:00
Anthony Calosa
72cac25fa2 Merge pull request #42 from kevlahnota/master 
unused imports
 2022-04-15 18:17:35 +08:00
Anthony Calosa
44ded060f6 unused imports 2022-04-15 18:16:25 +08:00
Anthony Calosa
9aaf33cb60 Merge pull request #41 from magpie514/master 
Big map update 8.6
 2022-04-15 18:15:30 +08:00
Magpie
19d6a41deb Big map update 8.6 
Added Dummy block template.
 2022-04-15 12:12:11 +02:00
Anthony Calosa
f2f3d7c120 Merge pull request #40 from magpie514/master 
Big map update part 2.
 2022-04-15 17:55:55 +08:00
Magpie
1ddc8785bd Big map update 8.5 
Adjusted startBattleWithCards() effect lookups.
 2022-04-15 11:48:24 +02:00
Magpie
26cafedba1 Big map update 8.4 
Adjust logic when negating dialog events.
Cleanup unused imports.
 2022-04-15 11:11:17 +02:00
Magpie
d7622ba861 Big map update 8.3 
Fix popups showing up before the reward actor was flipped over.
 2022-04-15 10:04:19 +02:00
Magpie
b63002565b Big map update 8.2 
Add comments.
 2022-04-15 10:03:44 +02:00
Magpie
d416946185 Big map update 8.1 
Fix removing dungeon effects after a dungeon.
 2022-04-15 09:42:55 +02:00
tool4ever
9686a6d558 Merge pull request #36 from Northmoc/snc_wt 
SNC: Wiretapping and support
 2022-04-15 09:17:05 +02:00
Magpie
81f97ceb11 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	forge-gui-mobile/src/forge/adventure/stage/GameStage.java
 2022-04-15 09:09:55 +02:00
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
Magpie
ad2e2ac76a Big map update 8 
Dialog updates.
- Dialogs can be assigned to enemies.
- Dialogs have a few more conditions and effects.
- Dummy objects that can be removed from dialogs by ID.
- Dialogs can force a battle by ID.
 2022-04-15 08:36:59 +02: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
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