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

3451 Commits

Author SHA1 Message Date
Anthony Calosa
1340df7c26 fix difficulty selector alignment 2022-09-19 14:05:48 +08:00
Anthony Calosa
d4d169fa01 fix colorlabel color 2022-09-19 10:13:14 +08:00
Grimm
da504d36a2 Merge remote-tracking branch 'origin/adventure' into adventure 2022-09-18 18:36:03 +02:00
Grimm
ab87a32fc1 fixed item use in poi 2022-09-18 17:58:09 +02:00
Grimm
93bdec1f2d integrated Textra for Labels and Buttons 
fixed executables for release
 2022-09-18 17:44:28 +02:00
Grimm
a601ef5ec7 integrating TextraLabel into adventure ui 2022-09-18 03:10:57 +02:00
Grimm
fbd888f290 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 
 Conflicts:
	forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
	forge-gui-mobile/src/forge/adventure/scene/HudScene.java
	forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java
	forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
	forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
	forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
	forge-gui-mobile/src/forge/adventure/scene/StartScene.java
	forge-gui-mobile/src/forge/adventure/scene/UIScene.java
	forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
	forge-gui-mobile/src/forge/adventure/stage/GameStage.java
	forge-gui-mobile/src/forge/adventure/stage/MapStage.java
	forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
 2022-09-16 18:35:47 +02:00
Grimm
5bae834f09 Render world map with more details 
Changed SpellSmithScene to not display empty edition and fixed edition filter.
 2022-09-16 18:13:13 +02:00
Grimm
f9de0c1678 Merge branch 'adventure' of https://github.com/TrueFuFLeaderG/forge into adventure 2022-09-15 19:32:55 +02:00
Grimm
8e544633a2 crash fix for lazy loading 
Fixed 500 card adventure starting deck
 2022-09-15 17:29:54 +02:00
Grimm
e193c4881a crash fix for lazy loading 
Fixed 500 card adventure starting deck
 2022-09-15 17:29:45 +02:00
Grimm
98f833f019 Added item use support 
Added mana for item usage
Added new AI art
Added particle effect system
Added capitals
Added some map modifications like hiding and flying
Added a arena to the capitals
Made more items findable
 2022-09-14 21:18:31 +02:00
Eric
4b2ecafc6b In Adventure matches, don't warn about cards the AI can't play well. 2022-09-05 15:08:23 -05:00
Grimm
f0daceef25 reworkd adventure main call 
added particle effects
 2022-09-02 15:23:23 +02:00
Anthony Calosa
79c58053fe Enable controller listener when adventure mode starts 
- Controller listener needs continuous rendering like Adventure mode. Classic mode only shouldn't be affected by continuous rendering unless the listener has already started.
 2022-09-02 09:12:16 +08:00
Anthony Calosa
b6cab2ac5c remove comment 2022-09-01 20:10:28 +08:00
Anthony Calosa
3421b3bdd7 update controls 2022-09-01 20:03:33 +08:00
Anthony Calosa
4bde4911ea add DPAD selector for gamepad in ListChooser 
also add a way to select player using back button (select button on ds4), highlight player using left analog down, then press the back button to select player
 2022-09-01 19:02:31 +08:00
Anthony Calosa
aa12e751a1 Merge branch 'master' into newmaster 2022-09-01 05:16:59 +08:00
Anthony Calosa
6ad0b32c64 add bypass for android version displaying magnification on hover (when using gamepad) 2022-09-01 05:11:12 +08:00
Anthony Calosa
33d927f71f Update CardZoom.java 2022-09-01 04:11:19 +08:00
Anthony Calosa
39a44eb354 unused import 2022-09-01 04:03:39 +08:00
Anthony Calosa
5f1c29b823 Gamepad for Adventure Mode 2022-09-01 03:55:11 +08:00
Anthony Calosa
0615cb3a53 Merge pull request #1417 from rikimbo/fix_adventure_card_reward_bonus 
Adventure: Fix "Card Reward Bonus" to properly max at 3
 2022-08-31 05:46:43 +08:00
Eric
5f0ae9eca1 Changed RegisteredPlayer.addExtraCardsOnBattlefield() so that when called multiple times, it adds to the existing set of cards each time. Fixes Adventure dungeon effects that add creatures to the battlefield. 2022-08-29 21:15:48 -05:00
Eric
c9bf08f0d2 Fix AdventurePlayer.bonusDeckCards() to properly cap out at 3. 2022-08-28 12:53:16 -05:00
Grimm
1a112ae7c6 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 2022-08-22 14:46:49 +02:00
Grimm
6d009f552b reworkd adventure main call 
added particle effects
 2022-08-22 14:46:34 +02:00
Anthony Calosa
700d2182cb remove parenthesis 2022-08-19 21:56:52 +08:00
Anthony Calosa
520876f0de show messages for doppelganger if player is using custom decks in adventure 2022-08-19 21:55:05 +08:00
Anthony Calosa
797ff625db Adventure Custom StarterDecks 
- add support loading custom starterdeck in adventure mode, custom->starterdecks on user folder before starting Forge
 2022-08-19 21:28:23 +08:00
Grimm
b3d7d26ac3 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 
 Conflicts:
	forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
 2022-08-18 14:21:26 +02:00
Grimm
f14771b09a added usable items 2022-08-18 14:18:19 +02:00
Anthony Calosa
89319f95ab crash fix using textratypist on Android 2022-08-18 15:39:51 +08:00
Anthony Calosa
0349f45a9b revert flip 2022-08-18 07:19:00 +08:00
Anthony Calosa
c595cf7896 fix autosave flip preview 
- the screenshot is already flipped to render correctly so we don't need to flip it again
 2022-08-18 04:33:59 +08:00
Anthony Calosa
8493c151c7 fix save preview for some android devices 
- take screenshot and redraw it on a new framebuffer so it renders properly on some android devices that don't support RGBA framebuffer directly.
 2022-08-18 03:22:09 +08:00
Grimm
d022fdc507 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 2022-08-17 16:58:33 +02:00
Grimm
745e9bc3ee expanded teleport actor on maps added capitals 2022-08-17 16:57:56 +02:00
Anthony Calosa
003ec159c8 unused import 2022-08-17 13:37:06 +08:00
Anthony Calosa
7170b2d282 add TextraTypist 
for Font Effects, Styles, etc..
 2022-08-17 13:32:17 +08:00
Anthony Calosa
49e1df5682 .. 2022-08-16 14:32:46 +08:00
Anthony Calosa
aa1d639855 fix captured image 
- on some android devices, it doesn't support RGBA Framebuffer, this should fix the lastScreenTexture rendering black
 2022-08-16 14:20:10 +08:00
Anthony Calosa
1f9d212dfd prevent NPE 2022-08-15 08:25:15 +08:00
Anthony Calosa
8599c60177 Update StartScene.java 2022-08-14 10:12:09 +08:00
Anthony Calosa
be6b9ecca3 Update SaveLoadScene.java 2022-08-14 10:04:34 +08:00
Anthony Calosa
6ad81080fc set 250 as minimum value for temp health boost 2022-08-14 09:32:37 +08:00
Anthony Calosa
fcecec09d6 Update InnScene.java 
move computation on scene enter
 2022-08-13 20:17:36 +08:00
Anthony Calosa
f3f9c222b0 Merge branch 'master' into autoHealWhenEnteringTowns 2022-08-13 17:53:30 +08:00
Anthony Calosa
b9a3189849 Update GameHUD.java 2022-08-13 17:31:40 +08:00