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
68,299 Commits 32 Branches 187 Tags
3ef0479d76b51f43b984f4949e5281e03e8290af
Commit Graph

140 Commits

Author SHA1 Message Date
Chris H
8be414d9dd Blb release (#5929) 
* [maven-release-plugin] prepare release forge-1.6.64

* [maven-release-plugin] prepare for next development iteration

* Update pom.xml

* Update AndroidManifest.xml

* Update pom.xml

* Update Forge.java

---------

Co-authored-by: GitHub Actions <actions@github.com>
 2024-08-14 21:06:29 -04:00
tool4ever
6c7600dd1b Merge pull request #5895 from Jetz72/code-cleanup 
Miscallaneous Cleanup Part 3
 2024-08-11 19:30:21 +02:00
kevlahnota
af060121cf Update Mobile Build (#5813) 
* LibGDX Update

* unused import

* disable minimize on screen lock
 2024-08-11 19:12:29 +02:00
Jetz
f7d0929ea0 Cleanup - More Lambdas to method references 2024-08-10 12:54:16 -04:00
Jetz72
d62dfe1c8c Miscallaneous Cleanup Part 2 - Lambdas and Method References (#5737) 
* Cleanup - Unnecessary Boxing

* Cleanup - Unnecessary Unboxing

* Cleanup - For-Each Loops

* Cleanup - `indexOf != -1` -> `contains`

* Cleanup - Merge identical catch blocks

* Cleanup - Try-with-resources

* Cleanup - System.lineSeparator

* Cleanup - Reference types to primitives
Some loops over Integers were switched to IntStreams to hopefully cut down on overall boxing.

* Cleanup - Manually filling and copying arrays

* Remove unused imports

* Switch a lambda to a method reference

* Cleanup - CardPredicate Aggregates to method references

* Cleanup - Other static functions to method references

* Cleanup - Ambiguous class reference
Unclear when or how this happened...

* Cleanup - Anonymous -> Method reference

* Cleanup - Anonymous -> Lambda

* Cleanup - Comparator helper methods

* Cleanup - final method in final class

* Cleanup - private final methods

* Remove unused imports

* Convert a couple more lambdas to comparators.

* Simplify creature type list comparison.

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2024-08-02 08:23:58 +03:00
Jetz72
3968c7e197 Miscallaneous Cleanup (#5703) 
* Cleanup - Unnecessary Boxing

* Cleanup - Unnecessary Unboxing

* Cleanup - For-Each Loops

* Cleanup - `indexOf != -1` -> `contains`

* Cleanup - Merge identical catch blocks

* Cleanup - Try-with-resources

* Cleanup - System.lineSeparator

* Cleanup - Reference types to primitives
Some loops over Integers were switched to IntStreams to hopefully cut down on overall boxing.

* Cleanup - Manually filling and copying arrays

* Remove unused imports

* Switch a lambda to a method reference

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
 2024-07-29 17:23:43 +03:00
GitHub Actions
64b4b58399 [maven-release-plugin] prepare for next development iteration 2024-06-28 13:06:40 -04:00
GitHub Actions
463e4b1267 [maven-release-plugin] prepare release forge-1.6.63 2024-06-28 13:06:40 -04:00
GitHub Actions
8a8c77c4ae [maven-release-plugin] prepare for next development iteration 2024-04-25 19:29:38 -04:00
GitHub Actions
a4591fe3ac [maven-release-plugin] prepare release forge-1.6.62 2024-04-25 19:29:38 -04:00
GitHub Actions
cf0a72cbc6 [maven-release-plugin] prepare for next development iteration 2024-04-02 20:58:59 -04:00
GitHub Actions
a1fc524a98 [maven-release-plugin] prepare release forge-1.6.61 2024-04-02 20:58:59 -04:00
GitHub Actions
aa4eba0c33 [maven-release-plugin] prepare for next development iteration 2024-03-05 14:02:09 -05:00
GitHub Actions
0db8025766 [maven-release-plugin] prepare release forge-1.6.60 2024-03-05 14:02:09 -05:00
TabletopGeneral
935b4bb761 Adventure - Editor fix, minor quest updates (#4626) 
* Adventure - Editor fix, minor quest updates

Editor is not feature complete, but is now closer to it for quests than it was before.

* Adventure - "The Drunken Plea" reputation fix
 2024-02-05 07:12:20 +03:00
jjayers99
3cc39b6a11 Adventure - Exploration branch of Chapter 1 storyline quests 2023-12-30 00:15:04 -05:00
GitHub Actions
8c82589436 [maven-release-plugin] prepare for next development iteration 2023-12-04 20:40:21 -05:00
GitHub Actions
7e0088328b [maven-release-plugin] prepare release forge-1.6.59 2023-12-04 20:40:21 -05:00
GitHub Actions
72ddfd0be6 [maven-release-plugin] prepare for next development iteration 2023-09-20 22:00:51 -04:00
GitHub Actions
c629080a8d [maven-release-plugin] prepare release forge-1.6.58 2023-09-20 22:00:51 -04:00
jjayers99
373e334c67 Adventure updates 
Large sprite collision fix
Jumpstart reward fix
Emeny instance specific deck overrides
Selectable reward framework
Work in progress for new storyline dungeons
 2023-09-13 07:36:54 -04:00
GitHub Actions
0b6e5f9983 [maven-release-plugin] prepare for next development iteration 2023-07-26 22:00:13 -04:00
GitHub Actions
294b8c445b [maven-release-plugin] prepare release forge-1.6.57 2023-07-26 22:00:13 -04:00
jjayers99
dcb8cd5c13 Adventure updates 
Reputation now affects most purchase prices (0.5% per point to a max of +/-10%)
Card catalog tweaked to include unsellable / autosell cards.
Card selling improvements (can sell cards in excess of 4 copies in your deck, can no longer sell cards in use in other decks)
Jumpstart events available which grant unsellable copies of cards used.
Main quest prep work
 2023-07-17 16:31:04 -04:00
GitHub Actions
53bed72fe5 [maven-release-plugin] prepare for next development iteration 2023-04-24 13:03:27 -04:00
GitHub Actions
b8c6086cc0 [maven-release-plugin] prepare release forge-1.6.56 2023-04-24 13:03:27 -04:00
jjayers99
fb8a7b904a Adventure quest updates 
Arena quest stage objectives now available, one quest added.
Removed extra trigger for accepting quest in "A Vision of Destruction" offer dialog.
Minor dialog enhancements.
 2023-04-14 22:14:12 -04:00
jjayers99
92ec69e095 Adventure updates 
Clear quests on New Game+
Small cleanup tweaks to town layouts
Added (big) signs to capitals for arena and spellsmith.
Quests can now be tagged with sources, allowing generation in specific towns / biomes.
NPC arena matches are now weighted on relative HP rather than 50/50 odds.
Removed invisible collision wall in Maze_1.tmx, gave threat range to nearby enemy instead.
 2023-04-14 07:55:38 -04:00
jjayers99
8514442220 Additional quest fixes, framework for new objective type 2023-04-13 09:00:53 -04:00
jjayers99
2e7b663bd5 More Adventure import fixes 2023-04-10 06:56:57 -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
tool4EvEr
f59ad77a4d Maven: relocate platform-specific dependency 2023-03-11 09:13:51 +01:00
jjayers99
24f585f0a8 Adventure - New red boss dungeon, waypoint tools 
A few further changes are planned for new dungeon, but needed to actually do a check-in at some point...
 2023-03-07 22:11:33 -05:00
TabletopGeneral
7939df234f Adventure updates (#2493) 
* Adventure updates

Adventure items can now spawn cards in command zone via startBattleWithCardInCommandZone - Updated Mana Shard based items to do so.

Added new map objects:  Mana Shard rewards, generic collision zone, intended for use in upcoming map updates.

Fixed mismatched wall tile in green castle.

* Removing unused import

* Updating language / structure of Adventure custom cards.

* Updating language / structure of Adventure custom cards.
 2023-02-26 08:23:43 +03:00
GitHub Actions
de4feee3ef [maven-release-plugin] prepare for next development iteration 2023-02-20 23:36:34 -05:00
GitHub Actions
257895f019 [maven-release-plugin] prepare release forge-1.6.55 2023-02-20 23:36:34 -05:00
GitHub Actions
3b94d10c0f [maven-release-plugin] prepare for next development iteration 2023-01-25 22:05:01 -05:00
GitHub Actions
2009b57a59 [maven-release-plugin] prepare release forge-1.6.54 2023-01-25 22:05:01 -05:00
George
0032d35be0 Correct the update of POIChanges for bought cards from shops 2023-01-06 11:33:09 +02:00
Anthony Calosa
4ce8d7bac2 update Shaders 
- fix ripple effect
- fix flip effect
 2022-11-29 16:29:33 +08:00
Anthony Calosa
55d3ffe9f2 update Shaders 2022-11-28 19:18:33 +08:00
Anthony Calosa
3db079d8e3 update SplashScreen 
- Adventure Splashscreen will be used if default startup is Adventure Mode.
 2022-11-21 14:51:16 +08:00
Anthony Calosa
f0f3cb7d08 update fallback_skin 2022-11-21 07:02:20 +08:00
Grimm
38748301ae issue #1340 made it possible to create custom adventures from the user data folder 2022-09-20 02:02:52 +02:00
Grimm
93bdec1f2d integrated Textra for Labels and Buttons 
fixed executables for release
 2022-09-18 17:44:28 +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
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
Anthony Calosa
64e3b40639 update repo 2022-09-10 17:31:46 +08:00
Anthony Calosa
31572d1e58 update Adventure dependency for controller 2022-09-10 17:25:40 +08:00