External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 04:22:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
12660 commits 38 branches 229 tags 960 MiB
Commit graph

1799 commits

Author SHA1 Message Date
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
betasteward
d27513752d fixed not running triggered actions in EDT 2015-08-18 20:59:20 -04:00
betasteward
db6fcadabe fixed missing SSL setting 2015-08-18 08:06:50 -04:00
LevelX2
e2625fd60e * Show card pick dialog - Fixed a bug that the select window was hidden if you clicked and released the mouse button on the edges of the window. 2015-08-18 12:29:57 +02:00
fireshoes
1d86561dd3 Updated mtg-cards-data with 4 new BFZ cards and all DDP cards. Added DDP set and reprints. Implemented Retreat to Kazandu and Veteran Warleader for BFZ/DDP. Implemented Battle Squadron and Lithophage. Fixed Phage the Untouchable creature type. 2015-08-17 14:20:01 -05:00
betasteward
d9f1d71d98 Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
	Mage.Client/src/main/java/mage/client/table/TablesPanel.java
	Mage.Common/src/mage/view/CardView.java
 2015-08-17 09:20:44 -04:00
LevelX2
917d576de2 Merge pull request #1192 from gerschulle/draft-log 
Add option to log draft picks into a file for review after the game
 2015-08-13 11:21:56 +01:00
jonhwoods
3addd1dd2a Sounds Update 
Made the sounds shorter, quieter and less agressive using normalization,
fade in and fade outs
 2015-08-12 12:52:41 -04:00
Gerhardt Schulle
54c1e4f66c Add option to log draft picks into a file for post review after the game. 2015-08-09 21:35:49 +02:00
LevelX2
c98577cc6a Xmage 1.4.3v0 2015-08-06 22:18:01 +02:00
LevelX2
e7ecdefce2 Added example decks. 2015-08-06 16:22:52 +02:00
LevelX2
7a90db7995 * Fixed sluggishness of player selection. Reworked flag display in avatar image. 2015-08-06 00:31:50 +02:00
LevelX2
cbbc70d26b * Made table filter more accurate and moved Historical and Super Standard format to Other filter. 2015-08-05 00:07:53 +02:00
LevelX2
8dca887fad * Added tooltip to the flag in the player avatar. 2015-08-02 12:41:29 +02:00
LevelX2
768fd17d93 * Some spelling changes. 2015-07-26 09:19:46 +02:00
fireshoes
5897f1595a Implemented Glissa Sunseeker, Phyrexian Furnace, Flickering Ward, Cho-Manno's Blessing, Meng Huo Barbarian King, Sword of the Chosen, Pentarch Ward, Order of the Stars, Ancestral Mask, Jedit Ojanen of Efrava, Krosan Restorer, & Nature's Kiss. Added set Battle for Zendikar and spoiled Evolving Wilds. 2015-07-24 00:21:32 -05:00
Simown
a6bab84c85 Generated deck name/path is now a timestamp. 
Changed deck generator to use a timestamp of the current time to the millisecond as the generated deck name.
This gets rid of the random UUID filling up the deck path and generated deck name.
 2015-07-19 13:39:38 +01:00