external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,018 Commits 32 Branches 187 Tags
2e81a939b9aa4ddf66925c20a8ba18f1586b6fc9
Commit Graph

39018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
858642510f Merge branch 'm19deckgenupdate2' into 'master' 
Latest LDA data for Standard - more archetypes and more data

See merge request core-developers/forge!869
 2018-08-20 04:41:25 +00:00
austinio7116
abb1ec890a Latest LDA data for Standard - more archetypes and more data 2018-08-19 06:39:03 +01:00
Hanmac
04202f0fb4 WrappedAbility: exclude Token from WrappedCheck 2018-08-18 19:39:00 +02:00
Hanmac
68e40254f8 CardFactoryUtil: more LKI for Triggered Keywords 2018-08-18 11:11:25 +02:00
Hanmac
fb3e0f1445 WrappedAbility: return timestampCheck but with extra checks 2018-08-18 08:46:38 +02:00
Hanmac
3aa5d191fa cards: add some LKI to some DealDamage effects 2018-08-18 08:46:38 +02:00
Hanmac
0f3ac8c212 WrappedAbility: remove faulty check 2018-08-18 08:46:38 +02:00
Hanmac
5f385f8a40 cards: update cards 2018-08-18 08:46:38 +02:00
Hanmac
baf4a17ceb Effects: add gameCardState check with equalWithTimestamp 2018-08-18 08:46:38 +02:00
Hanmac
e2c33b089c Card: fix equalsWithTimestamp and timestamp of LKI 2018-08-18 08:46:38 +02:00
Michael Kamensky
97d0e4f1b7 Merge branch 'moar_c18_cards' into 'master' 
Add the right conditional for Yennett

See merge request core-developers/forge!867
 2018-08-18 04:13:52 +00:00
tehdiplomat
63c06ed7cb Add the right conditional for Yennett 2018-08-17 22:11:02 -04:00
Sol
f7230cbff3 Update Commander Anthology Vol. II.txt 2018-08-17 19:51:38 +00:00
Michael Kamensky
8627ecb165 Merge branch 'afflictFix' into 'master' 
Afflict use :

See merge request core-developers/forge!866
 2018-08-17 15:49:52 +00:00
Hanmac
553a794642 Afflict use : 2018-08-17 17:31:49 +02:00
Michael Kamensky
bf3ce5b68a Merge branch 'feature-request' into 'master' 
only display the ante tab when playing for ante

Closes #381

See merge request core-developers/forge!863
 2018-08-17 15:25:07 +00:00