Commit Graph

104 Commits

Author SHA1 Message Date
Anthony Calosa
4464b138fb include lq transition bg 2022-02-18 12:19:03 +08:00
Anthony Calosa
ea6aaa1efb [Mobile] Card Magnifier
- Add option to display larger version of the hovered card.
2022-02-15 15:31:44 +08:00
Anthony Calosa
4b5584dca9 #CloseScreen 2022-02-15 11:30:36 +08:00
Anthony Calosa
cffda7a41c update ui 2022-02-08 07:09:16 +08:00
Anthony Calosa
e7b8ad090e update deck editor 2022-02-07 22:33:37 +08:00
Anthony Calosa
49ad463cf9 Fix 2022-02-07 20:34:46 +08:00
Anthony Calosa
2ed45c2d91 cleanup
- todo figure out android...
2022-02-07 10:37:08 +08:00
Anthony Calosa
b6e03b165f fix startup
- todo figure out android...
2022-02-07 10:26:33 +08:00
Anthony Calosa
55f1baee8c replace lambda
- investigate adventure desktop scenes freeze
- investigate android crash
2022-02-07 06:40:05 +08:00
Anthony Calosa
6afce227cb move back editor window exclusively for desktop
- investigate adventure desktop scenes freeze
- investigate android crash
2022-02-07 00:59:19 +08:00
Anthony Calosa
3c6af87e9d initial AdventureMode port
- todo needed adventure application startup upon pressing the adventure mode button
2022-02-06 11:10:52 +08:00
pakoito
c15109da30 Add cmd file 2022-01-14 17:40:29 +01:00
Grimm
6fd8d94269 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2022-01-04 23:47:51 +01:00
Grimm
e6d2ba2517 merged Fregnor content
fixed large maps
added pixmap for player pos on mini map
2022-01-04 23:47:09 +01:00
Michael Kamensky
f61e4c610f [maven-release-plugin] prepare for next development iteration 2021-12-29 09:09:22 +03:00
Michael Kamensky
08efcfbf79 [maven-release-plugin] prepare release forge-1.6.47 2021-12-29 09:09:11 +03:00
Grimm
0f4be415f5 Fixed context menu in shop and deck editor 2021-12-08 03:17:07 +01:00
Grimm
54246b9d36 Fixed statistic save 2021-12-08 00:11:36 +01:00
Grimm
58eded5d09 Added 2 small poi
fixed some crashes in the item view
2021-12-07 23:03:40 +01:00
Grimm
d6f55eddfe Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-12-07 00:11:45 +01:00
Grimm
aee9699d14 Added statistic 2021-12-07 00:11:41 +01:00
Anthony Calosa
dac5d73955 [Mobile] Fix planar conquest deck edit 2021-11-22 10:31:53 +08:00
Grimm
87337def2e Added Shop to the Inn screen 2021-11-19 02:40:50 +01:00
Grimm
ef8c7a81e7 Fixed save in dungeons/towns 2021-11-18 03:19:41 +01:00
Grimm
ca56e1bb4e Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-11-18 02:27:16 +01:00
Grimm
c47af43006 Added multiple decks in adventure.
Adjusted deck editor to enable usage in adventure mode.
Fixed a crash after a match.
2021-11-18 02:27:01 +01:00
Michael Kamensky
299e737716 [maven-release-plugin] prepare for next development iteration 2021-11-15 07:33:57 +03:00
Michael Kamensky
13b1a4150c [maven-release-plugin] prepare release forge-1.6.46 2021-11-15 07:33:45 +03:00
Anthony Calosa
bc02725dcf update name
- -old.exe to -java8.exe
2021-11-10 07:19:07 +08:00
Anthony Calosa
40d7b89823 Update minimum Java version for Forge Desktop executable
- forge.exe and forge-adventure.exe needs at least Java 11.0.1
- for Java 8, user should use forge-old.exe for Forge Desktop, and forge-adventure-old.exe for Forge Adventure
2021-11-09 21:46:42 +08:00
Grimm
eba6430713 Fixed major tread bug in adventure matches
Changed save file structure for adventure
Changed startup for the main adventure class to support more standard feature
fixed some configuration in the adventure files
2021-11-08 23:26:03 +01:00
Grimm
ae80b533e4 Fixed memory leak in UIScene
Fixed spelling errors in data
Reworked save/load to get backward compatibility possibilities.
added auto save and quick save.
Fixed card downloads in shops/reward screens
2021-11-03 03:04:02 +01:00
Grimm
dc0f78205e rename folder so that windows see the rename to lowercase 2021-10-19 02:32:12 +02:00
Grimm
035976d165 - Removed copy of libgdx gui
- added shaders to adventure module
- changed build order to build adventure module before desktop to pack it in the same zip but not add it as dependency
- adjusted mobile gui module to support adventure module.
2021-10-18 20:11:06 +02:00
Jamin W. Collins
2966bdfc6a update module version to match parent
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2021-10-16 13:40:37 -07:00
Jamin W. Collins
e31faf4e06 set a version for org.jetbrains.annotations
fixes:

[WARNING] 'dependencies.dependency.version' for
org.jetbrains:annotations:jar is either LATEST or RELEASE (both of them
are being deprecated) @ line 178, column 22

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2021-10-16 12:48:32 -07:00
Jamin W. Collins
339c9cec40 Restore the adventure merge
This reverts commit e69cf66ec8.
2021-10-16 12:43:12 -07:00
Michael Kamensky
e69cf66ec8 Revert "Merge branch 'adventure' into 'master'"
This reverts merge request !5318
2021-10-16 18:09:31 +00:00
Grimm
639cd42c43 Added some comments, cleaned up names and code 2021-09-10 17:36:05 +02:00
Grimm
88b6ac0964 commit res 2021-09-09 02:44:56 +02:00
Grimm
b5450d47d3 commit res 2021-09-09 02:43:59 +02:00
Grimm
7acb42a01c commit res 2021-09-09 02:42:14 +02:00
Grimm
84b6ebfec6 commit res 2021-09-09 00:02:22 +02:00
Grimm
70f8302bcf commit res 2021-09-08 03:49:54 +02:00
Grimm
eabec766a4 commit res 2021-08-31 20:27:25 +02:00
Grimm
655668c222 First playable 2021-08-31 20:16:16 +02:00
Grimm
62521f56ba Built on server test 2021-08-17 18:09:57 +02:00
Grimm
6712c1cd55 Add Save screen 2021-07-18 04:09:56 +02:00
Grimm
1d1011ce06 Add missing res 2021-07-11 20:44:23 +02:00
Grimm
71337d9d39 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	forge-adventure/pom.xml
#	forge-adventure/src/main/java/forge/adventure/AdventureApplicationAdapter.java
#	forge-adventure/src/main/java/forge/adventure/Main.java
#	forge-adventure/src/main/java/forge/adventure/scene/DuelInput.java
#	forge-adventure/src/main/java/forge/adventure/scene/DuelScene.java
#	forge-adventure/src/main/java/forge/adventure/scene/GameScene.java
#	forge-adventure/src/main/java/forge/adventure/scene/NewGameScene.java
#	forge-adventure/src/main/java/forge/adventure/scene/Scene.java
#	forge-adventure/src/main/java/forge/adventure/scene/SceneType.java
#	forge-adventure/src/main/java/forge/adventure/scene/StartScene.java
#	forge-adventure/src/main/java/forge/adventure/stage/GameStage.java
#	forge-adventure/src/main/java/forge/adventure/util/Res.java
2021-07-11 20:36:45 +02:00