External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 14:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
12909 commits 38 branches 229 tags 961 MiB
Commit graph

1815 commits

Author SHA1 Message Date
betasteward
0007099eb3 disabled SSL - not necessary - nice to have but makes debugging more difficult 2015-09-29 08:13:27 -04:00
LevelX2
f4108f4e72 Updated to 1.4.5v0 2015-09-27 19:38:52 +02:00
LevelX2
78a3e649bc Fixed CardInfo and ExpansionInfo compare with server. Fixed UserData update. 2015-09-27 19:38:24 +02:00
LevelX2
36a48780e4 Merge commit 'b95d7ca705' into Network_Upgrade 
Conflicts:
	.gitignore
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Server/src/main/java/mage/server/Session.java
 2015-09-27 15:06:14 +02:00
LevelX2
b95d7ca705 * Fixed some problems with new avatar handling. 2015-09-27 14:50:44 +02:00
LevelX2
23cd772fea * Fixed that using a previous internal avatar ID did create an exception while playing/watching a game. 2015-09-27 14:11:56 +02:00
LevelX2
9d3619b68c * Some rework of preferences avatar panel. 2015-09-26 01:10:05 +02:00
LevelX2
2023686ee8 * Some minor changes. 2015-09-25 23:22:54 +02:00
LevelX2
044e8b70f0 Some minor changes for BFZ token image handling. 2015-09-23 19:53:25 +02:00
betasteward
3a9bfcb1c6 moved deck generator functions to framework - want to reuse in other test project 2015-09-22 09:49:35 -04:00
LevelX2
5bed5aeff7 * Fixed null pointer exception for download with mythicspoiler. 2015-09-21 19:21:23 +02:00
LevelX2
9ab323a89c Deck editor - renamed sort type "Color Detailed" to "Color Identity" and compare for the sort also with mana symbols in casting cost and rules. 2015-09-21 08:11:58 +02:00
LevelX2
322eae2ec6 Deck editor - renamed sort type "Color Detailed" to "Color Identity" and compare for the sort also with mana symbols in casting cost and rules. 2015-09-21 00:31:42 +02:00
LevelX2
ed15f0b86b Fixed that not BFZ images were downloaded from mysticspoliers source. Fixed that Zendikar Expeditions images were not downloaded from mysticspoliers source. 2015-09-20 20:23:36 +02:00
fireshoes
f2b7771d59 [BFZ] Implemented Prism Array, Sanctum of Ugin, Spawning Bed, Makindi Sliderunner , Snapping Gnarlid, Molten Nursery, Pilgrim's Eye 2015-09-17 20:35:14 -05:00
betasteward
2d8cdd7a08 fixed a NPE when disconnecting from chat 2015-09-11 13:00:42 -04:00
betasteward
49558e091d Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
	Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
 2015-09-10 10:30:51 -04:00
LevelX2
9a37bd28ad Xmage 1.4.4v0 2015-09-05 12:51:07 +02:00
LevelX2
fe80d292ab Some changes for token download. 2015-09-05 01:53:48 +02:00
LevelX2
707c1acf6b * Added an option to auto order triggers with the same text. Added options to pass priority automatically after spell cast and ability activation. Fixed a problem of the tests with the new Scry mulligan. 2015-09-04 00:25:23 +02:00
Simown
1bdc54556a Fixed a bug in random deck generation where generating a deck from a set 
with too few cards caused an exception. Minor formatting fixes.
 2015-09-03 21:30:15 +01:00
