external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,480 Commits 32 Branches 187 Tags
d2d955143f477f727b51df0712ed1b988b1d35c0
Commit Graph

3846 Commits

Author SHA1 Message Date
Anthony Calosa
646af5a5b7 revert touchpad for adventure 
- fixes touchpad issues not working
 2022-04-16 14:21:24 +08:00
Grimm
5e14f3cf2d added Console 2022-04-16 01:39:42 +02: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
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
44ded060f6 unused imports 2022-04-15 18:16:25 +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
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
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
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
Magpie
8573608ec8 Big map update 7.1 
Better check.
 2022-04-15 02:55:51 +02:00
Magpie
67e03ded58 Big map update 7 
Dungeon-wide effects, step 1.
 2022-04-15 02:14:44 +02:00
Grimm
673f8e5351 commit merge changes 2022-04-14 21:06:35 +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
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
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
Magpie
75f58f580c Big map update 3 
Changed map pickups:
Now it's a new Actor type and takes its reward values from what the map designer decides using some simple embedded JSON.
Defining rewards as enemies is unnecessary now.
 2022-04-13 05:00:44 +02:00
Magpie
6a668f1871 Big map update 2 
Fix indent.
 2022-04-12 23:27:29 +02:00
Magpie
78d8b196c1 Big map update 1 
Update player and enemy collision boxes.
 2022-04-12 23:11:17 +02:00
Magpie
a5bd40d7af Adventure mode PoI refactor. 
Renamed, re-set and cherry-picked a few of the various PoIs and reverted placement behavior.
 2022-04-11 09:25:36 +02:00
Anthony Calosa
76b342b47f update preview Date 2022-04-11 04:30:00 +08:00
Grimm
6171589330 fixed saving poi data, added date to load screen 2022-04-10 20:05:27 +02:00
Anthony Calosa
da4b9976ec fix New Game+ button on Portrait Mode 2022-04-10 20:18:12 +08:00
Anthony Calosa
b7aab46134 remove unused import 2022-04-10 03:47:17 +00:00
Magpie
55362a9e79 Adventure fixes 3. 
Use MyRandom for RNG.
 2022-04-10 05:25:17 +02:00
Magpie
8e6a1ca046 Adventure fixes 2. 
Adds a constant for Adventure mode folder, so it's consistent on Linux due to case sensitivity.
 2022-04-10 04:29:30 +02:00
Magpie
c83031ed8b Adventure fixes. 
Fixes loading of PoIs (Points of Interest) by making a list and picking one.
Fixes Green Castle boss.
 2022-04-10 03:55:35 +02:00
Grimm
7fa4bab499 added new game+ 2022-04-09 01:02:40 +02:00
Anthony Calosa
4571edd9d1 Allow to load old saves to fail to regenerate a new correct world 2022-04-07 23:46:47 +08:00
Magpie
d687088fd8 Quick fixes. 
Made text wrap in item descriptions and reverted a test item.
 2022-04-07 12:22:51 +02:00
Magpie
473410b449 Might as well. 2022-04-07 10:10:41 +02:00
Magpie
0c5e59089e As suggested. 2022-04-07 09:45:28 +02:00
Magpie
4480675799 Added item tooltips with names and descriptions to rewards view in Adventure. 
Please test on mobile in case the text is too small!
Moved item description method to the ItemData class so it can be reached anywhere, and made some minor tweaks for *conveyance*.
 2022-04-07 07:41:38 +02:00
Magpie
3c5ad4f5d7 Sped up some animations in Adventure. 
This way they don't feel like load times.
 2022-04-07 04:37:40 +02:00
Magpie
bd5f4ee1fc Small fix. 2022-04-07 04:08:39 +02:00
Magpie
0a08fa3deb Enables selecting AI type for Adventure mode enemies. 
So far only the Wurm has forced Reckless AI, we should ask players or deck experts about what AI types to use for each deck.
 2022-04-07 04:01:37 +02:00
Magpie
20b562fa07 Generate previews for card Rewards in Adventure. 
This uses a framebuffer object to draw the card preview and output a texture.
The first MR gave issues when bilinear texture filtering was enabled.
 2022-04-06 00:32:38 +02:00
Magpie
d5a5965c01 Revert "Use rendered cards for Adventure when no image file has been found." 
This reverts commit e3f14d5bdc
 2022-04-05 22:21:51 +00:00
Magpie
e3f14d5bdc Use rendered cards for Adventure when no image file has been found. 
This allows seeing cards that are yet to download as well as custom cards.
Also, a card rendering is forced before showing the mode selection screen, a temporary fix with an issue with CardImageRenderer, where it fails the very first time.
 2022-04-05 02:06:07 +02:00
Michael Kamensky
311002069a Merge branch 'kevlahnota-master-patch-16223' into 'master' 
[Mobile] Fix Mobile GUI Illegal cast

Closes #2127

See merge request core-developers/forge!6470
 2022-04-04 14:42:48 +00:00