external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,934 Commits 33 Branches 187 Tags
677ee26e91b1ce3d9dfaee0edb88c64db04dad3c
Commit Graph

38934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blacksmith
43338bd0a3 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-30 20:44:18 +00:00
Michael Kamensky
2476bcfa31 Merge branch 'surgedFix' into 'master' 
Surge: don't use OptionalCost there

See merge request core-developers/forge!887
 2018-08-30 19:29:15 +00:00
Hanmac
f967d9885a CardProperty: fixed surged 2018-08-30 21:18:08 +02:00
Michael Kamensky
83721cadbd Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M197.

See merge request core-developers/forge!888
 2018-08-30 19:10:46 +00:00
Agetian
b22c1ece86 - Added puzzle PS_M197. 2018-08-30 22:10:10 +03:00
Hanmac
73b94a63a5 Surge: don't use OptionalCost there 2018-08-30 20:25:30 +02:00
Blacksmith
2bcd57910e Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-30 11:20:42 +00:00
Michael Kamensky
b279ae0771 Merge branch 'import_deck' into 'master' 
Enables `Import` `Open` `New deck` `Save As` buttons in all deck editors with finite catalog

See merge request core-developers/forge!884
 2018-08-30 11:18:09 +00:00
Blacksmith
51735b9ff7 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-30 05:50:42 +00:00
Michael Kamensky
2f1527d89f Merge branch 'fix-xantcha' into 'master' 
Xantcha is an "As" not a "When"

See merge request core-developers/forge!886
 2018-08-30 05:45:21 +00:00
Sol
0ded352f22 Xantcha is an "As" not a "When" 2018-08-29 18:50:38 +00:00
NikolayHD
66e52cbd6a Support Import, Open, New deck, Save As 
in all deck editors with finite catalog
 2018-08-29 01:15:27 +03:00
Blacksmith
aec894a569 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-27 16:50:42 +00:00
Michael Kamensky
db7ab85f26 Merge branch 'multi-select' into 'master' 
properly message and limit human multi-select

See merge request core-developers/forge!882
 2018-08-27 16:39:44 +00:00
Jamin W. Collins
5f6ea460dd properly message and limit human multi-select 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-27 08:18:40 -06:00
Blacksmith
97f93418bf Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-27 03:20:42 +00:00
Sol
42acde1ba0 Merge branch 'android-network-play' into 'master' 
Android network play

See merge request core-developers/forge!836
 2018-08-27 03:07:21 +00:00
Jamin W. Collins
095bb4a154 make protocol definition match implementation 
com.badlogic.gdx.utils.GdxRuntimeException: java.lang.InternalError: Protocol method getActivateDescription: illegal argument (0) of type forge.game.card.CardView, java.lang.String expected
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication$1.run(LwjglApplication.java:127)
Caused by: java.lang.InternalError: Protocol method getActivateDescription: illegal argument (0) of type forge.game.card.CardView, java.lang.String expected
	at forge.net.ProtocolMethod.checkArgs(ProtocolMethod.java:158)
	at forge.net.GameProtocolSender.sendAndWait(GameProtocolSender.java:21)
	at forge.net.client.NetGameController.sendAndWait(NetGameController.java:28)
	at forge.net.client.NetGameController.getActivateDescription(NetGameController.java:93)
	at forge.screens.match.views.VCardDisplayArea.getActivateAction(VCardDisplayArea.java:186)
	at forge.card.CardZoom.onCardChanged(CardZoom.java:113)
	at forge.card.CardZoom.show(CardZoom.java:64)
	at forge.screens.match.views.VCardDisplayArea$CardAreaPanel.showZoom(VCardDisplayArea.java:406)
	at forge.screens.match.views.VCardDisplayArea$CardAreaPanel.longPress(VCardDisplayArea.java:396)
	at forge.Forge$MainInputProcessor.longPress(Forge.java:575)
	at forge.toolbox.FGestureAdapter$1.run(FGestureAdapter.java:43)
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication.executeRunnables(LwjglApplication.java:246)
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication.mainLoop(LwjglApplication.java:199)
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication$1.run(LwjglApplication.java:120)

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-26 12:56:27 -06:00
Blacksmith
e70f6da283 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-26 17:35:42 +00:00
Jamin W. Collins
97e6657bfc move everything to guava android for compatibility 
There appear to be incompatibilities between guava 24.1-jre and
24.1-android with regard to serialization.  As long as networking
is dependent upon serialization desktop and android need to use
the exact same guava package.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-26 11:26:38 -06:00
Jamin W. Collins
071c45839d add Dev Mode indication 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-26 11:26:38 -06:00
Jamin W. Collins
39c002e903 only the specific player can adjust their team 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-26 11:26:38 -06:00
Jamin W. Collins
57d5013750 only network host can adjust number of players 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-26 11:26:38 -06:00
Michael Kamensky
11ca1231a4 Merge branch 'dredgeFix' into 'master' 
Dredge use :