betasteward
c0e90b9d35 added getCards method - fixes update database issue 2015-09-03 16:05:53 -04:00
Simown
14148b25db Fixed a bug in random generation where selecting a set which had no basic lands caused an error. Partially fixes #1242 2015-09-03 19:40:12 +01:00
betasteward
b9df27c292 remove stored references to Client - retrieve from MageFrame instead 2015-09-03 13:27:06 -04:00
fireshoes
cb01b0ee05 Implemented [BFZ] Omnath, Locus of Rage, [MRD] Dross Scorpion, and[SCG] Vengeful Dead. Changed some cards from using DiesCreatureTriggedAbility to DiesThisOrAnotherCreatureAbility. 2015-08-30 14:47:21 -05:00
fireshoes
9e1f67fa1a [BFZ] Implemented Felidar Cub, Incubator Drone, Barrage Tyrant, Mist Intruder, Gideon's Reproach, Kozilek's Channeler, and Eldrazi Scion Token. [ONS] Implemented Airdrop Condor. 2015-08-30 02:52:11 -05:00
LevelX2
e32e7a4638 Added a fix for the serverlist URL setting to automatically switch xmage.info to xmage.de. 2015-08-29 09:42:17 +02:00
LevelX2
dfe1e2ef5a Some minor changes. 2015-08-28 16:52:33 +02:00
LevelX2
b6c3355329 [BFZ] Added Devoid and Ingest keywords. 2015-08-28 16:51:37 +02:00
LevelX2
423e1fd368 * Triggered abilities order selection is applied immediately now. 2015-08-28 15:16:24 +02:00
LevelX2
39e62095e4 Fixed some dialogs for human players that were not shown after a reconnect to a game (e.g choose mulligan, any use Yes/No choice, amount choice, Pile choice). 2015-08-28 14:29:54 +02:00
LevelX2
758f56792e * Added button popup menu to be able to automatically answer ability related "Yes" / "No" requests (related to #328). 2015-08-28 11:44:14 +02:00
LevelX2
76badb4186 Fixed problem with updating UserData. 2015-08-27 17:10:55 +02:00
LevelX2
ad9f325b72 Merge origin/master into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/MageFrame.java
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Common/src/mage/view/UserDataView.java
 2015-08-27 15:23:31 +02:00
LevelX2
b63cc121ef Some minor changes. 2015-08-27 14:51:21 +02:00
LevelX2
155b7fafd0 Merge origin/master into Network_Upgrade 2015-08-27 14:37:49 +02:00
LevelX2
97a8b351b4 Fixed a problem that show cards window was not closed (e.g. for libraray card selection). 2015-08-26 16:30:32 +02:00
LevelX2
0ee22d90ca Allow hand card ordering by drag'n'drop only with left mouse button. 2015-08-26 16:29:57 +02:00
betasteward
1e60605d84 Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/cards/Card.java
	Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
 2015-08-25 14:07:31 -04:00
betasteward
2895a63b68 fixed attachments appearing in front 2015-08-25 11:16:03 -04:00
LevelX2
532d4e0af0 * Added automatic handling for order of triggered abilities going to stack (fixes #701 / related to #328). 2015-08-22 19:29:57 +02:00
betasteward
a0f02fc8b7 moved MultiConnectTest to Mage.Servers.Tests project 2015-08-21 15:55:24 -04:00
betasteward
96b83e3387 fixed missing skill level values 2015-08-21 14:21:49 -04:00
betasteward
b3d739e2c0 Merge branch 'Network_Upgrade' of https://github.com/magefree/mage into Network_Upgrade 2015-08-21 10:41:31 -04:00
betasteward
aa5e0baeee fixed title + NPE on DeckEditor 2015-08-21 09:03:35 -04:00
LevelX2
23039572f2 Xmage 1.4.3v3 2015-08-21 09:49:53 +02:00
betasteward
b9c8a2598d Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
 2015-08-19 14:49:46 -04:00
betasteward
129b6d1e82 cleanUp 2015-08-19 11:05:33 -04:00
LevelX2
386204c085 * Draft log - Fixed a bug that the last pick was logged twice. 2015-08-19 11:46:57 +02:00
betasteward
b4edc1bda1 fixed EOL character for non-windows scripts 2015-08-18 21:08:09 -04:00