external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,835 Commits 31 Branches 187 Tags
bada43b901b55a573d245800f1ec53e474917ef1
Commit Graph

4010 Commits

Author SHA1 Message Date
Benjamin Perry
2f17c2f8f9 Merge conflicts 2023-04-13 20:08:05 -04:00
Anthony Calosa
93b8fc79b7 fix buttons 2023-04-14 07:52:55 +08:00
Anthony Calosa
26cc7d0fe5 update menu button positions 2023-04-14 05:26:25 +08:00
Anthony Calosa
9da9d1f714 Update AdventureQuestController.java 
update check
 2023-04-14 04:10:08 +08:00
Anthony Calosa
4bbf516e89 fix loading error classcastexception 
- fix classcastexception-cannot-assign-instance-of since the old value is of UUID and changed to String, old file will not load...
 2023-04-14 04:04:09 +08:00
Anthony Calosa
11989ebb2b Merge pull request #2917 from kevlahnota/newmaster2 
update GameHUD, InventoryScene
 2023-04-14 03:15:15 +08:00
Anthony Calosa
932269f0c3 Merge pull request #2909 from jjayers99/master 
Adventure updates
 2023-04-14 03:06:39 +08:00
Anthony Calosa
8ccdabcdf6 update GameHUD, InventoryScene 
- can equip activatable items for quick access on GameHUD
 2023-04-14 02:49:09 +08:00
Benjamin Perry
7e386c034a Merge remote-tracking branch 'upstream/master' 2023-04-13 14:29:58 -04:00
jjayers99
8514442220 Additional quest fixes, framework for new objective type 2023-04-13 09:00:53 -04:00
Benjamin Perry
a743e412ce updating local deck, and selecting / scrolling to new copy 2023-04-13 08:23:32 -04:00
jjayers99
32417c7958 Update DialogActor.java 2023-04-13 07:11:52 -04:00
Benjamin Perry
a1366deff7 not mucking with selected index 2023-04-13 06:55:03 -04:00
Anthony Calosa
1eca58c313 remove redundant frames on navigation arrow 2023-04-13 11:50:34 +08:00
Benjamin Perry
f5f3496e30 Added copy and delete deck 2023-04-12 23:28:44 -04:00
jjayers99
3a8aae7af0 Adventure updates 2023-04-12 23:25:39 -04:00
Anthony Calosa
8b359d8b5c update navigation arrow 2023-04-12 18:10:52 +08:00
jjayers99
37252544c3 Adventure updates 
New Game+ will be required if any quests were in progress

Prevent false quest failures on game loss.
Persist quest tracking status through save/load.
Correct tags for POI mapping
Exit Dungeon function will trigger "Leave" objectives
Correction to other dungeon mobs halting after battle
 2023-04-11 16:19:29 -04:00
TabletopGeneral
10980ad840 Merge branch 'Card-Forge:master' into master 2023-04-11 09:38:31 -04:00
jjayers99
4c53b419bc Adventure quest fixes 2023-04-11 09:37:52 -04:00
Anthony Calosa
cfa8a82500 update blessing color 2023-04-11 19:49:25 +08:00
Anthony Calosa
91fd2d6d93 set window widget movable to false 2023-04-11 19:43:37 +08:00
Anthony Calosa
d75c8dbc49 Merge pull request #2880 from jjayers99/master 
Adventure quests - initial implementation
 2023-04-11 08:47:06 +08:00
friarsol
58dcb0ea03 Battles first take 2023-04-10 12:54:01 -04:00
jjayers99
915daaa70a Adventure updates - imports 2023-04-10 06:52:11 -04:00
jjayers99
467795712c Adventure quests - initial implementation 
Known issues - Hunt objectives lose track of target on save
 2023-04-09 23:55:26 -04:00
Anthony Calosa
04e638b789 update imagefetcher 2023-04-09 07:55:57 +08:00
Anthony Calosa
bb30397a9e add imagefetcher for Planchase BG 2023-04-08 20:27:15 +08:00
Anthony Calosa
4224b22ac8 update 2023-04-08 08:57:10 +08:00
Anthony Calosa
76c4d6003d remove redundant code 2023-04-08 08:53:29 +08:00
Anthony Calosa
e6709c83cc update searchposts entry 2023-04-08 08:31:57 +08:00
Anthony Calosa
daa46e969d fix minimap generation, update textrafont property 2023-04-08 08:08:32 +08:00
Anthony Calosa
b81af7c105 update planes-images 2023-04-07 13:16:57 +08:00
Anthony Calosa
8ccc0d77e2 Update RewardActor.java 
fix shop item icon position
 2023-04-06 08:24:13 +08:00
Anthony Calosa
05814dca15 try to fix NPE 2023-04-06 07:35:53 +08:00
Anthony Calosa
03e335f42f fix viewport update on resize 2023-04-06 06:58:43 +08:00
Anthony Calosa
6b393fe0de revert.. 2023-04-05 22:44:26 +08:00
Anthony Calosa
77e218e32e use configdata for font height, width 2023-04-05 22:29:01 +08:00
Anthony Calosa
92010babf5 update TransitionScreen 2023-04-05 22:20:47 +08:00
Anthony Calosa
8bd479dbf1 Merge pull request #2832 from kevlahnota/newmaster2 
fix loading Arena, update remaining dialog
 2023-04-05 22:08:44 +08:00
Anthony Calosa
68d2d759ea .. 2023-04-05 21:52:05 +08:00
Anthony Calosa
7d4b193ffa Update PlayerSprite.java 2023-04-05 21:49:47 +08:00
Anthony Calosa
fbbb32f13c update 2023-04-05 21:30:47 +08:00
Anthony Calosa
aa838085f5 fix loading Arena, update remaining dialog 2023-04-05 21:20:15 +08:00
Benjamin Perry
86420c1077 Added check to prevent player from getting stuck on obstacles in current scene. Player now keeps moving in previous direction if blocked and scene hasn't changed. Once clear of the obstacle, the user no longer needs to repress the direction key to move in the intended direction. 2023-04-05 08:18:05 -04:00
Anthony Calosa
2909b9a971 use default filter for all ui Image elements 2023-04-04 19:35:14 +08:00
Anthony Calosa
93a4581e1a fix rerun when POI placement failed 
- update RewardActor image
 2023-04-03 18:59:43 +08:00
Anthony Calosa
e46de1fe0b update 2023-04-02 21:49:45 +08:00
Anthony Calosa
b51d68a4c4 update AreneScene dialog 2023-04-02 19:42:44 +08:00
Anthony Calosa
10876bcbaf SpellSmithScene filter upcoming 2023-04-02 07:31:20 +08:00