See merge request core-developers/forge!881
 2018-08-26 17:24:35 +00:00
Hanmac
9acb1dca93 Dredge use : 2018-08-26 15:20:20 +02:00
Blacksmith
5fec8ed29d Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-26 09:35:42 +00:00
Michael Kamensky
3dda238f7a Merge branch 'updatedmoderndeckgenm19' into 'master' 
Updated modern LDA deckgen data

See merge request core-developers/forge!880
 2018-08-26 09:27:17 +00:00
austinio7116
017f84c056 Updated modern LDA deckgen data 2018-08-26 08:01:22 +01:00
Blacksmith
97d4fef0bf Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-26 04:05:43 +00:00
Michael Kamensky
c5d853d5af Merge branch 'fixups' into 'master' 
catch and record benign network play exception

See merge request core-developers/forge!877
 2018-08-26 03:57:59 +00:00
Michael Kamensky
f7c7159942 Merge branch 'multi-select' into 'master' 
fix human player multi-select

See merge request core-developers/forge!878
 2018-08-26 03:57:21 +00:00
Jamin W. Collins
eaeb2838e0 fix human player multi-select 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-25 05:51:07 -06:00
Jamin W. Collins
f500f6837f catch and record benign network play exception 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-24 20:21:13 -06:00
Blacksmith
a9292924ae Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-23 16:35:42 +00:00
Sol
fb5710eeec Merge branch 'EditionTrackingFix' into 'master' 
Update EditionTracking.py to work with new formats directory structure

See merge request core-developers/forge!876
 2018-08-23 16:24:44 +00:00
Mitchell Matthews
65282bee6a Update EditionTracking.py to work with new formats directory structure 2018-08-23 12:22:17 -04:00
Mitchell Matthews
0a3532d4c5 Update EditionTracking.py to work with new formats directory structure 2018-08-23 11:54:47 -04:00
Michael Kamensky
f217b3da3a Merge branch 'new_cards' into 'master' 
Adding Xantcha and Spellseeker

See merge request core-developers/forge!872
 2018-08-22 16:20:20 +00:00
tehdiplomat
83254033fb Add description for Xantcha 2018-08-22 12:13:24 -04:00
Michael Kamensky
2c3e7257c7 Merge branch 'rampageFix' into 'master' 
CardFactoryUtil: Rampage use :

See merge request core-developers/forge!874
 2018-08-22 16:10:14 +00:00
tehdiplomat
746c8b7d8f Fix Xantcha activated ability 2018-08-22 11:00:59 -04:00
Hanmac
367875c15c CardFactoryUtil: Rampage use : 2018-08-22 12:37:59 +02:00
Michael Kamensky
1254a03782 Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M196.

See merge request core-developers/forge!873
 2018-08-22 04:08:20 +00:00
Agetian
85a386d58d - Added puzzle PS_M196. 2018-08-22 07:07:40 +03:00
tehdiplomat
afc3182aa0 Adding Xantcha and Spellseeker 2018-08-21 21:03:17 -04:00
Michael Kamensky
e968afbd87 Merge branch 'timestampStateFix' into 'master' 
Timestamp state fix

Closes #594 and #647

See merge request core-developers/forge!860
 2018-08-21 20:26:42 +00:00
Michael Kamensky
95e9a0bcc8 Merge branch 'EquipInstantSpeed' into 'master' 
GameActionUtil: EquipInstantSpeed should affect the player

See merge request core-developers/forge!871
 2018-08-21 16:41:40 +00:00
Michael Kamensky
78a090dfd9 Merge branch 'newPerspectivesCyclingFix' into 'master' 
GameActionUtil: fix CyclingForZero

Closes #653

See merge request core-developers/forge!870
 2018-08-21 16:21:16 +00:00
Hanmac
2603d14b7e GameActionUtil: EquipInstantSpeed should affect the player 2018-08-21 17:43:17 +02:00
Hanmac
ed04025b3b GameActionUtil: fix CyclingForZero 2018-08-21 15:18:49 +02:00