external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 31 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

18 Commits

Author SHA1 Message Date
Grimm
49f7128240 Restore the adventure merge 
This reverts commit e69cf66ec8.
 2021-10-20 04:54:01 +00: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
Grimm
d90a4e91b6 test commit 2021-07-11 20:36:12 +02:00
Grimm
7d37f75bd0 test commit 2021-07-11 13:03:20 +02:00
Grimm
a9a34d90c2 Revert "test commit" 
This reverts commit 773762733f
 2021-07-08 01:50:23 +00:00
Grimm
773762733f test commit 2021-07-08 00:04:37 +02:00