github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-18 11:09:31 +00:00
Code Issues Projects Releases Packages Wiki Activity
37773 commits 2 branches 0 tags 782 MiB
Commit graph

3545 commits

Author SHA1 Message Date
spjspj
6516e7eea4
Merge pull request #4556 from spjspj/master 
Adding in way to render BFZ style full art lands (BFZ and HOU full ar…
 2018-02-28 00:54:04 +10:00
spjspj
596ca5be86 Adding in way to render BFZ style full art lands (BFZ and HOU full art lands) 
Things still to do:
1) Get everyone to download the full art Face images ...
2) Add in the collector number to the Face images (<ImageDirector>/FACE/ZEN/Island.<numberneeded>.jpg for example)
4) Maybe even add in an UST (Unstable) way of rendering lands (with the swoosh of opaque full art down the bottom).
 2018-02-28 01:25:29 +11:00
spjspj
154c2121b1
Merge pull request #4555 from spjspj/master 
Modifying zendikar curved box to use a path instead. (Will be easier …
 2018-02-28 00:35:02 +11:00
spjspj
a28e273dcc Modifying zendikar curved box to use a path instead. (Will be easier to then draw BFZ lands similarly). 2018-02-28 00:02:14 +11:00
Shaun Hannah
7c7f88ab3c [WIP] S3 Upload of JSON log 2018-02-27 05:17:20 -05:00
Shaun Hannah
6aeb3c7c3a [WIP] Consumable JSON game logs 
As discussed in https://github.com/magefree/mage/issues/4515

This exposes a JSON log of game interactions that can be analyzed.

This is just a first pass, to get up to speed with how the messaging works. It'd like to trim down the messages much
further so they don't include redundant information in each message. Also gson supports much more advances serialization
options; such as using the @Expose annotation. We should probably use that, but I ran into some issues (I'm not a java
developer, so still learning).

TODO:
  These currently only exist on the client side; ideally we'd submit this logs back up to a central server after the
  games completion; thinking this could be simple via an S3 file drop, and a Lambda function to process and expose the
  logs; maybe via a kafka stream.

Examples of log messages are below:

```
{
  "gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
  "sessionId": "5c4o149-678483-je42ycva-1-je42ycw2-4",
  "type": "GAME_SELECT",
  "value": {
    "gameView": {
      "priorityTime": 3000,
      "players": [
        {
          "name": "computer",
          "life": 20,
          "counters": {}
        },
        {
          "name": "hooptie",
          "life": 20,
          "counters": {}
        }
      ],
      "hand": {
        "425d774f-ee0c-4a9b-8516-c98f886943f0": {
          "name": "Springleaf Drum",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{1}"
          ],
          "convertedManaCost": 1,
          "type": 0,
          "paid": false,
          "id": "425d774f-ee0c-4a9b-8516-c98f886943f0"
        },
        "dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff": {
          "name": "Blade of the Bloodchief",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{1}"
          ],
          "convertedManaCost": 1,
          "type": 0,
          "paid": false,
          "id": "dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff"
        },
        "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806": {
          "name": "Ornithopter",
          "power": "0",
          "toughness": "2",
          "loyalty": "",
          "manaCost": [
            "{0}"
          ],
          "convertedManaCost": 0,
          "type": 0,
          "paid": false,
          "id": "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
        },
        "a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64": {
          "name": "Springleaf Drum",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{1}"
          ],
          "convertedManaCost": 1,
          "type": 0,
          "paid": false,
          "id": "a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64"
        },
        "91239f4f-9003-4c48-8ca1-4c318f892489": {
          "name": "Cranial Plating",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{2}"
          ],
          "convertedManaCost": 2,
          "type": 0,
          "paid": false,
          "id": "91239f4f-9003-4c48-8ca1-4c318f892489"
        },
        "feb268d8-0535-4a9c-8915-83dd92a08c4c": {
          "name": "Arcbound Ravager",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{2}"
          ],
          "convertedManaCost": 2,
          "type": 0,
          "paid": false,
          "id": "feb268d8-0535-4a9c-8915-83dd92a08c4c"
        }
      },
      "canPlayInHand": [
        "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
      ],
      "stack": {},
      "combat": [],
      "phase": "PRECOMBAT_MAIN",
      "step": "PRECOMBAT_MAIN"
    },
    "message": "Play spells and abilities.",
    "options": {
      "queryType": "SELECT"
    }
  }
}
{
  "gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
  "sessionId": "5c4o149-678483-je42ycva-1-je42ycw2-4",
  "type": "SEND_PLAYER_UUID",
  "value": "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
}
{
  "gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
  "sessionId": "5c4o149-678483-je42ycva-1-je42ycw2-4",
  "type": "GAME_CHOOSE_PILE",
  "value": {
    "choices": {
      "1ecf8671-be4c-4060-a76b-af614235a5b7": "Cast Ornithopter"
    }
  }
}
{
  "gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
  "sessionId": "5c4o149-3v2cj2-je43178o-1-je43179f-4",
  "type": "GAME_INIT",
  "value": {
    "priorityTime": 3000,
    "players": [
      {
        "name": "computer",
        "life": 20,
        "counters": {}
      },
      {
        "name": "hooptie",
        "life": 20,
        "counters": {}
      }
    ],
    "hand": {
      "425d774f-ee0c-4a9b-8516-c98f886943f0": {
        "name": "Springleaf Drum",
        "power": "0",
        "toughness": "0",
        "loyalty": "",
        "manaCost": [
          "{1}"
        ],
        "convertedManaCost": 1,
        "type": 0,
        "paid": false,
        "id": "425d774f-ee0c-4a9b-8516-c98f886943f0"
      },
      "dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff": {
        "name": "Blade of the Bloodchief",
        "power": "0",
        "toughness": "0",
        "loyalty": "",
        "manaCost": [
          "{1}"
        ],
        "convertedManaCost": 1,
        "type": 0,
        "paid": false,
        "id": "dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff"
      },
      "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806": {
        "name": "Ornithopter",
        "power": "0",
        "toughness": "2",
        "loyalty": "",
        "manaCost": [
          "{0}"
        ],
        "convertedManaCost": 0,
        "type": 0,
        "paid": false,
        "id": "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
      },
      "a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64": {
        "name": "Springleaf Drum",
        "power": "0",
        "toughness": "0",
        "loyalty": "",
        "manaCost": [
          "{1}"
        ],
        "convertedManaCost": 1,
        "type": 0,
        "paid": false,
        "id": "a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64"
      },
      "91239f4f-9003-4c48-8ca1-4c318f892489": {
        "name": "Cranial Plating",
        "power": "0",
        "toughness": "0",
        "loyalty": "",
        "manaCost": [
          "{2}"
        ],
        "convertedManaCost": 2,
        "type": 0,
        "paid": false,
        "id": "91239f4f-9003-4c48-8ca1-4c318f892489"
      },
      "feb268d8-0535-4a9c-8915-83dd92a08c4c": {
        "name": "Arcbound Ravager",
        "power": "0",
        "toughness": "0",
        "loyalty": "",
        "manaCost": [
          "{2}"
        ],
        "convertedManaCost": 2,
        "type": 0,
        "paid": false,
        "id": "feb268d8-0535-4a9c-8915-83dd92a08c4c"
      }
    },
    "canPlayInHand": [
      "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
    ],
    "stack": {},
    "combat": [],
    "phase": "PRECOMBAT_MAIN",
    "step": "PRECOMBAT_MAIN"
  }
}
{
  "gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
  "sessionId": "5c4o149-3v2cj2-je43178o-1-je43179f-4",
  "type": "GAME_SELECT",
  "value": {
    "gameView": {
      "priorityTime": 3000,
      "players": [
        {
          "name": "computer",
          "life": 20,
          "counters": {}
        },
        {
          "name": "hooptie",
          "life": 20,
          "counters": {}
        }
      ],
      "hand": {
        "425d774f-ee0c-4a9b-8516-c98f886943f0": {
          "name": "Springleaf Drum",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{1}"
          ],
          "convertedManaCost": 1,
          "type": 0,
          "paid": false,
          "id": "425d774f-ee0c-4a9b-8516-c98f886943f0"
        },
        "dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff": {
          "name": "Blade of the Bloodchief",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{1}"
          ],
          "convertedManaCost": 1,
          "type": 0,
          "paid": false,
          "id": "dd41bb4b-7fc3-4a3c-a69c-d18e281a1bff"
        },
        "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806": {
          "name": "Ornithopter",
          "power": "0",
          "toughness": "2",
          "loyalty": "",
          "manaCost": [
            "{0}"
          ],
          "convertedManaCost": 0,
          "type": 0,
          "paid": false,
          "id": "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
        },
        "a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64": {
          "name": "Springleaf Drum",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{1}"
          ],
          "convertedManaCost": 1,
          "type": 0,
          "paid": false,
          "id": "a2f9cc13-e71a-4c9c-96aa-5424ea1a6b64"
        },
        "91239f4f-9003-4c48-8ca1-4c318f892489": {
          "name": "Cranial Plating",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{2}"
          ],
          "convertedManaCost": 2,
          "type": 0,
          "paid": false,
          "id": "91239f4f-9003-4c48-8ca1-4c318f892489"
        },
        "feb268d8-0535-4a9c-8915-83dd92a08c4c": {
          "name": "Arcbound Ravager",
          "power": "0",
          "toughness": "0",
          "loyalty": "",
          "manaCost": [
            "{2}"
          ],
          "convertedManaCost": 2,
          "type": 0,
          "paid": false,
          "id": "feb268d8-0535-4a9c-8915-83dd92a08c4c"
        }
      },
      "canPlayInHand": [
        "06eb0a6c-1e70-4dc0-bd1c-93b6ea444806"
      ],
      "stack": {},
      "combat": [],
      "phase": "PRECOMBAT_MAIN",
      "step": "PRECOMBAT_MAIN"
    },
    "message": "Play spells and abilities.",
    "options": {
      "queryType": "SELECT"
    }
  }
}
{
  "gameId": "2cede8c5-ff8e-4f8c-b9ac-66af53c0a254",
  "sessionId": "5c4o149-678483-je42ycva-1-je42ycw2-4",
  "type": "SEND_PLAYER_UUID",
  "value": "1ecf8671-be4c-4060-a76b-af614235a5b7"
}
```
 2018-02-26 19:23:00 -05:00
spjspj
871b035bb4
Merge pull request #4551 from spjspj/master 
Adding in way to render Zendikar full art lands.
 2018-02-26 15:31:10 +11:00
spjspj
afeb1c16ac Adding in way to render Zendikar full art lands. 
Things still to do:
1) Get everyone to download the full art Face images
2) Add in the collector number to the Face images (<ImageDirector>/FACE/ZEN/Island.<numberneeded>.jpg for example)
3) Add in the ability to draw say BFZ / HOU full art lands as well.
4) Maybe even add in an UST (Unstable) way of rendering lands (with the swoosh of opaque full art down the bottom).
 2018-02-26 15:22:59 +11:00
spjspj
576c1aec57 Adding in way to render Zendikar full art lands. 
Things still to do:
1) Get everyone to download the full art Face images
2) Add in the collector number to the Face images (<ImageDirector>/FACE/ZEN/Island.<numberneeded>.jpg for example)
3) Add in the ability to draw say BFZ / HOU full art lands as well.
4) Maybe even add in an UST (Unstable) way of rendering lands (with the swoosh of opaque full art down the bottom).
 2018-02-26 12:47:18 +11:00
Oleg Agafonov
8238139192 * UI: added SVG icons support on x64 linux systems (see #4421, must cleanup xmage\mage-client\lib folder); 2018-02-24 19:52:25 +04:00
Oleg Agafonov
e5ef545d8f * UI: fixed wrong feedback panel color for non active turn; 2018-02-23 18:21:08 +04:00
LevelX2
1ef84278c2
Merge pull request #4419 from rsypen/master 
Fixed local server time in client's chat messages
 2018-02-15 15:16:52 +01:00
L_J
3dbd5a72c4
Merge branch 'master' into Zzooouhh-banding-final 2018-02-15 00:49:08 +01:00
L_J
3f1499ef76
Adjusted banding arrow position 2018-02-14 23:44:31 +00:00
LevelX2
9fb71b98c4 Xmage 1.4.27V4 2018-02-14 23:05:59 +01:00
L_J
cb63931d35
Adjusted banding arrow position 2018-02-14 15:26:03 +00:00
LevelX2
3b19304f64 * Fixed that soulbond arrow to paired card was not shown and improved soulbond text on permanent. 2018-02-14 12:41:44 +01:00
L_J
e7301e2c08
Implemented banding (#41) 2018-02-13 20:36:25 +01:00
LevelX2
6d848e2059 * Fixed a bug that turn rollback did not work correctly, if player was in a buy cost process that included possible rollback (fixes #4510). 2018-02-12 11:41:01 +01:00
LevelX2
fc8604e449 Added proxy handling to tokens.mtg.onl image download. 2018-02-12 11:39:18 +01:00
LevelX2
c9603d1994 * Some fixes to token image downloading. 2018-02-11 23:30:15 +01:00
LevelX2
ac9b03d277 * Changed the connect/disconnect button to include the text directly in the menu button. 2018-02-09 23:27:35 +01:00
Oleg Agafonov
5c44bef2ea Fixed "all attack" button position 2018-02-05 10:45:07 +04:00
Oleg Agafonov
ae7620918e Fixed wrong hint for rarity button in deck editor 2018-02-04 23:05:38 +04:00
LevelX2
cafd251e74 * Fixed client filter not showing MTGO 1v1 Commander tables. 2018-02-04 18:34:54 +01:00
Oleg Agafonov
ff6ec8222a UI: added settings to setup battlefield panel colorizing (default is multicolor; preferences -> main -> battlefield; see #1201) 2018-02-04 21:06:06 +04:00
Oleg Agafonov
ec5c8a01df UI: added different colors for current turn phase (same as buttons -- see #1201) 2018-02-04 12:48:50 +04:00
Oleg Agafonov
5947326a4f UI: added green colorized panel on player's priority (see #1201) 2018-02-04 12:09:21 +04:00
Oleg Agafonov
5fa20278b0 UI: improved ask dialog (same size for all buttons) 2018-02-04 09:53:40 +04:00
LevelX2
82defb2ab8 * Removed land set restriction on limited add land dialog (fixes #4373). 2018-02-03 18:35:47 +01:00
Oleg Agafonov
66eb1de7f1 Fixed v1 server incompatible with v0 clients (freezes on game startup) 2018-01-28 17:57:55 +04:00
Oleg Agafonov
2870c3ab2a Cleanup 2018-01-27 12:54:16 +04:00
spjspj
71a1097b1c Update connection dialog to point to Xmage.us from xmage.woogerworks.com 2018-01-27 11:28:46 +11:00
spjspj
0c63fc04b4 Update connection dialog to point to Xmage.us from xmage.woogerworks.com 2018-01-27 01:52:31 +11:00
Oleg Agafonov
321a45140b UI: added more info on card's tooltip delay/disable 2018-01-25 08:15:12 +04:00
spjspj
8db20dbe8d
Merge pull request #4430 from spjspj/master 
Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)
 2018-01-19 22:20:03 +11:00
spjspj
b26cd21f02 Fix M15 colors for GW (was WG), GU (was UG), RW (was WR) 2018-01-19 20:33:17 +11:00
spjspj
af48b17451 Fix M15 colors for GW (was WG), GU (was UG), RW (was WR) 2018-01-19 20:30:12 +11:00
Oleg Agafonov
89f5967441 * [RIX] Added missing tokens (tokens.mtg.onl is updated with 150+ images too); 2018-01-18 07:02:02 +04:00
rsypen
ccd121277a
Fixed local server time in client's chat messages 2018-01-15 09:17:35 +01:00
Oleg Agafonov
b0a8967a3b Fixed non working SVG symbols on machines without JDK (see #4410) 2018-01-14 06:54:23 +04:00
LevelX2
40afa04b24 xmage 1.4.27V0 2018-01-13 22:54:53 +01:00
LevelX2
2e3ba7e104 Added designation names to player tooltip. 2018-01-13 18:55:07 +01:00
LevelX2
b10182ab29 Activated RIX download from WOTC source. 2018-01-13 10:24:12 +01:00
Oleg Agafonov
8e3b610a0c Tests: fixed performance problem (x20 speed up, no need to call full garbage collector manually) 2018-01-09 19:27:25 +04:00
Oleg Agafonov
c07e3d327c Fixed wrong images download for two side cards (clean cards*.db and images needed) 2018-01-07 22:29:37 +04:00
LevelX2
690c04f5fc [RIX] Added 3 cards. 2018-01-07 15:05:20 +01:00
Oleg Agafonov
1280565928 Fixed images downloading from scryfall (two sided cards) 2018-01-07 04:41:07 +04:00
Oleg Agafonov
f80aae5161 Updated tests 2018-01-05 02:21:56 +04:00
Oleg Agafonov
0c38fffdef Fixed not working PickAmount window (not visible) 2018-01-04 07:53:38 +04:00
LevelX2
2672bd36d5 [Rix] Added Jouney to Eternity and Jadelight Ranger. 2018-01-03 11:40:44 +01:00
Oleg Agafonov
050a70b7db UI: fixed #4329 - errors on card selection in linux (debian) 2018-01-02 19:38:08 +04:00
Oleg Agafonov
9009d72c82 UI: increased tooltip time before hide (60 secs) 2018-01-02 00:15:44 +04:00
Oleg Agafonov
c1bf846973 UI: added new memory statistics, warnings and hints (see #4324) 2018-01-02 00:14:29 +04:00
Oleg Agafonov
1ad8529df8 Fixed chrismas time fail on new year :-( 2018-01-01 20:51:56 +04:00
Oleg Agafonov
56d214f0b2 UI: added set search button in new tournament dialog 2018-01-01 18:02:20 +04:00
Oleg Agafonov
78d036b6bb UI: fixed windows layer problems when old window overlapped new window (see #4318, #4320 and other) 2018-01-01 18:00:42 +04:00
Jonathan Skeate
32cdd3b1ea
Add rarity filters to deck editor 2017-12-31 12:03:31 -05:00
Oleg Agafonov
54e7c3cc99 Added new UI icons for rarity buttons (20 and 32 sizes) 2017-12-31 17:41:00 +04:00
Oleg Agafonov
b697346cb6 Fixed fast search compatibly with non string data models 2017-12-31 00:26:54 +04:00
Oleg Agafonov
d0250f1cc1 UI: added set search button in add land windows (deck editor) 2017-12-30 23:15:36 +04:00
Oleg Agafonov
f9ef1388da Fixed #4305 - too big card numbers in viewer for some sets 2017-12-30 23:06:19 +04:00
LevelX2
529a38a96f Fixed some card download problems. 2017-12-30 18:36:03 +01:00
LevelX2
88b06137be Fixed handling of cards that exist multiple times for Unstable. 2017-12-30 18:35:47 +01:00
Oleg Agafonov
6b52f2efc3 UI: added set search button in viewer 2017-12-30 17:04:58 +04:00
Oleg Agafonov
a32b4b75af UI: added set search button in deck generator (but it bugged and disabled); 2017-12-30 16:03:49 +04:00
Oleg Agafonov
bb6482d7c2 Fixed typos 2017-12-30 07:26:37 +04:00
LevelX2
5d5c724565 Fixed land download from Gatherer source. 2017-12-29 11:33:56 +01:00
LevelX2
9325a5d311 Added Duel Decks: Merfolk vs. Goblins set. 2017-12-29 11:30:47 +01:00
Oleg Agafonov
35ba9dc493 About updated: added L_J and JayDi85 to devs list 2017-12-29 07:56:54 +04:00
Oleg Agafonov
1239592c2e UI: added fast set/expansion search button in deck editor 2017-12-29 06:13:01 +04:00
Oleg Agafonov
af0c77a409 UI: added custom sorting in choice dialog 2017-12-29 06:11:10 +04:00
Oleg Agafonov
72aef2638c UI: added close choice window with ESC button (if not required) 2017-12-29 04:03:31 +04:00
Oleg Agafonov
17bed090f0 UI: fixed inner country combobox data types; 2017-12-29 03:44:08 +04:00
Oleg Agafonov
800c0d20fc UI: added search flag button to connection dialog; 2017-12-28 22:39:10 +04:00
Oleg Agafonov
e4dfa5925b UI: added start selection value on choice dialog popup; 2017-12-28 22:38:18 +04:00
Oleg Agafonov
9d1f6ed48e Updated connection dialog (icons, hints and size fixes) 2017-12-28 03:53:10 +04:00
Oleg Agafonov
4654be5a7d Fixed card's round corner render (more like real card); 2017-12-28 03:45:32 +04:00
Oleg Agafonov
531b5bc569 Added auto enabled search for all pickup dialogs with many items; 2017-12-25 12:47:30 +04:00
Oleg Agafonov
749ca59ad6 Added new choose dialog (creature types and etc): 
* added incremental search;
 * added keyboard hotkeys (up/down for select, enter for choose);
 * added choose by mouse double click;
 * added source card name;
 * fixed cancel button on required choice (#4230);
 * fixed text sizes form messages (now it's auto size);
 2017-12-25 08:12:02 +04:00
Oleg Agafonov
42d3d558ff little fix 2017-12-23 19:48:00 +04:00
Oleg Agafonov
a80030e8aa Added new christmas logo (auto-enabled from december 15 to january 15) 2017-12-23 19:38:18 +04:00
Oleg Agafonov
39ca5a13f4 Added new set: Explorers of Ixalan (47 cards, 1 token) 2017-12-22 09:18:41 +04:00
Oleg Agafonov
a24c61079b Added new set Pro Tour Promos 2017-12-20 20:14:04 +04:00
Oleg Agafonov
c64da6abd9 World Magic Cup Qualifier: removed wrong cards, fixed card numbers, fixed download from scryfall 2017-12-20 19:51:19 +04:00
Zzooouhh
7d86fe2d76
Fixed Nemesis image downloads from MythicSpoiler (fixes #4260) 2017-12-16 19:32:34 +01:00
spjspj
2a810e898f
Merge pull request #4251 from spjspj/master 
Add UST cards
 2017-12-16 09:22:38 +10:00
Oleg Agafonov
7a42ea416b Fixed #4252 (errors on paths with $ symbol) 2017-12-16 03:19:32 +04:00
spjspj
f4cc88bf2a Storm Crow 2017-12-15 22:04:42 +11:00
Oleg Agafonov
f39e4fd4ee - added card download for unstable set from scryfall; 
- changed client version from 9 to 10b;
 2017-12-10 17:43:37 +04:00
Oleg Agafonov
5fc0393bc7 Deck editor: 
+ added warning messages dialog after load/import decks with errors (instead throw exception);
 + added loading cursors on import-load decks;
 - fixed null exception error on empty/error deck loading;
 2017-12-08 00:20:18 +04:00
Oleg Agafonov
1efc062f66 Decks importer: 
+ added support for new decklist text format from deckstats.net (see #4228);
  + added new checks to text format (too many empty lines, too big card number: more then 100);
  + fixed double window popup on cancel/close import from clipboard window;
 2017-12-07 23:14:22 +04:00
Oleg Agafonov
5b7ab0de7a typo 2017-12-07 08:41:59 +04:00
Oleg Agafonov
66a70dd116 - Fixed #4220 - card viewer raise error with alternative card numbers; 
- Fixed potential error on getCardsByRarity;
- Added inner checks for wrong booster max card numbers settings;
 2017-12-07 08:01:54 +04:00
spjspj
35aa92ac72 Fix face images. 2017-12-06 00:03:12 +11:00
Oleg Agafonov
89fae4f33e Add svg symbols download from scryfall 2017-12-03 20:33:32 +04:00
LevelX2
b3a3e17aa2 [RIX] Activated Mythicspoiler as RIX image download source 2017-12-03 09:45:02 +01:00
Oleg Agafonov
77d31b37f0 Fix wrong images path in zips (compatible with old versions). 2017-11-30 01:56:41 +04:00
Oleg Agafonov
e3a1051499 UI changed: 
+ added default sorting for completed table (last ended on the top);
 + added "duration" column for completed table;
 - fix sorting for start, end and duration columns on completed table;
 + added new password and rated text for columns (more convenient for search);
 2017-11-28 01:44:05 +04:00
Oleg Agafonov
f706f9351d UI changed: 
+ added default sorting for tables on open (last created on the top);
 + added "time ago" format for created date column;
 2017-11-27 21:19:53 +04:00
Oleg Agafonov
6b4000bfe2 - small render fix 2017-11-27 09:27:40 +04:00
Oleg Agafonov
ab7d386689 - fixes 2017-11-27 08:35:21 +04:00
Oleg Agafonov
c29bac08d8 Refactor and fixed and images downloading and paths loading: 
- Added new images and symbols downloading;
 - Fixed user defined images path (now work for all images: cards, symbols, temp downloading);
 - Fixed not working cancel button at download window (it close window, but tasks is working, download and didn't save);
 - Fixed temp files trash all around images folder (on cancel button);
 - Fixed not saving new downloaded cards on cancel button (zip file didn't close on cancel);
 2017-11-27 08:09:52 +04:00
Oleg Agafonov
efee0b5328 Merge branch 'master' into svg-mana-icons-support 2017-11-26 18:44:48 +04:00
Oleg Agafonov
37dc9bf73c Added svg support: generate HQ png files for HTML texts 2017-11-26 18:37:29 +04:00
Oleg Agafonov
a5df082720 Added svg support: render empty mana symbols (by text) 2017-11-26 16:54:05 +04:00
Oleg Agafonov
7a1def128b Added svg support: new render for mana icons in tables (deck editor, draft) 2017-11-26 16:51:57 +04:00
Oleg Agafonov
f400cd5231 Refactor resource paths and constants: 
- delete duplicate consts;
 - correct paths and it uses;
 - fix loading icons from user defined dir;
 2017-11-26 16:50:42 +04:00
Oleg Agafonov
5cda60270c Added svg support: new render for mana icons in tables (deck editor, draft) 2017-11-26 00:50:25 +04:00
Oleg Agafonov
471f49c9c8 Added svg support: new lib, new icons for cards 2017-11-26 00:48:28 +04:00
spjspj
830874bc50 Fix exception 2017-11-26 01:15:24 +11:00
spjspj
00eb481004 spjspj - Add a version of Freeform Commander (any creature or legendary permanent can be commander, no ban list) 2017-11-25 22:14:20 +11:00
spjspj
8ab422f55c
Merge pull request #4191 from JayDi85/viewer-more-info 
Add more card's info to viewer (mage book)
 2017-11-24 21:02:47 +10:00
spjspj
763b8d30fd Add highlights to rendered card title and card type round boxes 2017-11-24 21:59:11 +11:00
spjspj
37fc07a256 Add highlights to rendered card title and card type round boxes 2017-11-23 23:44:51 +11:00
Oleg Agafonov
ca90f2dc45 Add more card's info to viewer (mage book) - full set name, card numbers and total stats 2017-11-23 06:30:49 +04:00
spjspj
184847b23d
Merge pull request #4182 from spjspj/master 
Slightly better rendering.
 2017-11-20 00:38:50 +11:00
spjspj
ea650dcab1 Slightly better rendering. 2017-11-20 00:36:54 +11:00
Oleg Agafonov
b78dab27a1 Little fix to always show icons and names for cards without images. 2017-11-18 16:44:34 +04:00
Oleg Agafonov
e2e4646863 Merge remote-tracking branch 'remotes/origin/master' into new-card-render 2017-11-18 15:04:02 +04:00
Oleg Agafonov
0a0475bd38 Battlefield text position fix 2017-11-18 06:40:01 +04:00
Oleg Agafonov
0689bfca40 comment type 2017-11-18 05:49:31 +04:00
Oleg Agafonov
a19e879021 "Can attack" draw fix 2017-11-18 05:40:24 +04:00
Oleg Agafonov
f81489c377 Add fallback card render (origin card render), see #4168 2017-11-18 05:13:38 +04:00
spjspj
7292683604
Merge pull request #4171 from spjspj/master 
spjspj - Add in a new way to allow just the Face Art for cards to be shown
 2017-11-18 10:30:44 +11:00
spjspj
4247954318 spjspj - Add in a new way to allow just the Face Art for cards into the viewer. 2017-11-18 01:37:10 +11:00
Oleg Agafonov
b53d57bce9 Fix error on download some symbols 2017-11-16 02:08:25 +04:00
Oleg Agafonov
feb53492e6 Add new checks for symbol download settings 
Fix error on download some symbols
 2017-11-16 02:08:25 +04:00
Oleg Agafonov
45aad8b6bc add new checks for symbol download 2017-11-15 02:57:05 +04:00
Oleg Agafonov
080b4fc1a2 Add new logs and checks in symbols download (for easy setup and fix settings) 2017-11-15 01:44:10 +04:00
Oleg Agafonov
12b420d68b Add new logs and checks in symbols download (for easy setup and fix settings) 2017-11-15 00:09:31 +04:00
Oleg Agafonov
b97edec5b9 Fix error on download backside.jpg symbol 2017-11-12 07:34:45 +04:00
Oleg Agafonov
9b95e20d83 Fix error on download images of Ixalan set from Wizards site 2017-11-12 06:16:29 +04:00
Oleg Agafonov
badaed63cb fix #4148 error on downloading double faces cards from scryfall 2017-11-12 02:06:24 +04:00
Oleg Agafonov
62aed011a3
fix issue #4148 on download image cards with quotation mark in names 2017-11-10 02:25:32 +04:00
LevelX2
8cf6a97616 * Fixed a problem with index out of bound for card renderer. 2017-11-04 18:20:17 +01:00
igoudt
9cbc2b7ea2 change client messages to enum rather than string 2017-10-03 15:18:31 +02:00
igoudt
6bde35f275 fixes #4079 2017-10-02 18:38:09 +02:00
spjspj
042e64aeb8 Add a 'your game can start' sound 2017-10-01 01:51:05 +10:00
spjspj
ed429b0c37 Add option to preferences to display full path to image of cards missing images. 2017-09-27 16:04:13 +10:00
spjspj
026e7d3e5d Add option to preferences to display full path to image of cards missing images. 2017-09-27 09:44:31 +10:00
LevelX2
0b3c24949f Added Ixalan set to the supported sets for image download by wizard source. 2017-09-22 10:00:29 +02:00
spjspj
b8b0170662 Add Tokens to card-pictures-tok for viewer. 2017-09-18 00:38:02 +10:00
LevelX2
3622206cf1 * Image download - added Ixalan & Iconic Masters to Scryfall and mythicspoilers.com. 2017-09-17 11:34:50 +02:00
LevelX2
ae0d87b7ec * Image download - added Ixalan & Iconic Masters to Scryfall and mythicspoilers.com. 2017-09-17 11:33:16 +02:00
LevelX2
9ae4e7d4ef Added logic to add manual links to MythicSpoilers image source. 2017-09-16 10:33:08 +02:00
LevelX2
b6212a943a Some minor changes. 2017-09-16 02:01:25 +02:00
LevelX2
75874df33f Fixed a problem of image download. 2017-09-16 00:11:19 +02:00
LevelX2
2117bfc17c Merge ReworkImageDownload 2017-09-15 23:23:49 +02:00
LevelX2
ac352537bf Merge origin/ReworkImageDownload into ReworkImageDownload 
Conflicts:
	Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
 2017-09-15 23:21:43 +02:00
LevelX2
eebc412ad9 Some updates to image download. 2017-09-15 23:19:11 +02:00
LevelX2
3fc3d96fe0 Some updates to image download. 2017-09-15 23:18:40 +02:00
LevelX2
d95a3e470c Updated some logic. 2017-09-12 17:25:18 +02:00
LevelX2
a280605591 Some updates. 2017-09-10 10:19:14 +02:00
Evan Kranzler
252c941b4f Refactored more subtypes usages to enum 2017-09-08 09:57:51 -04:00
LevelX2
96034c4c2b Updated some logic. 2017-09-08 15:22:09 +02:00
LevelX2
c9327b718d Updated some logic. 2017-09-06 17:49:55 +02:00
LevelX2
7329dc6c3f Some more changes to image download. 2017-09-05 00:12:09 +02:00
LevelX2
5a1544050c Updated image download handling. 2017-09-04 18:25:31 +02:00
LevelX2
d003cd898f Image download by set with source restriction to supported sets. 2017-09-04 07:57:10 +02:00
LevelX2
452c05543d Added Ixalan image download from mythic spoilers source. 2017-09-03 10:10:09 +02:00
LevelX2
a46538fc06 Removed some unused code. 2017-09-01 16:03:43 +02:00
spjspj
4fe4279239 Add in the C17 decks (Vampire and Cat one have 1 card not implemented each) 2017-08-31 02:11:05 +10:00
LevelX2
9ac7fe27f0 * Vindictive Lich (mode target handling not fixed yet). 2017-08-21 18:49:37 +02:00
spjspj
4687943176 Update penny dreadful list (http://pdmtgo.com/legal_cards.txt) 2017-08-20 22:01:19 +10:00
spjspj
fc31753695 PD implement.. 2017-08-19 16:08:19 +10:00
LevelX2
cb8b4d8cbf Fixed some problems that table dialogs were not closed if the table controller closed the table. 2017-08-18 00:12:12 +02:00
LevelX2
1fb24116ae xmage 1.4.26V0 2017-08-15 01:27:06 +02:00
LevelX2
bae7f154df Changed user disconnect handling. The user in the server is no longer deleted directly after connection problem, disconnect or quit. The user object remains now for 8 minutes so the rejoin not possible after disconnect problem should be solved (I hope so). We will see. Also fixed the problem, that the table panel was not shown, if a player disconected and reconected. 2017-08-13 16:22:18 +02:00
LevelX2
9a1ce3f449 Merge pull request #3769 from Eleros/feature/HASCON2017Promos 
Feature/hascon2017 promos
 2017-08-04 22:39:20 +02:00
spjspj
6435b9950a Add in Penny Dreadful EDH format (plus filter options for deck editor). 2017-08-04 17:13:25 +10:00
Saga\Robert
2e1a820040 - added gold color 
- added gold Dragon Token
- edited new set data (H17) for Sword of Dungeons and Dragons
 2017-08-01 14:55:17 +02:00
LevelX2
7b168a9d5e * Minds Aglow - Fixed that payed mana can be undone if X was set to a too high value. 2017-07-30 18:50:36 +02:00
LevelX2
fe2ee5dfec Xmage 1.4.25V0 2017-07-29 20:35:16 +02:00
LevelX2
7ba051871d * Fixed minor bug that the tables list was not cleared if no active table did exist. 2017-07-29 20:22:07 +02:00
LevelX2
a35abd7f8c * Deactivated macro button, becuase it's not working correctly (#2147). 2017-07-29 19:13:13 +02:00
LevelX2
5cca05dd23 * Fixed bug in download images logic (fixes #3756). 2017-07-29 17:53:28 +02:00
LevelX2
052fbb3ab6 Merge origin/master 2017-07-29 17:39:36 +02:00
LevelX2
400bbba8e1 * Deactivated macro button, becuase it's not working correctly (#2147). 2017-07-29 17:39:13 +02:00
spjspj
e8147a4860 Merge pull request #3755 from spjspj/master 
Mana Circles for deck analysis
 2017-07-30 00:00:12 +10:00
spjspj
b6a7998eab Mana Circles for deck analysis 2017-07-29 23:55:58 +10:00
LevelX2
18cab46b05 * Improved editor search function, fixed some problems with search for split card rules. 2017-07-29 11:43:05 +02:00
LevelX2
cd6c7623ed * Added missing imports, imports reorg. 2017-07-23 16:29:29 +02:00
spacemoses
19d1c7e987 Removing hardcoded User-Agent header causing error for card image retrieval 2017-07-22 13:23:49 -05:00
ingmargoudt
09f0c9ad97 huge rework on subtypes (#3668) 
* huge rework on subtypes

* update for coat of arms

* fix test
 2017-07-16 16:57:39 -05:00
LevelX2
60951f645b * Removed magiccards.info as download source. 2017-07-16 19:10:10 +02:00
LevelX2
1fe841e6d9 Merge branch 'master' into master 2017-07-10 13:18:58 +02:00
fireshoes
48413a956a Added MTGO 1v1 Commander and Amonkhet Block Constructed formats. Fixed a typo in the Duel Commander banlist. 2017-07-09 16:51:57 -05:00
LevelX2
2b94ed232a Fixed minor spelling error in preferences. 2017-07-09 15:31:32 +02:00
Benjamin Maitland
8e16cf0bd6 Added the Old School 93/94 Format. Uses original rules. 2017-07-08 23:40:27 -04:00
LevelX2
7d911ae803 XMage 1.4.24V0 2017-07-08 16:33:09 +02:00
fireshoes
a1c574bfda Added Planechase Anthology, updated Media Inserts and Judge Promos 2017-07-07 14:27:29 -05:00
spjspj
495a84f1f1 Implement 2 cards (HOU) Fix for Bontu's Last Reckoning 2017-07-04 19:07:17 +10:00
spjspj
5a7a9049d9 Merge pull request #3549 from spjspj/master 
Implement The Locust God (HOU)
 2017-06-27 21:33:21 +10:00
spjspj
6d35de829f Implement The Locust God (HOU) 2017-06-27 21:32:14 +10:00
LevelX2
9b31a5a7e3 Merge pull request #3516 from ruler501/summerproject 
Shortcut/Macro System
 2017-06-26 17:53:49 +02:00
spjspj
e683a579b3 Merge pull request #3512 from spacemoses/master 
Enhancement #3222 - Adding scroll to clipboard import in deck builder
 2017-06-25 23:16:21 +10:00
Devon Richards
fee630a0ac Small cleanup 2017-06-24 11:23:58 -05:00
LevelX2
442d8ebc78 * Added HOU spoilers 2017-06-24. 2017-06-24 11:00:21 +02:00
Ben Homer
b68091683a Added keybinding to preferences and improved UI appearance with new image file. 2017-06-22 01:42:01 -05:00
Devon Richards
0d98514550 Added better UI and made it work with most categories of combos 2017-06-21 01:09:54 -05:00
Devon Richards
028d7ed1f8 Initial working product. Doesn't handle skipping stack. 2017-06-20 19:54:16 -05:00
spacemoses
882060bf3e Enhancement #3222 - Adding scroll to clipboard import in deck builder 2017-06-18 18:44:59 -05:00
Quercitron
0c9c7c0a56 Add scryfall.com as a source for card images (closes #3496). 2017-06-17 17:55:35 +03:00
fireshoes
52b4633340 Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01. 2017-06-05 16:00:13 -05:00
LevelX2
b62a15f68e Merge pull request #3454 from drmDev/add/welcomedeck2017 
adding welcome deck 2017 (see #3453)
 2017-06-03 10:31:49 +02:00
Anders Åstrand
4d0e8cb443 Review fixes 2017-05-30 18:55:40 +02:00
Derek Monturo
1d662a0a58 adding welcome deck 2017 - closes #3453 2017-05-30 07:31:14 -04:00
Anders Åstrand
ad0507e739 Ban ignored users from watching 
This commit bans ignored users from watching
games where the creator has them on their ignore list.
 2017-05-29 21:36:42 +02:00
LevelX2
bd9b11fc49 Fixed some problems with popup window not been hidden if another frame is shown. 2017-05-27 14:35:50 +02:00
spjspj
e752ee3156 EDH Power level fix 2017-05-20 15:45:40 +10:00
spjspj
3cb7424dfd EDH Power updates 2017-05-16 23:14:33 +10:00
spjspj
f85c7e07ba Emblems refactor to show emblems in Card/Token Viewer 2017-05-14 13:43:18 +10:00
spjspj
5514787871 Merge pull request #3350 from spjspj/master 
Allow sort by EDH Power level in Deck Editor
 2017-05-11 17:54:23 +10:00
spjspj
347d08298f Allow sort by EDH Power level in Deck Editor 2017-05-11 17:52:43 +10:00
LevelX2
ea439505ce Some minor changes. 2017-05-09 17:02:30 +02:00
spjspj
0942db541f Token refactor 2017-05-08 23:26:33 +10:00
spjspj
f909005bb1 Token refactor 2017-05-08 23:20:33 +10:00
spjspj
bec0964726 Token refactor 2017-05-08 21:53:01 +10:00
spjspj
a897b374a0 Token refactor 2017-05-07 20:57:57 +10:00
spjspj
ba6e8409d1 Token refactor 2017-05-07 11:46:52 +10:00
spjspj
e73e7d8600 Token refactor 2017-05-06 23:35:14 +10:00
bugfi5h
72ec960c95 Merge branch 'develop' into feature/CopperAngel 2017-05-01 15:10:56 +02:00
spjspj
3f125db074 Merge pull request #3271 from spjspj/master 
spjspj - Remove Tokens from Card Viewer - need to reorg the tokens fi…
 2017-04-30 11:15:54 +10:00
spjspj
0d0fccc105 spjspj - Remove Tokens from Card Viewer - need to reorg the tokens first. 2017-04-30 11:14:24 +10:00
LevelX2
3cc157bc2c * Fixed null pointer exception problems in client. 2017-04-30 00:07:37 +02:00
spjspj
04f298923c spjspj - Add in Tokens to the Card Viewer (fix) 2017-04-29 17:42:08 +10:00
spjspj
241691b153 spjspj - Add in Tokens to the Card Viewer (first version) 2017-04-29 17:25:54 +10:00
bugfi5h
217e294470 Added Card: Copper-Leaf Angel 2017-04-27 21:25:30 +02:00
igoudt
05785f71b9 Make the implementations of CardImageSource an enum 2017-04-27 10:57:48 +02:00
igoudt
3f47d5a253 put inputstream in try body so it can be autoclosed 2017-04-27 10:57:48 +02:00
igoudt
0528555075 make DefaulActionCallback an enum and remove unused parameter 2017-04-27 10:57:48 +02:00
igoudt
ce26e5c8dd make the combatmanager an enum 2017-04-27 10:57:48 +02:00
igoudt
5b21f34941 rewrote gettypetext, added removeIf to TableModel 2017-04-27 10:57:48 +02:00
igoudt
27aea04820 move methods from cardutil to magepermanent, cardview:getColorText now uses ObjectColor.getDescription 2017-04-27 10:57:48 +02:00
Derek M
c4330415c1 Merge pull request #3241 from drmDev/master 
Unit test confirming issue #3195 with Combat Celebrant
 2017-04-25 22:09:14 -04:00
drmDev
04746c5f4f Unit test confirming issue #3195 allowing Celebrant to attack while exerted 2017-04-25 22:07:51 -04:00
igoudt
c1ce821340 fix on playertype enum comparison 2017-04-26 00:37:06 +02:00
spjspj
4c85d89b64 Fix for the audio trigger of 'Player joined the table' not being fired. 2017-04-25 20:12:21 +10:00
spjspj
a4e7c2b407 Fix for the audio trigger of 'Player joined the table' not being fired. 2017-04-25 18:17:28 +10:00
spjspj
4ed9419cbf Fill in missing str 2017-04-23 23:47:43 +10:00
spjspj
6ab4a94bd7 spjspj - Add in 'View Current Deck' option. 2017-04-23 13:06:09 +10:00
spjspj
8845d77628 spjspj - Remove View Limited Deck option 2017-04-22 19:35:08 +10:00
spjspj
0cd4e06e22 spjspj - Add a View Limited Deck option to allow you to see your deck during matches. 2017-04-22 19:16:12 +10:00
fireshoes
a86a1ebf5f Added Iconic Masters to known-sets/mtg-sets-data.txt 2017-04-20 10:37:16 -05:00
fireshoes
ad3e5749f5 Added Planeswalker Decks to Sample Decks. 2017-04-19 11:46:20 -05:00
spjspj
7ca5adff89 Merge pull request #3169 from spjspj/master 
Undo double tap of ok button (Leading to duplicate tournaments - Fixe…
 2017-04-19 10:31:18 +10:00
spjspj
5373997b30 Undo double tap of ok button (Leading to duplicate tournaments - Fixes #3154) 2017-04-19 10:30:40 +10:00
fireshoes
2c9c4888cc Added Commander 2017 to known sets. 2017-04-18 11:39:47 -05:00
spjspj
cdd010ffa2 spjspj - Add in saved configurations for New Match and New Tournament dialogs. 2017-04-18 01:52:04 +10:00
spjspj
1fcb7d2963 Revert 2017-04-17 20:00:56 +10:00
LevelX2
ef4cf90a0f Release 1.4.23V0 2017-04-17 10:53:59 +02:00
LevelX2
35791ac6b7 Set SocketWriteTimeout to 10 seconds. 2017-04-17 00:01:39 +02:00
LevelX2
ed341528d9 [AKH] Fixed that Aftermath card images were shown wrongly rotated. 2017-04-16 22:57:08 +02:00
Styxo
ee9613fa49 [AKH] Fixed wrong card names from MythicSpoiler download 2017-04-16 16:26:10 +02:00
LevelX2
e93218946c [AKH] Fixed dwonload of Aftermath images from Mythicspoilers. 2017-04-16 14:07:21 +02:00
spjspj
7937bcda9e Revert 2017-04-16 20:06:27 +10:00
LevelX2
bebb2a4de7 Fixed a problem that it was not possible to create tournaments with "Human" players ( related to #3083 ?). 2017-04-15 18:51:54 +02:00
Mark Langen
77586eec7e Add 30 AKH card implementations 
* Some of the cards still need testing. Will fix and problems and update tomorrow, but pushing them for now to make it clear what's been implemented so far.
 2017-04-15 04:24:14 -06:00
Mark Langen
b1ed5c3632 Fixed deck editor Drag & Drop 
* Deck editor drag and drop was broken by the window borders change. Still not entirley sure what the root cause is (for some reason SwingUtilities.getDeepestComponentAt won't work correctly with the new setup), but this will fix it by expliticly specifying a deeper root component to start the search from (The MagePane that is active to be specific).
 2017-04-14 17:07:52 -06:00
fireshoes
0c9ad1e8b2 [AKH] Added 4/13 spoilers to mtg.cards.data.txt. Added tokens to card-pictures-tok.txt. Minor text fix on Rhonas. 2017-04-13 10:10:59 -05:00
ingmargoudt
fea477dd04 fixed two lines to allow playing human-human tables 2017-04-11 07:54:54 +02:00
Mark Langen
c22a8f717e Fix for problem introduced in 321f5597b7 
* Fixes a problem introduced in the JInternalFrame -> JLayeredPane change where the AbilityPicker wouldn't show up.
 2017-04-10 16:13:42 -06:00
Mark Langen
321f5597b7 Change main client window MagePanes from JInternalFrames to JLayeredPanes 
* This change's purpose is to get rid of the extra borders shown around the window border. These arise from using JInternalFrames in a JDestopPane and are impossible to remove in a forwards compatible way when using JInternalFrames. The solution it to move to have MagePane inherit from a plain old JLayeredPane instead of JInternalFrame. All of the MagePanes are always maximized anyways, so this doesn't lose any functionality.
 2017-04-07 22:08:13 -06:00
ingmargoudt
1649530e7b remove helper functions from cardUtil 2017-04-07 16:40:38 +02:00
ingmargoudt
314316f42f moved inputstream for font to try clause 2017-04-07 15:19:11 +02:00
ingmargoudt
f519b12d0e introduced isCreature/isLand/isArtifact/... etc for CardView 2017-04-07 15:08:28 +02:00
ingmargoudt
08197f192c remove CardHelper class 2017-04-07 10:00:16 +02:00
ingmargoudt
d60e01d497 move CardHelper::getColor to CardView::getColorText 2017-04-06 22:11:57 +02:00
ingmargoudt
63df7f65a7 remove isCreature from CardHelper, move to Cardview 2017-04-06 22:07:59 +02:00
Mark Langen
047449f14e * Correct type line rendering for split cards with different types on each half. 
* Correct art rendering for Aftermath, Split, and Fuse cards on the stack. Fused cards show as a single card with all the abilities / characteristics of both halves while on the stack.
 2017-04-04 21:58:52 -06:00
Mark Langen
a2e8cedd02 Merge branch 'master' into akh-card-frame 2017-04-04 18:36:37 -06:00
Mark Langen
fd73fd39af Addressed Feedback and added cards 
* Addressed feedback on Pull Request #3053
* Fixed a copy-paste bug in Destined // Lead
* Added two new Aftermath Split cards that were revealed today
 2017-04-04 17:07:59 -06:00
ingmargoudt
ff6d1541c3 clientcallbacks to enums 2017-04-04 21:52:15 +02:00
Mark Langen
18663f0a7a Amonket Aftermath ability and card frame changes Completed 
* Aftermath Ability implementation complete (At least until we see comprehensive rules that contradict the way I assumed it will work)
* Aftermath Card Frame rendering complete
* Normal Split and Fuse Split card frame rendering complete
* Amonket Split card CMC changes NOT made, but left for a separate commit
 2017-04-04 00:29:54 -06:00
Mark Langen
a96a7f89f5 Work in progress changes for Amonket Aftermath ability. 
* Card Rendering has support for Aftermath Split card frames
* Card Rendering has support for Split cards
* Aftermath ability work in progress
 2017-04-03 04:15:25 -06:00
ingmargoudt
211d433ea9 playertype, enum singleton 2017-04-02 22:09:20 +02:00
LevelX2
2446abcc98 * Some minor changes to sleep command. 2017-04-02 11:48:05 +02:00
LevelX2
5a072ea760 * Some minor changes to sleep command (fixes #2992). 2017-04-02 11:32:25 +02:00
ingmargoudt
6f8f10fcc3 move static function to CardImpl, and other api fixes 2017-03-30 20:09:47 +02:00
fireshoes
1bf2d1782c [MPS-AKH] Added Amonkhet Masterpiece reprints. [MM3] Token updates 2017-03-29 10:42:43 -05:00
fireshoes
55b433ae36 [AKH] Added 3/27 spoilers to mtg-cards-data.txt. Implemented several of the new cards. 2017-03-28 22:25:29 -05:00
ingmargoudt
5cd1b5880f fix supertype on the client 2017-03-27 22:20:19 +02:00
ingmargoudt
0879298e92 refactor cards to use supertype enum 2017-03-27 21:56:33 +02:00
Achilles
b4a60555fc Revert "Change for id str" 
This reverts commit 1e8216c5c5.
 2017-03-24 17:06:33 -05:00
spjspj
1e8216c5c5 Change for id str 2017-03-24 08:14:17 +11:00
vraskulin
d3214c65e4 Merge remote-tracking branch 'fork/master' 2017-03-22 14:51:31 +03:00
vraskulin
d93061c0bc Equals should be compared with == but not equals() 2017-03-22 14:50:50 +03:00
vraskulin
c783614cba NotifyAll 2017-03-20 15:17:30 +03:00
vraskulin
f37c823aa8 String + string concatenation can be replaced by string + char concetenation 2017-03-20 14:00:18 +03:00
vraskulin
1fa9d4a4f6 Typo 2017-03-20 11:34:44 +03:00
ingmargoudt
ff6c6405aa rewrites to optionals 2017-03-19 19:48:32 +01:00
LevelX2
ee5675a0fc Fixed wrong client preferences tab reference. 2017-03-19 10:28:12 +01:00
spjspj
bce87e41aa Merge pull request #2976 from spjspj/master 
Add information to inform which images are missing.
 2017-03-17 22:40:52 +11:00
spjspj
678b7b5a60 Add information to inform which images are missing. 2017-03-17 22:40:33 +11:00
spjspj
a29963cd80 Add information to inform which images are missing. 2017-03-17 22:37:42 +11:00
ingmargoudt
2b91b88551 fixing some additional singleton classes 2017-03-16 09:48:02 +01:00
ingmargoudt
234cfe9519 rewrote singleton to enum where applicable 2017-03-14 16:32:47 +01:00
spjspj
ce3ada66c8 Merge pull request #2967 from spjspj/master 
Slight fix for C16 WUBR deck
 2017-03-14 22:23:02 +11:00
spjspj
e72e879959 Slight fix for C16 WUBR deck 2017-03-14 22:18:06 +11:00
LevelX2
ae4125209b Fixed a problem that hybrid mana symbols were not shown (fixes #2962). 2017-03-12 16:59:54 +01:00
ingmargoudt
1f215cdbe3 removed autoboxing : 
Boolean -> boolean
Integer -> int
Float -> float
 2017-03-11 15:17:14 +01:00
LevelX2
9d8a8a33f1 Xmage 1.4.22V0 2017-03-11 13:38:55 +01:00
LevelX2
d89dfd4ac3 Added some missing MM3 cards and fixed wrong collector numbers. Allow image download for MM3. 2017-03-11 12:33:59 +01:00
Nathaniel Brandes
ce1f4a3bf8 Phyrexian mana now correctly a payment choice. 
Per rule 601.2b, it is not determined at the pay costs step,
but at the "choice" step, long before costs are determined.

This fixes trinisphere interactions and should be consistent with the
rules.
 2017-03-08 20:03:28 -08:00
ingmargoudt
4aaf73e0d2 changed the type used in ImagePanel from an int to an enum 2017-03-07 22:28:10 +01:00
ingmargoudt
daed944eb6 refactored the SortBy.getByString 2017-03-07 22:06:44 +01:00
JOAC69
c854fc3d1a Remove trailing space on CardHelper.getType() 2017-03-05 19:10:20 -06:00
ingmargoudt
6b20d352ca added unit test 2017-03-03 22:28:34 +01:00
ingmargoudt
a0930e3379 missed 2 hashsets to enumsets 2017-03-03 22:14:00 +01:00
ingmargoudt
372584f7ad changed cardtype from list to enumset 2017-03-03 17:04:32 +01:00
ingmargoudt
d966c82019 change enum equals to == for client 2017-03-01 17:03:11 +01:00
vraskulin
0bc9cf91a8 Minor improvements - StringBuilder now have initial value 2017-02-28 15:26:07 +03:00
vraskulin
11dc1e10f1 Few lambda's and removed explicit type from creating lists and hashmaps 2017-02-28 13:46:57 +03:00
vraskulin
0a3c95dde5 Inner classes should be static. It reduces memory usage and gives perfomance boost + DeckImporter rollback 2017-02-28 12:40:12 +03:00
vraskulin
04973ea5aa Checking String for emptiness with .lenght() is preferable since 1.6 2017-02-28 11:46:51 +03:00
vraskulin
498c8cf60c Made utility classes final to explicitly forbid it's inheritance 2017-02-27 17:03:38 +03:00
vraskulin
f309717616 Merge remote-tracking branch 'fork/master' 2017-02-27 16:33:47 +03:00
vraskulin
af3986df46 All final strings became static - it will give a little perfomance boost, due to not instantiating same string every time 2017-02-27 16:33:32 +03:00
doncarton
a46848791c Variable name more readeable 2017-02-26 14:36:34 +03:00
Anders Åstrand
f68460603a Add client-side user ignore list 
This commit adds a client-side per-server ignore list.
* Whispers and talk from an ignored user is hidden
* Ignored users cannot join your tables
* Ignored users tables are hidden
 2017-02-22 22:16:09 +01:00
ingmargoudt
a1bc43d33e Merge pull request #2868 from kubikrubikvkube/master 
Functional interfaces annotation and bugfixes
 2017-02-15 20:27:21 +01:00
vraskulin
a15220d51e Bugfixes with != instead of equals and default toString calls 2017-02-15 19:52:20 +03:00
vraskulin
752392fc46 Functional interfaces should be annotated as functional interfaces 2017-02-15 19:23:12 +03:00
ingmargoudt
c2191227cd Merge pull request #2861 from kubikrubikvkube/master 
Bugfix - after 12820b54d4 refactoring
 2017-02-15 16:10:45 +01:00
vraskulin
f1ef3bf68b Narrowed variables scope. 2017-02-15 16:05:18 +03:00
Plopman
10284642bc Use spinner instead of combobox for AI skill. Fix #1111 and #118 2017-02-14 21:06:07 +01:00
vraskulin
09da478b38 Bugfix - after 12820b54d4 refactoring arrow does not disappear from the screen. Rollback. 2017-02-13 18:56:26 +03:00
vraskulin
5e410df39e We should not create additional Strings in loop. It have perfomance impact. Using StringBuilder instead. 2017-02-13 15:03:23 +03:00
ingmargoudt
20b24e3360 Merge pull request #2846 from kubikrubikvkube/master 
Singleton object should not have map with values that can't be GCed
 2017-02-11 20:43:32 +01:00
vraskulin
f99cd21275 Mostly code format fixes. 2017-02-09 18:30:31 +03:00
spjspj
e18695489f Merge pull request #2849 from spjspj/master 
Modify userId string
 2017-02-09 19:42:29 +11:00
spjspj
0edd01c293 Modify userId string 2017-02-09 19:41:24 +11:00
vraskulin
12820b54d4 Singleton object should not have map with values that can't be GCed 2017-02-08 19:50:57 +03:00
vraskulin
0557b5e89c list.size > 0 changed to !list.isEmpty 
We care about if it's empty or not, not about it's size
 2017-02-06 14:32:51 +03:00
vraskulin
f60ebfbb1f All 1-character strings converted to primitives 
"b" + "r" now changed to 'b' + 'w'.  It's more straight-forward, and may cause perfomance improvements - character primitives allocation is faster and less expensive than string creation.
 2017-02-06 14:32:51 +03:00
vraskulin
31589778ca Try/finally refactored to try with resources 2017-02-06 14:32:11 +03:00
spjspj
fa97e4647e Add field for server console 2017-02-05 14:11:05 +11:00
LevelX2
a5299e3a30 * Fixed a bug that card art of cards with multiple arts (e.g. FEM) were not displayed during game play. 2017-02-03 20:45:47 +01:00
spjspj
64ff81af75 Merge pull request #2825 from spjspj/master 
Add Canadian Highlander format
 2017-01-30 23:58:47 +11:00
spjspj
de6fae8c00 Add Canadian Highlander format 2017-01-30 23:57:59 +11:00
spjspj
f5a28ae7c8 Merge pull request #2821 from spjspj/master 
Modify the profanity filter to push it back to client side only.
 2017-01-28 13:03:51 +11:00
spjspj
8ebed087a5 Modify the profanity filter to push it back to client side only. 2017-01-28 12:28:11 +11:00
spjspj
676d2a54dc Merge pull request #2820 from spjspj/master 
Modify the profanity filter to push it back to client side only.
 2017-01-27 18:21:04 +11:00
spjspj
70453f1ac3 Modify the profanity filter to push it back to client side only. 2017-01-27 18:19:45 +11:00
spjspj
c2e41640e8 Merge pull request #2819 from spjspj/master 
Modify the profanity filter to push it back to client side only.
 2017-01-27 12:39:37 +11:00
spjspj
f41d81f8e4 Modify the profanity filter to push it back to client side only. 2017-01-27 12:38:31 +11:00
LevelX2
cdf05069d2 Fixed another problem of symbold downloading. 2017-01-21 01:27:35 +01:00
LevelX2
5fe25b0af7 * Fixed some problems with set icon download and displaying. 2017-01-21 00:51:31 +01:00
LevelX2
05940aa481 * Fixed that the render frame of copies of normal cards got the normal card rule box size. 2017-01-19 23:50:20 +01:00
LevelX2
6625bf86be Xmage 1.4.21V0 2017-01-15 17:44:02 +01:00
spjspj
72e4df539b spjspj - Send generated password in an email to new users. 2017-01-15 02:57:25 +11:00
LevelX2
0708525cfa * Fixed a bug that players could not join password protected limited games (fixes #2784). 2017-01-13 22:05:53 +01:00
LevelX2
450eba06e8 Merge pull request #2772 from ingmargoudt/master 
replaced enum comparison from equals to ==
 2017-01-13 17:26:50 +01:00
igoudt
ac8962cb29 replaced enum comparison from equals to == 2017-01-11 09:53:16 +01:00
vraskulin
cb1b507076 Hotfix (client don't compile) after pr 2762 merged to master 
There is no ActionListener in import block, so mage-client in current state can't be compiled. Changed ActionListener  to lambda
 2017-01-11 11:49:19 +03:00
sotovdev
fe7aaedf1c Merge branch 'master' into bigRefactoring 2017-01-10 15:37:43 +03:00
spjspj
a4275ab658 Deck editor - Add a 'Bling my deck' button. 2017-01-10 22:26:59 +11:00
vraskulin
076840df53 Big refactoring 
I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final  variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3)  Get rid of unused imports (most of the changes) in whole project classes.
 2017-01-09 19:16:53 +03:00
vraskulin
51e5640c8e We can't invoke equals method on object, that can be null, due it's lead to NPE 2017-01-09 15:17:59 +03:00
LevelX2
ee203cf981 Xmage Release 1.4.20V0 2017-01-08 01:36:05 +01:00
LevelX2
9353c5aa9c [AER] Some more minor fixes. 2017-01-07 22:22:17 +01:00
spjspj
7a8055172d spjspj - Allow appending from the clipboard in deck editor 2017-01-08 01:02:01 +11:00
LevelX2
c2852ca233 [AER] Added Battke at the Bridge. 2016-12-31 17:00:00 +01:00
vraskulin
6577e641e6 Deprected methods changed with more up-to-date ones 2016-12-29 14:46:34 +03:00
LevelX2
8075ea2e50 * Fixed a problem that Emblems created by permanents where its owner left the game caused errors in clients. Some handling cganges of emblems. 2016-12-27 16:00:22 +01:00
vraskulin
4f81babdfa Concurrency perfomance boost 
Parallel execution. Speed increased from 50% (avg in all methods) to 500% (checkForNewCards method)
 2016-12-22 18:36:40 +03:00
vraskulin
95242e8cf9 Concurrency perfomance boost 
Checking if image exist or not now parallel. It took 35-39 seconds to perform, now it takes 13-16 seconds. Planning to make all class method concurrent and reduce client loading time even more.
 2016-12-19 15:58:08 +03:00
LevelX2
9400f192b7 Added some more tooltip texts to client menu bar. 2016-12-13 20:30:32 +01:00
LevelX2
712565562e Fixed start date of some constructed formats (e.g. Frontier missing M15) for deck editor. 2016-12-12 21:23:20 +01:00
spjspj
49d9630c05 Merge pull request #2673 from spjspj/master 
spjspj - Add new invert selection option
 2016-12-13 00:43:50 +11:00
spjspj
946e0c54fc spjspj - Add invert selection to deck editor 2016-12-13 00:42:57 +11:00
spjspj
24b4bc8e30 spjspj - Add invert selection to deck editor 2016-12-13 00:41:21 +11:00
LevelX2
3d95849c10 Some fixes to the Monarch designation. 2016-12-07 17:14:08 +01:00
Fenhl
96b4a446a9 Fix typo in the Breed Lethality deck 2016-12-05 05:01:26 +00:00
Fenhl
85f9812d72 Fix basic land artwork of C16 precons 2016-12-05 01:59:42 +00:00
ludwig.hirth
d051cb7b42 * Some client menu changes. 2016-12-02 16:06:34 +01:00
spjspj
b7695f7fea spjspj - 7pt Aus Highlander 2016-12-01 19:01:00 +11:00
LevelX2
b62ca1ed1f Xmage 1.4.19 2016-11-27 19:59:42 +01:00
LevelX2
68d0e6b9fa Added the monarch concept to xmage and all related cards. 2016-11-27 01:14:32 +01:00
spjspj
5fe4dcdd29 Merge pull request #2610 from spjspj/master 
Add 'EDH power level' rating to Commander tables
 2016-11-21 19:45:28 +11:00
Pete Rossi
b974a78b1b Add magidex.com as additional image source 
Images on magidex are referenced by url-escaped card name, so the
implementation was straightforward.  Flipped and Two-faced cards didn’t
require any additional work to support.

I downloaded all the images, and the only missing cards I could see
were tokens.  Seems to work pretty well.

Fixes issue #2153
 2016-11-20 22:33:08 -08:00
spjspj
7fd2eeedcf Add 'EDH power level' rating to Commander tables 2016-11-20 23:13:16 +11:00
spjspj
b29e25cb87 Merge pull request #2609 from spjspj/master 
spjspj - Add concept of 'Multiples' (work out in new edh decks which …
 2016-11-19 22:54:01 +11:00
spjspj
49cfaee144 spjspj - Add concept of 'Multiples' (work out in new edh decks which are not singleton). 2016-11-19 22:45:47 +11:00
LevelX2
807782efea Added the Basque flag. 2016-11-19 10:53:43 +01:00
spjspj
d7b1ae68ed spjspj - Sorcery count was double 2016-11-18 00:14:59 +11:00
spjspj
a2b3d8825e Add 'xmage.de', 'woogerworks', 'localhost' buttons to connection dialog to fill in appropriate password/username 2016-11-13 22:59:32 +11:00
fireshoes
c8bafff7e3 Added Mirror Mastery to Commander 2011 sample decks. 2016-11-09 08:25:41 -06:00
Fenhl
d5ee37fce8 Add Counterpunch deck from CMD and fix some other precon deck names 2016-11-08 09:46:43 +00:00
LevelX2
c9e1b415e2 Xmage 1.4.18V0 2016-11-06 18:11:19 +01:00
spjspj
cab2993b1b spjspj - The 5 Commander 2016 Decks 2016-11-07 00:55:03 +11:00
Neil Gentleman
843466b6ad AudioManager: a bit of cleanup 2016-11-01 21:28:44 -07:00
Neil Gentleman
366e8e281d MageClip: copy whole input file 
not just whatever the first read returns
 2016-11-01 21:28:44 -07:00
Neil Gentleman
5d55d299a2 don't just give up when LinePool can't be initialized 
maybe fixes #2525
 2016-11-01 21:28:44 -07:00
LevelX2
0f6c14bdb7 Fixed that a client reconnect tries to reconnect to the server the client was connected to and not the last server a client on this system has connected to. 2016-11-01 22:59:24 +01:00
fireshoes
ac3203b63c Set some token version types. [C16] Added token info. Implemented Migratory Route. 2016-10-31 23:09:42 -05:00
fireshoes
72c13b9102 [C16] Implemented Wave of Reckoning, Duelist's Heritage, Entrapment Maneuver, and Magus of the Will. 2016-10-31 00:10:53 -05:00
SceLPI
0dd1a37891 Update serverlist.txt 2016-10-29 14:56:24 -03:00
LevelX2
3f05e102a0 [C16] Added Boompile. 2016-10-29 11:11:37 +02:00
LevelX2
ec8ea8e053 Allow to dwonload C16 images. 2016-10-29 11:09:09 +02:00
LevelX2
e1ca3b5cc5 * Removed the LogServices (H2 DB file that logs actions). 2016-10-28 18:39:17 +02:00
spjspj
e2afd7b790 Merge pull request #2506 from spjspj/master 
spjspj - Add in promos from scg to grabbag.  Fixed some more issues w…
 2016-10-27 22:43:50 +11:00
spjspj
fa36157f69 spjspj - Add in promos from scg to grabbag. Fixed some more issues with names 2016-10-27 22:42:05 +11:00
spjspj
66c379ce6e Merge pull request #2505 from spjspj/master 
spjspj - Add in promos from scg to grabbag.  Fixed some badly numbere…
 2016-10-27 16:07:42 +11:00
spjspj
1dae8ca6b2 spjspj - Add in promos from scg to grabbag. Fixed some badly numbered lands (probably more are bad). 2016-10-27 16:02:00 +11:00
LevelX2
6b58c18520 * Fixed a game locking problem with the day/night button of transformable cards (fixes #2503). 2016-10-26 22:53:39 +02:00
Mat
134dcb6946 Remember Type 2 selection when changing source on images download dialog 2016-10-25 23:09:31 +02:00
LevelX2
8f317305fa Some minor changes. 2016-10-24 17:55:28 +02:00
LevelX2
070a0ca3fa * Fixed a problem that the enlarged card view could stay open after a game or draft were finished. 2016-10-23 23:13:02 +02:00
LevelX2
69340d9b06 * Added correct key text to chat info message. 2016-10-23 18:39:39 +02:00
LevelX2
8b62eece68 XMage 1.4.17V0 2016-10-23 10:03:01 +02:00
LevelX2
07a7afa285 Added test and fixed some possible null pointer exception. 2016-10-22 13:06:41 +02:00
Campbell Suter
0428f5bab3
Add reset keys to default button 2016-10-21 09:54:09 +13:00
Campbell Suter
4c292466c1
Make it impossible to have multiple actions bound to the same key. 2016-10-21 09:54:09 +13:00
LevelX2
89a739e902 * Removed debug messages. 2016-10-20 15:16:31 +02:00
Campbell Suter
cde9afa091
Make keybound buttons cache their text, in case the keys are changed midgame 2016-10-20 12:49:58 +13:00
Campbell Suter
b4dc47fbc9
Improve keybinding buttons, add information 2016-10-20 12:36:18 +13:00
Campbell Suter
5ea636126f
Make the text on the playing buttons update with the current keybinds 2016-10-20 12:36:18 +13:00
Campbell Suter
d9ebceec20
Make tooltips work properly 2016-10-20 12:36:18 +13:00
Campbell Suter
e910778e54
Add F2/F6, use bindings in game 2016-10-20 12:36:18 +13:00
Campbell Suter
d7a3904569
Add key options to prefs dialog 2016-10-20 12:36:18 +13:00
fireshoes
89dd981075 Merge 2016-10-17 23:45:47 -05:00
fireshoes
b733f911f7 Added the four finalists from You Make the Cube. 2016-10-17 23:44:14 -05:00
fireshoes
c045204622 Added the four finalists from You Make the Cube. 2016-10-17 23:43:25 -05:00
fireshoes
abfcd0ab10 Added the four finalists from You Make the Cube. 2016-10-17 23:41:22 -05:00
fireshoes
1f4c0eb1d9 Added the four finalists from You Make the Cube. 2016-10-17 23:10:01 -05:00
LevelX2
2e1f8c07cb Xmage 1.4.16v3 2016-10-09 15:54:12 +02:00
LevelX2
27acaa5c9a Fixed a image cache problem that prevented to show cards with different art correctly. 2016-10-09 15:28:54 +02:00
LevelX2
67cf1604c9 Fixed a problem with images of transformed cards. Workaround for images of basic lands. Does not work correctly yet, because card art od basic lands is switched between various versions continuously. 2016-10-09 03:07:23 +02:00
LevelX2
e46895420e Added card# to deck pool area. 2016-10-09 03:05:10 +02:00
LevelX2
4ec7d626fa * Fix to get land images shown again. 2016-10-08 19:03:32 +02:00
LevelX2
5d8ae4d411 * Workaround to fix problem with deck layout. 2016-10-08 19:03:09 +02:00
LevelX2
157827addc XMage 1.4.16v0 2016-10-08 11:14:13 +02:00
spjspj
be6e900dba spjspj - Add Media Inserts to Grabbag Image Source 2016-10-08 11:19:05 +11:00
spjspj
30bfeb497d spjspj - Add Kaladesh Inventions to Grabbag Image Source 2016-10-08 01:40:37 +11:00
spjspj
624bb8da76 spjspj - Show dialog box for import from clipboard 2016-10-07 20:27:26 +11:00
spjspj
250873263c spjspj - Show dialog box for import from clipboard 2016-10-07 20:15:36 +11:00
spjspj
72b0192bae spjspj - Fix cube from deck from being broken with layouts 2016-10-07 10:38:56 +11:00
spjspj
56e1a96d76 spjspj - Manifest/Morph image to mtg.onl 2016-10-06 18:45:52 +11:00
spjspj
b63874b62d Opaque PlayerPanelExt 2016-10-06 00:02:11 +11:00
spjspj
84e26e6677 Opaque PlayerPanelExt 2016-10-06 00:00:20 +11:00
LevelX2
7c4b40073c Fixed some exception problems (deck layout, mana symbols). 2016-10-04 23:57:11 +02:00
Mark Langen
d604b18f6b Separate setting for split position in sideboarding vs deck construction 
* Depending on the orientation of the sideboard / maindeck the split should be a separate setting, not one single one.
 2016-10-04 01:18:50 -06:00
Mark Langen
5af417ed0b More Drag & Drop editor fixes 
* Fixed cards being blurry. The problem isn't completely fixed, but the fix will suffice in most cases. Card Images are only loaded in once, and the cards were loaded in initially at a small size instead of their eventual size after layout. Really they should reload images when resized, but I will tackle that later, and it's only noticable when significantly resizing cards within one usage of the editor anyways.
* Removed some of the unneeded UI on the sideboard half of the DeckView so that componently are less likely to overlap at a small size. Not sure how to ideally handle this, as Swing doesn't really provide an elegant way to hide components at small sizes, and I'm sure the user would rather the components overlap than be unable to resize the window as small as they want due to a minimum size requirement.
 2016-10-04 00:23:13 -06:00
Mark Langen
f6d50ce04f Various new Drag & Drop deck editor improvements 
* Shift-Click / Shift-Drag now work as expected as far as multi-selection
* Deck editor saves split pane split positions
* Card layout and sort settings are now saved along side the a deck when saving to the .dck format, so that you have back the exact same deck layout when you re-load the deck.
* Fixed the symbol image downloader to work around some of the large-size symbol images being missing on gatherer. Falls back to the medium sized images currently for those symbols.
 2016-10-04 00:09:51 -06:00
spjspj
4d3f28ed6d spjspj - one more token 2016-10-04 10:01:41 +11:00
fireshoes
7cbb3df889 Fixed that Eternal format matches did not show in the matchmaking lobby. 2016-10-03 16:39:11 -05:00
LevelX2
9a00dd20ca Fixed some problems with constructed formats definition and custom sets. 2016-10-03 20:25:08 +02:00
LevelX2
bdaa78e144 Some minor changes. 2016-10-03 10:00:48 +02:00
LevelX2
f6839f9e1d Merge origin/master 2016-10-03 01:43:02 +02:00
LevelX2
fcba98f985 Some minor changes. 2016-10-03 01:42:35 +02:00
fireshoes
002da57ccd Fixed that Constructed - Freeform format did not appear in the games lobby. 2016-10-02 18:40:45 -05:00
LevelX2
c4b4804903 Fixed that no abilitues were shown for selecting the order of triggered abilities from a dies triggered ability of tokens. 2016-10-02 23:34:06 +02:00
LevelX2
e49c92e80c Added "E" to the to be replaced symbols with icon in rule text. 2016-09-29 16:20:13 +02:00
spjspj
6ad012fa87 Merge pull request #2405 from spjspj/master 
spjspj - Player Panel
 2016-09-29 23:05:47 +10:00
spjspj
1bbed6dc5f spjspj - Player Panel 2016-09-29 23:03:57 +10:00
Lymia Aluysia
09cc9646a0
Remove outdated comment. 2016-09-29 06:48:22 -05:00
spjspj
52f6d36063 Merge pull request #2403 from spjspj/master 
spjspj - Player Panel *fix offset of {W}*
 2016-09-29 17:39:51 +10:00
spjspj
fa627a3efb spjspj - Player Panel *fix offset of {W}* 2016-09-29 17:33:22 +10:00
Mark Langen
a018f2021b Fixed a bug with JFileChooser in the DeckEditorPanel 
* On specific platforms (it seems Windows 7-10, JRT 7+), under our specific configuration, in the case where the user selects the exact same file as they chose during a previous selection, JFileChooser reports that the user selected a file, but returns chosen file = null. This commit works around that by assuming they chose the same file as last time in that case.
 2016-09-28 23:27:46 -06:00
Mark Langen
615b93f8c3 Finished the new Drag & Drop deck view. It is currently implemented in main deck editor, and limited deck construction. 
Still to do:
* Integrate it into the draft view
 2016-09-28 20:57:23 -06:00
Mark Langen
56a3c6dc8c Mostly working Drag n Drop deck editor 
* Still trying to iron out how to signal back events from cards moving between different drag and drop targets to the DeckEditorPane
 2016-09-28 20:57:22 -06:00
Mark Langen
3c2c793f5d Drag n Drop Deck Editor WIP 
* Working standalone proof-of-concept application in DragCardGrid.

* Still needs listener functionality in order to integrate it into the existing DeckEditorPanel class.
 2016-09-28 20:57:22 -06:00
Mark Langen
2d55ccc73c Change "Ask for graveyard order" setting to not ask by default 
* The cases where graveyard order matters are so staggeringly few that that the setting should almost certainly default to false.
 2016-09-28 20:57:21 -06:00
spjspj
458cbfa71a spjspj - Further changes to height of Player Panel. 2016-09-28 23:27:15 +10:00
spjspj
5b941d4c5e spjspj - Make zero values less noticeable on player panel 2016-09-28 22:58:55 +10:00
spjspj
240c7950d0 Merge pull request #2386 from spjspj/master 
spjspj - Add in energy/experience counters
 2016-09-27 17:50:26 +10:00
spjspj
de3c3ae036 spjspj - Add in energy/experience counters 2016-09-27 17:49:34 +10:00
fireshoes
783a278fca Added Frontier format (M15 forward). Added Kaladesh block constructed. 2016-09-27 01:54:49 -05:00
spjspj
1a81f2151f spjspj - Add in energy/experience counters 2016-09-26 03:17:06 +10:00
spjspj
d259efc093 spjspj - Add in energy/experience counters 2016-09-26 03:01:35 +10:00
spjspj
5671ab8ff7 spjspj - Add in energy/experience counters 2016-09-26 02:58:59 +10:00
spjspj
db3074ceda spjspj - experience.png resource (candidate for a more gooderer one..) 2016-09-26 02:50:37 +10:00
spjspj
80b498f044 spjspj - Energy.png resource 2016-09-26 02:45:20 +10:00
spjspj
16bb17e5bb spjspj - Add option of 'Number of Seats'. This is for Tournaments so that you can draft say a 4 way draft and then have a 4 way game at the end of it. 2016-09-25 00:46:16 +10:00
LevelX2
b85dc8c0cd Some minor changes. 2016-09-24 14:55:09 +02:00
LevelX2
4c91440f5e Chnaged color frame for active player to green (that white was a no go). 2016-09-22 21:48:39 +02:00
LevelX2
b7f3a4b202 Merge pull request #2321 from getgrenade/master 
Player Panel UI redesign (new icons, new colors, new buttons)
 2016-09-22 19:55:20 +02:00
spjspj
e22184180d spjspj - Add 'Delayed Submit' button to the deck editor 2016-09-20 01:49:51 +10:00
Get
ed7378da66 Player Panel UI redesign (new icons, new colors, new buttons) 2016-09-18 17:10:54 +03:00
spjspj
88b557e1b2 Merge pull request #2317 from spjspj/master 
Some minor fixes for grabbag
 2016-09-18 20:22:00 +10:00
spjspj
8cf4acb68a Some minor fixes. 2016-09-18 20:20:04 +10:00
Fenhl
ab7e86cb27 Change AE to Ae 2016-09-17 16:59:24 +00:00
LevelX2
04ca15a3a9 Some minor fixes. 2016-09-17 16:45:53 +02:00
Mark Langen
7feb237c06 Fixed card stacking offset in Editor / Library / etc. 
* Rather than respecting the spacing setting from Preferences, the spacing is now calculated from the card size if characteristic based rendering is enabled, since from the renderer we know exactly what spacing is actually needed.
 2016-09-16 16:41:00 -06:00
Mark Langen
28c04e2009 Fix cards still not showing selectable highlight in some cases 
* Simply invalidating the image render is not enough, a repaint call is also needed in a few cases where a repaint hadn't already been scheduled by the same change that trigged the selectable/chosen status change.
 2016-09-16 16:41:00 -06:00
LevelX2
d7dd635bca Revert "introduced StringUtil class with .isEmpty(String input) and .isNotEmp…" 2016-09-16 23:55:54 +02:00
ingmargoudt
f1cf9e7adb introduced StringUtil class with .isEmpty(String input) and .isNotEmpty(String input), to replace str != null && str.length()>0 statements 2016-09-16 21:23:31 +02:00
ingmargoudt
71398d6d83 added some missing session references 2016-09-16 08:58:44 +02:00
Mark Langen
7e2f606d8a Fix issue #2249 - Black borders on non-rendered cards 
* Turns out that drawing black borders on non-rendered cards, while it fixes what was probably a bug, has unintentional and undesirable implications. Needs further work in the future, but revert it for now.
 2016-09-15 20:06:37 -06:00
Mark Langen
24beaa08f9 Vehicle P/T Rendering Enhancement 
* Non-animated vehicle permanents have their P/T dimmed to distinugish their status past the type line changes.
 2016-09-15 17:18:20 -06:00
LevelX2
ce004cc2b7 * Added some missing static SessionHandler usages. 2016-09-16 00:40:37 +02:00
Mark Langen
80e8603a3a Fixed mana-symbol-textbox being rendered on permanents other than lands 
* Basic lands have the mana symbol in their textbox rather than their actual text. That was erroneously being applied to other permanents like Elvish Mystics with only a single mana adding ability as text.
 2016-09-15 16:07:24 -06:00
Mark Langen
5a6a62ecbf Fix wrong order on ability rendering 
* Keyword abilities were being rendered *last* on cards instead of first as they should be.
 2016-09-15 16:07:24 -06:00
LevelX2
f6ef3db9b9 * Added some missing static SessionHandler usages. 2016-09-15 22:30:41 +02:00
ingmargoudt
3019991473 removed the Session out of local scope and introduced a static SessionHandler that acts as interface to remote.Session 2016-09-15 20:52:41 +02:00
spjspj
a0c09ecf6a spjspj - Add 'grab-bag' of images that seem harder to get. 2016-09-16 01:41:10 +10:00
Mark Langen
9927123cb3 Made deck area orientation dynamic. 
* Deck area orientation now changes depending on the context.
* In free building and sideboarding, the sideboard and maindeck are shown side by side.
* In limited deckbuilding, the sideboard (with your limited pool) is shown above the maindeck.
 2016-09-15 00:55:23 -06:00
Mark Langen
577bdaea84 Fixes and additions to card rendering 
* Vehicles are rendered with a vehicle background and changed P/T box color
* Kaladesh Inventions are rendered with the invention frame
* Kaladesh Inventions use the full-frame art if they detect that you have that full art downloaded instead of normal card images.
* Changed land text-box colors to be a bit more saturated to make it clearer what colors they produce
* Added mana symbol in the textbox of basic lands instead of rules text as long as they have no additional abilities.
* Fixed problem with triggered abilities on the stack showing up with a type of "??? Ability". Not sure what the real cause is but those abilities have abilityType = null, just worked around it.
 2016-09-14 19:37:12 -06:00
ingmargoudt
3128bd2b4b replace [list].size() == 0 and [string].length() == 0 to use .isEmpty() instead 2016-09-14 15:27:31 +02:00
spjspj
4a15228bf2 spjspj - Add alternative SCG tokens from alternative.mtg.onl 2016-09-14 02:13:01 +10:00
spjspj
08df195bc3 spjspj - Fix for mtg.onl 2016-09-14 00:38:24 +10:00
LevelX2
5e7a4d265e Merge pull request #2254 from royk/add-deck-support 
Add support for .dek files
 2016-09-13 11:56:46 +02:00
Mark Langen
610c4789e5 Fixed card rendering breaking when view is missing set code. Real issue is #2260, but that will take more work to fix. 2016-09-12 23:25:48 -06:00
fireshoes
6ea98ba19b [KLD] Updated mtg-cards-data.txt with spoilers through 9/12. Add Masterpiece Series set and 4 known reprints so far. 2016-09-12 14:02:48 -05:00
Roy Klein
1e39c99914 Add support for .dek files 2016-09-11 23:34:17 +02:00
spjspj
c5577dc09e d'oh 2016-09-12 01:13:16 +10:00
spjspj
3bbf5d1d56 spjspj - Add in last ditch token attempt (for momir vig mainly) 2016-09-12 01:00:43 +10:00
LevelX2
bb8326d46b XMage 1.4.15v0 2016-09-10 12:31:18 +02:00
Mark Langen
8d90f4558d Merge pull request #2234 from stravant/master 
Characteristic-Based rendering initial release completed unless further bugs come up before then.
 2016-09-07 23:16:10 -06:00
Mark Langen
26b98d1afb Added more card text sizes. And other small fixes. 
* Changed card rules text rendering to use 5 total possible text sizes to better support HD+ display resolutions.

* Made a P/T box be shown on vehicles.

* Small bugfixes, fixing crashes when characteristics like type line or name are missing for whatever reason.
 2016-09-07 22:35:14 -06:00
Mark Langen
a638625c77 Fixed full-arts seemingly not replicating properly 
* The problem was that they key for caching rendered cards did not take into account the full art / not full artness of the cards, so when someone has both full art and non-full art variants of a land from the same set it one would override the other.
 2016-09-07 17:35:05 -06:00
Mark Langen
f0a1938b3e Full art Land rendering 
* Added "frameStyle" tagging to relevant full art lands (ZEN, BFZ, UNG, UHG)

* Added support for rendering based off of frameStyle

* Outstanding bug that frameStyle doesn't seem to be replicated exactly properly
 2016-09-07 02:20:51 -06:00
emerald000
df2782fdb6 [KLD] Basic implementation of energy counters. Added Woodweaver's Puzzleknot. 
Better display of energy counters would be preferred.
 2016-09-07 01:07:21 -04:00
Mark Langen
0ea9d33211 Fixed card highlighting 
* Changed CardPanelRenderImpl to correctly invalidate its render when its panel has its isChoosable / isSelected override set. Before things like selecting cards in a draft view would not visibly have an effect as the render wasn't invalidated.
 2016-09-06 18:15:37 -06:00
Mark Langen
f9e088b51d Card Rendering name & type line fixes 
* Changed Name and Type line rendering to use Arial / Arial Narrow instead of Beleren. At small font sizes, those fonts are much more readable.

* The P/T box still uses the Beleren font, as the numbers in that font are quite readable even at small sizes.

* Changed the name / type lines to switch between Arial and Arial Narrow depending on whether there is space available using Arial or not.
 2016-09-06 17:03:28 -06:00
ingmargoudt
e2a479255a refactor : removed all instances of new Random() and replaced with RandomUtil for a ThreadLocal randomizer 2016-09-05 15:03:47 +02:00
fireshoes
f2cc8d4571 Removed Nissa vs Ob Nixilis from ignored images. 2016-09-04 23:06:13 -05:00
fireshoes
b9d29d3ebf Added upcoming sets. [KLD] Updated mtg-cards-data.txt. Added some simple cards. 2016-09-04 22:54:05 -05:00
fireshoes
16c40d0248 Merge origin/master 2016-09-04 09:13:47 -05:00
fireshoes
5e911ca63c Updated image sources for upcoming sets. 2016-09-04 09:08:46 -05:00
spjspj
fb5087683f spjspj - Implement new token source (mtg.onl) for downloading of tokens to tokenDescriptor format in TOK.zip 2016-09-04 22:34:43 +10:00
LevelX2
720a4457fd * Fixed hybrid mana symbol display for characteristic-based card rendering. Removed not used import statements. 2016-09-03 10:52:14 +02:00
Mark Langen
629da22dd9 Small fix to renderer. 2016-09-01 17:23:17 -06:00
Mark Langen
b2895ee9eb Tweaked layout for small card text. 2016-09-01 16:13:28 -06:00
Mark Langen
463576dbd0 Merged up to current 2016-09-01 15:44:14 -06:00
Mark Langen
818efb8535 * Textual set symbols no longer displayed if set symbol image doesn't exist. 
* Fixed a small graphical mispositioning in rendering of keyword abilities.
* Added an option to hide set symbols entirely when rendering.
* Fixed flip walkers like Arlin Kord showing a "0" loyalty on their back face (when they should have no loyalty there).
* Removed some log files I accidentally committed.
* Fixed a bug in tokens, where they are missing their expansion symbol of they are created by another token
* Fixed the the new Rendering based CardPanel not returning the correct Image through getImage (resulting in a poor quality image in the card preview window)
 2016-09-01 15:00:46 -06:00
spjspj
0f043d480d spjspj - Implement new method for image generation of tokens. 2016-09-01 17:11:12 +10:00
Mark Langen
d33f8a636e Most obvious bugs ironed out. Ready for PR. 2016-08-31 23:37:31 -06:00
Mark Langen
d5415d2d04 Working Card Rendering 2016-08-31 04:43:28 -06:00
spjspj
4bf78fd6d4 Update devs 2016-08-19 19:45:23 +10:00
LevelX2
873ecddb1d Fixed that token images were not loaded. 2016-08-15 11:13:06 +02:00
LevelX2
539b03bd1d Xmage 1.4.14v0 2016-08-13 10:14:38 +02:00
fwannmacher
9b5a02c09c - Fixed issue #2075 2016-08-04 09:52:56 -03:00
LevelX2
a0fbcddeb9 * Added preference option to set the size of the enlarged image popup window. 2016-08-02 12:00:36 +02:00
fireshoes
88e8894b29 Added Duel Decks: Nissa vs Ob Nixilis and From the Vault: Lore. 2016-08-01 15:05:25 -05:00
Quercitron
c04bd6d64a Replace Yes/No text with Mulligan/Keep text on mulligan answer buttons to make options more clear. 2016-07-31 15:57:45 +03:00
Derek M
86e7ace06e Merge pull request #2112 from fwannmacher/master 
Converted cardNumber from int to String. Now card number with "a" or "b" can be used.
 2016-07-25 16:24:01 -04:00
spjspj
883b63a01d spjspj - Update to push deck List across from Client to Server for Custom Cube 2016-07-25 22:44:21 +10:00
fwannmacher
10778cdd6b - Converted CardImpl.cardNumber from int to String 
- Fixed Issue #1953
- Fixed Issue #1914
- Fixed Issue #739
 2016-07-24 15:18:54 -03:00
fwannmacher
78f327e822 - Fixed more image url properties 2016-07-21 01:19:28 -03:00
fwannmacher
9861f762b7 - Added option to select number of threads for image download 2016-07-20 16:08:36 -03:00
fwannmacher
8c1e7ec42e - Fixed some image url properties 2016-07-20 14:23:22 -03:00
fireshoes
9630320ba9 Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs. 2016-07-18 15:49:43 -05:00
Quercitron
91f74ced1f Add downloading of double-faced cards from the mythicspoiler.com 2016-07-12 03:31:08 +03:00
LevelX2
d0ecb473da Xmage 1.4.13v0 2016-07-11 22:54:43 +02:00
LevelX2
8e76430d07 Revert "Use a dedicated thread pool for audio" 2016-07-10 22:01:06 +02:00
fireshoes
4cf3f29c4c [EMN] Added complete spoiler to mtg-cards-data.txt. Added existing reprints. 2016-07-08 11:18:14 -05:00
spjspj
26d38f0773 spjspj - Add the option of having a .dck file as a cube 2016-07-04 00:20:31 +10:00
LevelX2
ce91f6aae7 Fixed a problem with transformed image cache. 2016-07-02 19:07:26 +02:00
LevelX2
1c2aa4c10a Fixed cleint exception problem with transformable cards. 2016-07-02 18:38:29 +02:00
LevelX2
7cfdd80c57 Chnaged permanent row handling so creatures are always shown towards the opponent side. 2016-07-02 13:45:34 +02:00
LevelX2
e9993f980a Added workaround to deck generator to handle missing basic lands. 2016-07-02 13:44:36 +02:00
LevelX2
2874996994 Merge pull request #2032 from draxdyn/hold_priority 
Hold priority on Ctrl+click
 2016-07-01 16:00:20 +02:00
LevelX2
3b0f7b074f * Some changes to distance calculation of enchantments on the battlefield. Added minimal permanet size preference setting (not working correctly yet). 2016-07-01 15:08:40 +02:00
fireshoes
33ac32f5c4 [EMN] Added additional 6/30 spoilers to mtg-cards-data.txt. Added some more cards. 2016-06-30 14:47:59 -05:00
draxdyn
a7409f3d08 Hold priority on Ctrl+click 
In most cases, it is not useful to hold priority after doing something,
since the spell or ability added to the stack can just be performed
beforehand.

Hence, automatically passing priority is the only comfortable setting.

However, in some cases it is useful (chiefly for Infernal Tutor +
Lion's Eye Diamond and similar interaction), and currently players
have to open Preferences, change the option and then change it back
whenever they need to hold priority, which is very annoying.

This change allows to temporarily hold priority by simply holding
Control while performing an action, which solves the issue in a
manner similar to other clients.

A "Hold" indicator next to the spells cast indicator is displayed so
that the user knows his Control key holding was registered.

The code works by adding a new HOLD_PRIORITY player action that causes
the automatic priority pass options to be ignored until the player is
given priority again.

The client sends the message whenever it's not already holding priority
and Ctrl+click/space/enter happens anywhere.

This is somewhat "loose" as it means that Ctrl+click on the background
also holds priority, but this might actually be desirable and it greatly
simplifies the code, since only a global AWT event listener is required,
and there is no need to change every place in the code that could add
something to the stack.

It is also possible to hold priority and stop holding priority using
the context menu.
 2016-06-29 19:57:45 +02:00
drmDev
9deb1bd0da Ignition Team implementation (requested card) 2016-06-29 03:21:40 -04:00
LevelX2
facd5ffa2c Merge pull request #2028 from draxdyn/cardpanel_threading 
Fix broken threading in CardPanel
 2016-06-28 13:28:37 +02:00
LevelX2
0733729382 Merge pull request #2029 from draxdyn/audio_threadpool 
Use a dedicated thread pool for audio
 2016-06-28 13:27:18 +02:00
LevelX2
d220c739a8 Merge pull request #2030 from draxdyn/performance 
Improve GUI performance
 2016-06-28 13:26:44 +02:00
LevelX2
f7cecdf050 Merge pull request #2033 from draxdyn/f6 
Add support for F6
 2016-06-28 09:16:09 +02:00
LevelX2
c505c2f44f Merge pull request #2027 from draxdyn/resize_editor 
Update image when cards in editor are resized
 2016-06-28 09:08:37 +02:00
draxdyn
62d5d45a45 Add support for F6 
Skips everything until next turn, except for declare attackers and blockers.

F11 and F9 are a better design, but F6 is provided for compatibility with
established conventions.

There is currently no GUI button for it.
 2016-06-24 21:34:30 +02:00
spjspj
157d94360c spjspj - Modifications to shrink size of players who have left. 2016-06-24 19:20:46 +10:00
draxdyn
053580c412 Add support for disabling animations 2016-06-23 16:21:34 +02:00
draxdyn
b8e5f5f942 Draw CardPanel to a buffered image and cache it across instances 
Speeds up GUI performance.
 2016-06-23 16:21:34 +02:00
draxdyn
892cfdce45 Draw MageRoundPane and its shadow to a buffered image and cache it across instances 
Speeds up GUI performance.
 2016-06-23 16:21:34 +02:00
draxdyn
ffb65d48fe Draw GlowText to a buffered image and cache it across instances 
Speeds up GUI performance.
 2016-06-23 16:21:34 +02:00
draxdyn
4b190eeaf4 Drastically simplify ScaledImagePanel by having it just use the resized image cache 
All the current behavior of ScaledImagePanel seems to be useless, since the source
images are static, so we can just use the highest quality scaling possible and
cache the result using TransformedImageCache.
 2016-06-23 16:21:34 +02:00
draxdyn
e3d84ca212 Cache resized and rotated images 
RotatedResizedImageCache and MultiRotatedResizedImageCache contain the caching
machinery.

A cache of rotated and resized images is added to ImageCache, and is used by
the resizing functions there.

All the resizing and rotation functions in ImageHelper are redirected to the
ones in ImageCache.

This is slightly inefficient because it will cache some calls that are never
repeated, but it prevents developers from mistakenly using uncached functions
when calls are repeated, seriously impacting performance.

Also resizing functions that only take a width or an height have been removed,
and their calls fixed to provide the other dimension. It's still possible to
specify -1 as width or height to ignore constraints in that dimension, though.

Greatly speeds up UI performance.
 2016-06-23 16:21:34 +02:00
draxdyn
1999dfe5c0 Add mechanism to register image caches and flush them all on GUI size change 
This should avoid the issue of having lots of unused entries in caches if the
GUI size is changed multiple times.
 2016-06-23 16:21:34 +02:00
draxdyn
415c8cce7e Don't call setText() on the popup text component until it is shown 
Performance improvement, impacts profiles.
 2016-06-23 16:21:34 +02:00
draxdyn
9513b5bf74 Don't call setText in MageTextArea if the text hasn't changed 
Minor UI speedup, shows up in profiles for simple games.
 2016-06-23 16:21:34 +02:00
draxdyn
8c2c1f4887 Don't call setEditable in ColorPane 
Shows up in profiles, and should be unnecessary.
 2016-06-23 16:21:34 +02:00
draxdyn
0b13660348 Use mouse point in event instead of calling getMousePosition() 
Improves performance and is also the correct way to do this.
 2016-06-23 16:21:34 +02:00
draxdyn
d8b791a506 Use a dedicated thread pool for audio 
Audio threads are busy while the sound plays, which could be several seconds,
potentially stalling other tasks competing for the thread pool.

So use a dedicated thread pool, which also allows to have it sized based
on the number of the audio lines.
 2016-06-23 16:16:48 +02:00
draxdyn
1dddda6599 Fix broken threading in CardPanel 
The current code is broken, can't touch the UI in a thread pool thread,
UI.invokeLater must be used to get back on the UI thread.

Also, it must check whether the card has been changed again before setting
the image and do nothing in that case.
 2016-06-23 16:12:15 +02:00
draxdyn
5c177dcdc8 Update image when cards in editor are resized 
Currently images are blurred when changing GUI size in the editor,
and this fixes the issue.
 2016-06-23 16:01:47 +02:00
Quercitron
207961ee5f Fix that isType2 flag was not set for second sides of transform cards and flipped cards in the pictures download. 2016-06-22 13:10:42 +03:00
LevelX2
f691017cda * Gryff's Boon - Fixed that the target was wrongly selected during resolution. 2016-06-19 16:13:50 +02:00
LevelX2
84989973ed Merge pull request #2001 from draxdyn/fix_oobe 
Fix ArrayIndexOutOfBoundsException in ButtonColumn.actionPerformed
 2016-06-17 13:45:03 +02:00
LevelX2
469febfafd Merge pull request #2000 from aastrand/aastrand/password 
Add TablesPanel filter for passworded games
 2016-06-17 13:44:23 +02:00
LevelX2
5d1b96e4c9 Merge pull request #1986 from draxdyn/clicks 
Recognize double clicks made in rapid succession
 2016-06-17 13:42:38 +02:00
spjspj
8c017fe3d2 Merge pull request #2002 from draxdyn/getwizardsimage_npe 
Fix NPE in getWizardsCard
 2016-06-16 12:16:02 +10:00
draxdyn
54a7be59d0 fix NPE in getWizardsCard 2016-06-15 13:11:40 +02:00
Kranken
c445270783 Make password filter behave nice with settings 2016-06-15 00:03:22 +02:00
Kranken
9fee893ed1 Add TablesPanel filter for passworded games 
This commit makes passworded a first class property of
TableView as well as adds filtering capabilities
of open and passworded games. Useful for hiding
passworded games when looking for open play and
useful for hiding open games when playing vs
a friend on a busy server.
 2016-06-14 23:19:17 +02:00
draxdyn
d671a22398 Fix ArrayIndexOutOfBoundsException in ButtonColumn.actionPerformed 
Don't call convertRowIndexToModel with a -1 row.
 2016-06-14 18:31:33 +02:00
draxdyn
0b8404f0a4 Recognize double clicks made in rapid succession 
Currently they are not recognized, because getClickCount() will be
higher than 2 since Java interprets them as quadruple, sextuple, etc. clicks.

So, instead of checking for getClickCount() == 2, check for getClickCount()
being an even number.

This allows to quickly remove or add many cards to a deck.
 2016-06-14 13:02:51 +02:00
Alex Marcotte
a7e29b3fd0 Adding way to import deck from clipboard 2016-06-05 15:06:02 -04:00
LevelX2
266a0870ca Xmage 1.4.12v0 2016-05-29 10:59:39 +02:00
LevelX2
98fadbd8ba Merge pull request #1946 from Simown/master 
Reverted changes to deck generation sliders
 2016-05-29 10:19:11 +02:00
LevelX2
9fa0bf7bd2 Swapped main menu position of Feedback and Preferences (so Preferences is always available if you switch to a too big font size). 2016-05-29 09:53:56 +02:00
fireshoes
20ec737a58 [EMA] Added 5/23 spoilers. 2016-05-23 18:38:04 -05:00
Simown
dc10a52caf Reverted changes to deck generation sliders 2016-05-23 12:31:56 +01:00
LevelX2
f44987aa37 * Fixed that Suspend was handled as activated ability for increase/decrease of mana activation costs. 2016-05-22 16:02:10 +02:00
Quercitron
c781728b97 Add rating to the client (#1498) 2016-05-17 17:27:43 +03:00
fireshoes
a2c56d821c Added a bunch of promo cards and the new sets that were announced today. 2016-05-16 23:05:31 -05:00
LevelX2
308c485a67 Merge pull request #1913 from Bitmaximus/master 
Add tracking for quantity of artifacts in card lists. Add tracking for quantity of card types in graveyard.
 2016-05-15 18:15:28 +02:00
spjspj
f9e363fb30 spjspj - Update Rich Man draft to allow Random packs 2016-05-15 23:52:13 +10:00
LevelX2
d9066db141 * Fixed that freeform tables were not shown in thelist of open games. 2016-04-30 12:01:42 +02:00
Liam Speirs
8675e47c88 Add Card-type counter for graveyard label hover and in graveyard Dialog window. (To mirror magic online and to make delirium easier to check) 2016-04-28 00:13:32 -04:00
jeff
043a3b50cc - Added 2 great decks from the Pro Tour SOI 2016 2016-04-27 16:13:23 -05:00
Liam Speirs
8758c2de36 Add tracking for number of artifacts in card lists. 2016-04-27 14:43:40 -04:00
LevelX2
e2a8ddef0f Merge pull request #1905 from KWottrich/clean-up-java-imports 
Clean up java imports
 2016-04-26 11:37:35 +02:00
LevelX2
1fcd26fc60 xmage 1.4.11v0 2016-04-26 00:59:03 +02:00
Kenny Wottrich
f3c83d54f5 Remove Unused Imports 
Delete unused java imports that cause compiler warnings
 2016-04-24 19:50:29 -05:00
drmDev
5ab54142de W16 fix. Eldrazi Obligator fix and test 2016-04-15 12:24:04 -04:00
drmDev
e136e409fd [W16] cards added. Still does not show as Standard legal. HELP 2016-04-15 09:15:26 -04:00
Fenhl
430ae503c7 Change all line endings to LF 2016-04-14 16:18:01 +00:00
Jared Hall
3f2611de76 Fixes #1836 2016-04-12 08:16:15 -04:00
spjspj
bfc66ff3f3 spjspj - Further fixes for useFirstManaAbility 2016-04-07 15:29:18 +10:00
spjspj
dacef8db5e spjspj - Further fix for User First Mana ability. It should be false unless the user explicitly turns it on through ALT+1 or the menu options. 2016-04-07 10:46:29 +10:00
LevelX2
bcdde0a945 XMage version 1.4.10v0 2016-04-06 22:56:02 +02:00
spjspj
822917322c spjspj - Use first Mana ability fixes 2016-04-05 21:37:04 +10:00
spjspj
e5ca1bd6d2 spjspj - Implement a 'Use the first available mana ability for a land mode'. 
This allows people to float mana more easily and to not have to get the popup forcing them to select which mana ability they would like to activate.
There's a new option in the menu system under the Mana Payment section which is set via pressing 'Alt' and the number '1' key (aka Alt+1) (and is unset by releasing Alt+1).
Or they can set it from the right click menu as well.
 2016-04-04 20:30:28 +10:00
Jared Hall
44388719a6 Fixes #1755 2016-04-03 20:35:59 -04:00
spjspj
85a22ea9d9 spjspj - Add in message for F11 button 2016-04-02 10:13:54 +11:00
spjspj
3dfe9de05f spjspj - Add the 'Skip to End Step of Previous Player' button to the GamePanel and associated changes 2016-03-27 00:07:23 +11:00
fireshoes
185447c424 [SOI] Added some additional token types. Updated mtg-cards-data.txt with 3/22 spoilers. 2016-03-22 10:18:10 -05:00
fireshoes
b58a0374c6 Added missing Blessed vs Cursed image information. [SOI] Added basic lands, some additional token types and emblems. 2016-03-22 00:05:55 -05:00
rkfg
059b56e11a Add transparency to highlighted player panel. 2016-03-21 21:49:25 +03:00
rkfg
66a9e5140a Highlight current player's panel. 2016-03-20 18:42:58 +03:00
rkfg
ae66db20ad Adjust sliders on reset. 2016-03-17 15:13:29 +03:00
rkfg
981665bcd0 Remove adjust parameter. 2016-03-17 15:13:28 +03:00
rkfg
74f925b579 Fix deck generator sliders. 2016-03-17 06:30:21 +03:00
rkfg
eec3e779bd Simplify controlling of advanced deck generator sliders. 2016-03-17 03:19:20 +03:00
fireshoes
0a38430d49 [SOI] Added 3/14-15 spoilers to mtg-cards-data.txt Added Angel of Deliverance, Anguished Unmaking, Descend upon the Sinful, Drogskol Cavalry, Nephalia Moondrakes, and Sinister Concoction. 2016-03-15 17:47:21 -05:00
Simown
9dc71d2996 Added advanced deck generator functions and tidied up the layout. 2016-03-13 11:33:45 +00:00
rkfg
fec2ed464f Fix default value for "Store images in zip files". 
It's set to true as the default checkbox state but to false as the
default cached value. Because of that if preferences are never saved
images are stored to directories though the checkbox will be set in
preferences.
 2016-03-11 20:41:19 +03:00
rkfg
909a99ceec Fix transformable cards state desync. 2016-03-09 16:27:00 +03:00
rkfg
8be72c404e Add debug logging to LinePool. 2016-03-09 14:37:59 +03:00
rkfg
b513f3c7b6 Properly close, free and stop lines. 2016-03-09 14:37:58 +03:00
rkfg
d7cdfa016e Minor change, add comments. 2016-03-09 14:37:57 +03:00
LevelX2
7ac679048c Fixed a problem that a chang of the card offset value in preferences was not immediately applied to the card selector in deck editor. 2016-03-09 12:26:35 +01:00
LevelX2
4f8a3e5ae8 Fixed a bug that quitting a tournament by using the "Quit Tournament" button on the tournament panel did not work (fixes #1601). 2016-03-09 12:25:01 +01:00
rkfg
d8ff28c7f7 Refactor audio manager, add line pool. 2016-03-08 02:09:57 +03:00
Quercitron
6e4a4285b8 Fix images download from magiccards.info 2016-03-08 01:21:34 +03:00
rkfg
f95921cc73 Enable hyperlinks handling only in the game log window. 2016-03-07 03:33:04 +03:00
LevelX2
0c242bce5f * Some more support for GUI resizing. 2016-03-06 02:59:47 +01:00
LevelX2
c6f8d09229 Merge origin/master 2016-03-06 02:06:37 +01:00
LevelX2
e29c4c3516 * Fixed that the storm counter was no shown on the game panel. 2016-03-06 02:06:10 +01:00
rkfg
5fe67bda4c Remove unneded import. 2016-03-06 02:55:30 +03:00
rkfg
768b004d3e Fix race condition on tooltip resize in EDT. 
CardInfoPane.setCard() performs the tooltip resize, initially it's of
zero width and height. The resize happens in the EDT but location is
calculated in the thread pool's thread, i.e. before the first resize.
Because of that the first time the tooltip appears it may be partially
off-screen, nothing fatal but looks ugly. Now all calculations are moved
to EDT as well and they're guaranteed to happen after the resize.
 2016-03-06 02:53:32 +03:00
rkfg
98c291be7b Protect tooltip counter from going negative forever. 2016-03-06 02:53:31 +03:00
LevelX2
dd9431c8ea * Added scrolling to the game dialog area. Some more GUI resizing. Removed some unwanted borders of viewports. 2016-03-05 21:00:55 +01:00
rkfg
1ff8e42222 Prevent tooltip counter going up on hyperlink click. 2016-03-05 01:03:39 +03:00
rkfg
63ca80fc86 Recreate card thumbnails wrongly encoded as CMYK JPEG from PNG. Fixes 
#1589.
 2016-03-05 00:06:57 +03:00
rkfg
79568c82f2 Fix that when you quickly move cursor from one hyperlink to another, 
tooltip disappears.
 2016-03-04 21:39:48 +03:00
rkfg
75324f778e Fix tooltip for cards with apostrophes. If there are cards with quotes 
or lt/gt in the name, this will need more generic approach.
 2016-03-04 21:39:47 +03:00
rkfg
a612eb4585 Fix CRLF mess again. 2016-03-04 10:29:40 +03:00
LevelX2
3f57012c85 Merge origin/master 
Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
 2016-03-03 23:22:06 +01:00
rkfg
e8091daea5 Reverted crlf's back. 2016-03-04 01:13:27 +03:00
rkfg
b9bbf9ccec Store symbols as .gif instead of .jpg, rename already downloaded ones on 
start, fixes #98.
 2016-03-04 01:06:53 +03:00
rkfg
47b2a64cee Store symbols as .gif instead of .jpg, rename already downloaded ones on 
start, fixes #98.
 2016-03-04 00:59:12 +03:00
rkfg
9cf972ced4 Faster symbols load. 2016-03-03 23:04:35 +03:00
rkfg
89bce030d0 Add colorless mana filter to deck generator. 2016-03-03 00:39:58 +03:00
rkfg
6cfe43e9b7 Make DeckGeneratorDialog fields non-static for more OOP-style. 2016-03-03 00:39:57 +03:00
rkfg
5b9a38bf22 Fix first card tooltip show. 2016-03-02 14:48:57 +03:00
rkfg
ba0cd24b55 Show card tooltips in system logs. 2016-03-01 01:12:57 +03:00
rkfg
abff5c1958 Filter HTML in ability picker. 2016-02-29 20:53:03 +03:00
rkfg
f7314307a6 Reload symbols after closing the symbols download window (better UX). 2016-02-29 20:08:52 +03:00
rkfg
f00a588e24 Add Generate button to Deck Editor. 2016-02-29 19:40:00 +03:00
rkfg
3658a8c7bc Prevent NPE if client never connected to any server and doesn't have 
sets downloaded.
 2016-02-29 19:39:59 +03:00
LevelX2
6d4a3bac28 Fixed that wathcing games did not work correctly. 2016-02-28 10:52:55 +01:00
LevelX2
f87c5bbbec Fixed that the flag on avatar image could be to big. 2016-02-27 12:33:08 +01:00
LevelX2
ad4b68dcb5 Fixed card grid dimension initialisation. 2016-02-27 09:30:21 +01:00
LevelX2
56294eac50 Merge origin/master 2016-02-27 09:28:01 +01:00
LevelX2
ac757b6a88 Fixed card grid dimension initialisation. 2016-02-27 09:27:43 +01:00
LevelX2
d2b7aea306 Merge pull request #1566 from rkfg/master 
Fix building, fix NPE on sideboarding, fix one of the perl scripts.
 2016-02-27 09:26:25 +01:00
LevelX2
aa015b52e6 GUI Size - Fixed that table header lines were not horizontally moved. 2016-02-27 09:15:17 +01:00
rkfg
9842199d6f Fix NPE after finishing a round. 2016-02-26 21:09:11 +03:00
rkfg
b9dc5036ef Assembly fix. 2016-02-26 21:05:21 +03:00
Goesta
ad62546807 Improved download speed of foreign language cards 2016-02-25 19:30:20 +01:00
LevelX2
df98b4e0af * Fixed a bug with time stamp order and change of basic land type (e.g. Blood Moon and Spreading Seas). 2016-02-25 17:08:17 +01:00
Quercitron
61cad91f9b Fix images download from magiccards.info 2016-02-24 02:17:02 +03:00
LevelX2
3cd9dc3bf6 Merge pull request #1555 from goesta/wizard-multilanguage-card-download 
Added support for downloading multi-language cards form Wizards.com
 2016-02-23 21:51:36 +01:00
Goesta
36e084990a Added Wizards.com multi-language cards download 2016-02-23 17:27:01 +01:00
tritoch
3b17587b80 Spelling 
apllication -> application
 2016-02-22 15:14:02 -06:00
LevelX2
b9d3e55f94 Fixed Secluded Steppe card number in the "Wade into Battle" commander 2015 deck sample-decks directory. 2016-02-21 23:50:30 +01:00
LevelX2
74b4e5941b Fixed a spelling error in GUI Size text. 2016-02-21 23:21:21 +01:00
LevelX2
e9638bcc4d Release 1.4.9v0 2016-02-21 12:58:58 +01:00
LevelX2
51a0d8a4b2 Some more changes to GUI to better support high screen resolutions. 2016-02-21 12:15:11 +01:00
LevelX2
e04c82a227 Some more changes to GUI to better support high screen resolutions. 2016-02-21 11:30:12 +01:00
LevelX2
249d709cc7 Sizable GUI - game dialog area elements resize now. 2016-02-20 02:31:47 +01:00
LevelX2
e15807b9ed * Some more changes to adjustment possibilities of GUI size. 2016-02-19 16:30:52 +01:00
LevelX2
35505b29bb Some more changes to GUI to better support high screen resolutions. 2016-02-19 01:56:15 +01:00
LevelX2
77eff0984a Some more changes to GUI to better support high screen resolutions. 2016-02-18 00:27:48 +01:00
LevelX2
28b129018f * Some more changes to adjustment possibilities of GUI size. 2016-02-17 18:08:21 +01:00
LevelX2
5ca4e3bc7a Some more changes to GUI to better support high screen resolutions. 2016-02-16 23:15:34 +01:00
LevelX2
f54c675c4b * Fixed a bug of colorless mana (e.g. caused Heartbeat of Spring not working with Urza's lands). 2016-02-16 17:15:47 +01:00
LevelX2
129c6ca6ff Merge origin/master 2016-02-16 11:33:14 +01:00
LevelX2
4f8c4fc019 * Fixed bug that request to show players hadn did not work. 2016-02-16 11:32:23 +01:00
fireshoes
bf3e90b8ee Added DDQ and SOI cards. Added Duel Deck sample decks. Corrected Mindwrack Demon translation. 2016-02-16 00:36:17 -06:00
LevelX2
f7a7b2e7a0 Some more changes to GUI to better support high screen resolutions. 2016-02-14 23:34:36 +01:00
LevelX2
1835671f3d Some more changes to GUI to better support high screen resolutions. 2016-02-14 13:41:43 +01:00
LevelX2
7ef0a0a7f0 Some more changes to GUI to better support high screen resolutions. 2016-02-13 02:30:05 +01:00
LevelX2
706d319f81 Some more changes to GUI to better support high screen resolutions. 2016-02-12 13:35:04 +01:00
LevelX2
7b79de8e40 Some more changes to GUI to better support high screen resolutions. 2016-02-10 23:34:16 +01:00
LevelX2
a0ff08b0b9 Some more changes to GUI to better support high screen resolutions. 2016-02-10 08:31:21 +01:00
fireshoes
2a92f5e77a Added SOI and EMN sets. Added some SOI cards. 2016-02-08 20:53:09 -06:00
LevelX2
a07db4cb8e Some more changes to support GUI size for high resolutions. 2016-02-09 03:06:32 +01:00
Quercitron
d139cd591c Fix images download from magiccards.info 2016-02-09 01:39:28 +03:00
LevelX2
77a8e3e7a9 * Some fixes to font size change of chat panels. 2016-02-08 16:16:19 +01:00
LevelX2
ac2570f982 Added a chat font size option to preferences. 2016-02-08 08:49:57 +01:00
LevelX2
687ab7ec6b Added some tooltips to user table headers. History is shown in tournament player table now. Changed ratio column to numberic format. 2016-02-06 21:22:51 +01:00
LevelX2
81af372bc1 Fixed some problems with possible ConcurrentModificationExceptions and some minor changes. 2016-01-31 23:23:09 +01:00
Me Car
284c36b756 Add allowed quit ratio option to match option and tourney option. 2016-02-01 02:25:44 +09:00
Me Car
574e3cfd36 Split History column into Matches and Tourneys column. 2016-01-30 16:01:04 +09:00
LevelX2
e31b12325e Added "info [username]" command to get history for offline players. Remove user info column. 2016-01-23 16:59:15 +01:00
LevelX2
151e678e84 Changed history handling for user a bit. Added history to table waiting dialog and user avatar tooltip. 2016-01-23 13:37:34 +01:00
LevelX2
4acadf051d Minor changes. 2016-01-23 01:27:08 +01:00
LevelX2
5981816a4b Switch to 1.4.8 for upcoming realease. 2016-01-22 22:33:58 +01:00
LevelX2
93ac094470 Fixed a problem that symbols were not redownloaded if a 0 size file was created because the target file to download was not available before. 2016-01-22 14:28:46 +01:00
LevelX2
b23ddd99a0 * Some adjustments for the colorless mana symbol. 2016-01-21 23:49:24 +01:00
fireshoes
f51be0b3ef Added OGW tokens to card-pictures-tok.txt 2016-01-20 09:15:03 -06:00
LevelX2
c6eff03339 Merge pull request #1482 from menocar/user-stats 
Record game histories. Compute user stats and show them in the client.
 2016-01-20 07:31:11 +01:00
Me Car
379e61f98a Adjust the index correctly. 2016-01-20 13:04:04 +09:00
Me Car
550648ccbe Record game histories. Compute user stats and show them in the user panel. 2016-01-20 12:47:58 +09:00
LevelX2
cdbda6a7e6 * Fixed ArrayIndexOutOfBoundsException by trying to do actions on tables removed meanwhile. 2016-01-15 21:03:39 +01:00
Me Car
ea480a6593 Create MagePreferences class for managing preferences. We should move preference related code from MageFrame and PreferencesDialog to the class. Push all raw string preference key manipulations for serverAddress, serverPort, userName, password and email into the class. 2016-01-15 03:08:52 +09:00
Me Car
b114c17135 Store usrName and password per server. Update input boxes with corresponding values when server is changed in ConnectDialog. Save prefs on successful requests in RegisterUserDialog and ResetPasswordDialog. 2016-01-14 18:00:04 +09:00
Me Car
f5765383c7 Use server and port specified in ConnectDialog rather than in the preference. 2016-01-14 10:01:30 +09:00
Me Car
cb050c3208 Send password on reconnect. 2016-01-14 09:53:23 +09:00
Me Car
199e278ed9 Add input boxes to password reset form for server address and port. 2016-01-14 07:12:03 +09:00
Me Car
8801b63744 Add tooltip messages to clarify the usage of user authentication. 2016-01-12 13:31:27 +09:00
Me Car
746d034461 Implement a password reset flow. 2016-01-11 21:49:02 +09:00
Me Car
f99660a451 Add some password validation. 2016-01-11 11:15:01 +09:00
LevelX2
121f40c019 Prepared 1.4.7. 2016-01-10 22:13:59 +01:00
LevelX2
7f4291ac07 Fixed a problem of image download for OGW. 2016-01-10 22:13:30 +01:00
Me Car
a0ddd4fff0 Send an email on successful user registration. Use Gmail API for that. Add password confirmation and email to RegisterUserDialog. 2016-01-10 18:18:38 +09:00
Me Car
835f08c18f Add a user registration dialog. 2016-01-09 06:43:10 +09:00
LevelX2
aadc253afa Merge pull request #1442 from menocar/password 
Add a password user authentication when connecting to servers.
 2016-01-06 23:31:25 +01:00
LevelX2
2526dbd1c7 * Fixed null pointer exception of deck editor. 2016-01-06 22:18:35 +01:00
Me Car
32b4675f13 Integrate Shiro. 2016-01-05 03:48:43 +09:00
Me Car
33330e9345 change the type to password 2016-01-05 02:16:32 +09:00
Me Car
ea5abfe578 Add password input box 2016-01-05 02:16:32 +09:00
LevelX2
7c00e4b16d * Graveyard window - Fixed that the displayed card order was sometimes mismatched. 2015-12-25 17:43:10 +01:00
fireshoes
3008b5ed14 [OGW] Added 18 cards. Cards with <> in their activation costs are untested. 2015-12-14 23:02:35 -06:00
fireshoes
a0f80b785c Added 12/13 spoilers for OGW, EXP, and DDQ to mtg-cards-data.txt. Added Duel Decks: Blessed vs. Cursed set. Added reprints from the 12/13 spoilers. 2015-12-14 14:36:12 -06:00
LevelX2
207f486afc * Xmage 1.4.6v0 2015-12-13 19:47:04 +01:00
LevelX2
ea0ba76736 * Deck editor - Fixed a bug that prevented users to add cards to deck or sideboard (was caused by creatures with negative toughness and it was sorted by p/t - fixes #1414). 2015-12-13 10:34:35 +01:00
LevelX2
d9b20298b7 * Bloodlord of Vaasgoth - Fixed that Vampires entering the battlefield did never bloodthirst from the Bloodlord. 2015-12-13 10:05:54 +01:00
LevelX2
81e67927a5 Minor change to download of card images. 2015-12-12 17:39:14 +01:00
LevelX2
af793c30fe * Added a slider to the preferences to adjust the delay for the card tooltip window appearance. 2015-12-08 18:39:47 +01:00
fireshoes
7a102b2c35 Merge origin/master 2015-12-07 15:14:50 -06:00
fireshoes
f8ba0da7e5 [OGW] Added Mina and Denn, Wildborn. [EXP] Added filterlands. [CUBE] Renamed Holiday Cubes to Vintage Cubes. Add Vintage Cube 2016. 2015-12-07 15:13:31 -06:00
LevelX2
f7b8ab626d * Added scroll ability for system messages panel. 2015-12-05 00:48:36 +01:00
LevelX2
af23795a7b * Fixed wrong formated definition error of card-picture-tok.txt. 2015-12-03 16:53:06 +01:00
fireshoes
d0d9731da2 Added promo sets Arena League, Super Series, APAC Lands, Euro Lands, Commander's Arsenal, Champs, and Ugin's Fate. Added some Media Insert, Judge Promo, and FNM promos.Fixed a few collector numbers to match magiccards.info. 2015-12-01 20:19:28 -06:00
LevelX2
044c30b638 * Main lobby - Separated user talk from system messages by using two tabs in chat area to switch. 2015-11-29 20:01:40 +01:00
LevelX2
3a7983a0d0 * Main lobby - Separated user talk from system messages by using two tabs in chat area to switch. 2015-11-29 20:01:31 +01:00
Neil Gentleman
bfb428b13a always use log4j 
removed all references to mage.util.Logging, java.util.logging

transient static doesn't mean anything, since static fields are never
included in serialization
 2015-11-28 21:11:25 -08:00
LevelX2
0a39b0568d * Fixed that the selected avatar was not shown as avatar in the game (fixes #1365). 2015-11-28 09:38:28 +01:00
fireshoes
ce3a443a65 Updated the card-pictures-tok.txt file with some additional tokens. 2015-11-25 11:22:27 -06:00
LevelX2
8957128b13 * Renamed "Historical Standard" format to "Historical Type 2" and "Super Standard" to "Super Type 2". Added Chronicles to the set lists. 2015-11-25 17:29:23 +01:00
Neil Gentleman
a90d0e5597 reuse shared code for picking basic land sets 2015-11-22 18:00:10 -08:00
LevelX2
05dd1daee6 * Added some information to the player tooltip in game (expericence counters, deck hash code, # of wins). 2015-11-22 11:07:48 +01:00
Neil Gentleman
702be67453 correct some dodgy sample deck names 2015-11-21 22:36:07 -08:00
LevelX2
b84a315780 [C15] Fixed not correct working Commander 2015 decklists. 2015-11-21 22:56:14 +01:00
LevelX2
0d86e8e063 Xmage 1.4.5v0 2015-11-21 10:33:43 +01:00
LevelX2
cd17436c4e [C15] Added the C15 deck lists. 2015-11-19 17:25:38 +01:00
Neil Gentleman
68e850b8b8 remove old bundled mage-theme-plugin.jar 
which causes plugin loading to consistently fail, so switch back to
directly instantiating ThemePluginImpl()

this is a little unfortunate, because these plugins don't get the same
lifecycle handling as external ones

re: c25e45095e
 2015-11-15 15:28:03 -08:00
LevelX2
576a9ea74f Updated mtg-cards-data.txt. Added a land deck for Mormir Basic format. 2015-11-15 10:25:02 +01:00
LevelX2
79c04eef47 * Added Momir Basic format to table filtering so Momir Basic games are shown. 2015-11-14 19:07:48 +01:00
Quercitron
a092f965fa Add tokens.mtg.onl token images source 2015-11-13 02:54:22 +03:00
Neil Gentleman
02a6780766 add Momir Basic game type 
- re-using Emblems as Vanguard cards; should probably give them their own
  CommandObject class
- setting the timing on the Momir ability to TimingRule.SORCERY causes the
  ability not to activate (?), so I've left it at INSTANT for now
- need to add a new card image source for vanguard cards
 2015-11-11 12:31:30 -08:00
Neil Gentleman
c25e45095e remove Mage.Theme.Plugin module 
it has been a included in Mage.Client since 8ac58cfc
 2015-11-11 00:31:31 -08:00
Neil Gentleman
deb4608c00 Don't try to play null audio 
a message is already logged when loadClip fails; this avoids showing an error
dialog over and over afterwards.
 2015-11-08 22:32:43 -08:00
Quercitron
e23fc13db0 Fix pictures for some tokens from recent sets 2015-11-08 20:16:47 +03:00
fireshoes
59cf816f32 [C15] Added 11/5 spoilers and Angel of Serenity reprint, corrected Meteor Blast's translated name, and updated tokens. 2015-11-05 10:26:40 -06:00
LevelX2
c71e89c441 Merge pull request #1346 from nigelzor/misc-fixes 
Misc fixes
 2015-10-29 09:19:23 +01:00
Winston Huang
0af814f3d0 Fix MageFrame title 2015-10-28 22:04:25 -07:00
Neil Gentleman
ff1b424caf options passed to JOptionPane were backwards 
they're both -1, so this doesn't change anything
 2015-10-28 21:48:58 -07:00
fireshoes
bf2992fc42 Added Commander 2015 set; added Eternal Witness and Kalemne, Disciple of Iroas cards to C15. 2015-10-20 14:52:39 -05:00
Neil Gentleman
6c43858046 Deck Editor: Fix redraw after missing image 2015-10-19 00:27:59 -07:00
LevelX2
b3cadac4ea * Image download - Fixed a bug of mythicspoiler source, that preveneted download of EXP images. 2015-10-04 22:58:09 +02:00
LevelX2
e2453abbb5 * Fixed a bug that some options in preferences were handled with the wrong state as long as never set manually. 2015-09-29 17:26:29 +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
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
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
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
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
b63cc121ef Some minor changes. 2015-08-27 14:51:21 +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
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
LevelX2
23039572f2 Xmage 1.4.3v3 2015-08-21 09:49:53 +02:00
LevelX2
386204c085 * Draft log - Fixed a bug that the last pick was logged twice. 2015-08-19 11:46:57 +02: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
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
Simown
cedf16806e Fix to #1128 Deck generation throws IndexOutOfBoundsException. 
Reserve cards now counted correctly.
Fixed reserve card adding algorithm to stop trying to add cards out of range.
 2015-07-19 12:12:10 +01:00
LevelX2
635c33fa87 Merge pull request #1117 from brodee/master 
random draft bug fix and random draft ui improvements
 2015-07-15 08:30:22 +02:00
brodee
c7a349f65f random draft bug fix: 
packs are forced to be 15 cards; weirdness occurs if the packs are uneven sizes including the draft ending early.
Random draft ui improvements: 
only the sets that will be used are displayed in the lobby, and the number of characters is large but still greatly reduced.
the pack selector ui will prevent you from chosing fewer than 2 packs.
 2015-07-14 22:34:58 -07:00
LevelX2
6cf0a59644 * Fixed possible null pointer exception in client. 2015-07-12 09:19:43 +02:00
LevelX2
c9cc7d7920 * Zurgo Helmsmasher - Fixed a bug that could happen if Zurgo is used as commander. 2015-07-12 09:03:04 +02:00
LevelX2
b38885b7bf * Fixed a bug that prevented that the width of connection column in user list was restored. 2015-07-09 09:59:20 +02:00
Simown
6a5eb8ff83 Small fixes to constants, added header and standardised spelling 2015-07-09 01:58:45 +01:00
LevelX2
b80e27f3b3 * Fixed handling of Phyrexian mana. 2015-07-09 01:43:26 +02:00
Simown
a1fd4e91f0 Overhaul and fix of random deck generation. 2015-07-08 23:13:21 +01:00
LevelX2
d847fb7109 Some minor changes. 2015-07-08 22:51:31 +02:00
Nidhoegger
9be613beb9 Fixed Issue #1054. Buttons in Feedback panel will only get focused, if the MageFrame has the focus thus preventing focus theft from other programs. 2015-07-06 10:51:06 +02:00
LevelX2
d33f85d04a Fixed wrong name for download of Kothophed, Soul Hoarder image. 2015-07-04 19:26:48 +02:00
LevelX2
cd0cba6ec7 XMage Release 1.4.2v0 2015-07-04 01:28:19 +02:00
LevelX2
1c157a20ae * Fixed a bug caused by now possible column order setting in tournament panel. 2015-07-03 22:44:08 +02:00
LevelX2
0f5f8493c7 Improved fix for #584 by Nidhoegger. 2015-07-03 12:34:13 +02:00
LevelX2
589b63c5b1 Fix for the "Modal Window bug under Linux (e.g. X value announcement) by Nidhoegger. 2015-07-02 20:48:32 +02:00
LevelX2
3eb1fd4047 Added a button to attack with all available cratures. 2015-07-02 17:03:14 +02:00
LevelX2
0cbe590cac * Fixed that mana auto-payment settings were not correctly set from previous settings on game start. 2015-07-02 13:18:12 +02:00
LevelX2
0a0cb40783 * Fixed that creatures that have to pay costs to block were wrongly forced to block causing UI locks. 2015-07-01 23:00:22 +02:00
LoneFox
ca0793a5c1 Fix systematic misspelling of "hover" 2015-06-30 21:28:32 +03:00
LevelX2
df3e6db569 Please test! Some changes to the display of user choices, showing also a longer text in tooltip window. 2015-06-28 21:55:48 +02:00
LevelX2
d24777cd15 Merge pull request #1062 from brodee/master 
random booster draft UI improvement
 2015-06-28 18:37:27 +02:00
brodee
cd1352eb01 Switch to a separate window to chose the packs for random booster drafts. 2015-06-27 23:16:59 -07:00
LevelX2
87f3978589 Some changes to userData handling. Added country flag to some dialogs. Saved and restored some more table columns width and order information. 2015-06-28 00:10:38 +02:00
LevelX2
81934e32e3 * Revealing the top card of the library is now also shown by an extra window (no longer hiding life). Now Iconyfying and deiconifying does not change the postion of the reveal window. Iconifyed window width was a bit raised to be able to read more of the title in that state. 2015-06-25 01:07:34 +02:00
LoneFox
e139e4524f Don't use a proprietary class. Fixes build on OpenJDK. 2015-06-24 19:31:15 +03:00
LevelX2
72408a7f52 Added card frame downloader. 2015-06-24 13:41:14 +02:00
LevelX2
ca9e52f99b Merge pull request #1052 from brodee/master 
code review comments for chaos/random booster draft:
 2015-06-24 06:56:45 +02:00
brodee
38235d9023 Update NewTournamentDialog.java 
removing commented code
 2015-06-23 21:08:39 -07:00
brodee
4113976b7e code review comments for chaos/random booster draft: 
1. rename chaos booster draft to random booster draft
2. save packs selected in the user preferences
3. print "Random Boosters" in the player draft viewer during the draft
 2015-06-23 21:04:59 -07:00
Brodee
ac0aa65aab code review comments for chaos/random booster draft: 
1. rename chaos booster draft to random booster draft
2. save packs selected in the user preferences
3. print "Random Boosters" in the player draft viewer during the draft
 2015-06-23 20:59:05 -07:00
fireshoes
35d47229ea Merge origin/master 2015-06-23 20:39:07 -05:00
fireshoes
0568f16788 Added 3 Premium Deck Series sets and all From the Vault sets, and added all existing cards for them. 2015-06-23 20:37:26 -05:00
LevelX2
0a3c081ded Merge pull request #1048 from brodee/master 
Chaos booster draft implementation
 2015-06-23 21:59:46 +02:00
LevelX2
2547753dcb Added Sen Triplets (Alara Reborn = 100%). 2015-06-23 16:15:14 +02:00
LevelX2
5b02b5b32c Exile, Reveal, Looked At windows of a game are hidden now as you switch to another pane (e.g. other game, tables, deck editor) and shown again as you switch back. 2015-06-23 16:14:11 +02:00
LevelX2
6b2bfc5e19 Merge origin/master 2015-06-23 08:36:28 +02:00
LevelX2
ba9d616a27 Fixed two old URLs. 2015-06-23 08:35:23 +02:00
brodee
e3b84eaab5 chaos booster draft implementation first check-in 2015-06-22 21:55:43 -07:00
fireshoes
cda11b280c Merge origin/master 2015-06-22 18:47:51 -05:00
fireshoes
00569c4047 Added 12 Clash Pack promos, 5 judge promos, 2 upcoming FNM promos, renamed MerfolkToken to MerfolkWizardToken, added collector's number that were missing for ORI in mtg-cards-data.txt, added other various cards. 2015-06-22 18:46:01 -05:00
LevelX2
67e9ee1fa9 * Changed graveyard window handling to a window that can stay open. 2015-06-23 00:46:27 +02:00
LevelX2
87f919ecac * Reworked handling of revealed and look at windows. Windows can stay open now and moved to a position and stay there. 2015-06-21 23:49:16 +02:00
LevelX2
cd0f273122 Fixed a bug that if a human player had to discard more cards than he had on hand, the game UI was blocked. 2015-06-15 17:35:48 +02:00
LevelX2
0b2e61081a Fixed a problem with the country flag resource name causing null pointer exceptions and graphical problems on the client side. 2015-06-14 14:53:23 +02:00
LevelX2
060a468d4b Update to release 1.4.1. 2015-06-14 02:43:16 +02:00
LevelX2
6420666668 Some fixes to player handling. 2015-06-14 02:42:56 +02:00
LevelX2
526a93df7e Some fixes to user table. 2015-06-14 02:42:32 +02:00
LevelX2
adefaf890a [ORI] Added 47 cards. 2015-06-13 21:52:54 +02:00
LevelX2
ce26bc8ed0 Added option to deactivate to ask th eplayer in which order cards go to gaveyard. 2015-06-13 12:27:50 +02:00
LevelX2
0f37d0fcd0 Added country name to tooltip of country icon in user list. 2015-06-13 11:30:25 +02:00
LevelX2
d28a956754 Merge origin/master 2015-06-13 00:33:58 +02:00
LevelX2
4f6d3f3a1a * Password join value is now distinct from password you set of for a new table. 2015-06-12 08:12:38 +02:00
LoneFox
90486afdbb If saving a thumbnail image fails, delete the resulting file. 
OpenJDK throws "javax.imageio.IIOException: Invalid argument to native writeImage", because it
does not support transparency, and that results in zero-sized thumbnail files being created.
 2015-06-11 09:17:05 +03:00
LoneFox
658daa65e3 Fix typo 2015-06-11 08:43:12 +03:00
LevelX2
132ded19f6 Show country flag icon in user table. Save and restore column width and order. 2015-06-11 00:11:40 +02:00
LevelX2
8ae9293c98 * Added user country flag. View of image in user list is still missing. 2015-06-10 17:52:18 +02:00
LevelX2
21e2066bba * Akron Legionnaire - Fixed not correct working restrict ability. 2015-06-08 22:51:48 +02:00
LevelX2
3b61a10237 Fixed some bugs and added a AI Test player class. 2015-06-08 18:31:54 +02:00
LevelX2
9da44a547d Added an option that player has to confirm if he passes priority with empty stack and has mana in his pool. Implements #707. 2015-06-07 22:37:12 +02:00
LevelX2
907ec7abb0 Added new option for mana payment handling of mana already in the mana pool. Reworked the battlefield context menu a bit. 2015-06-07 17:14:43 +02:00
LevelX2
8acf28eed1 * Added optional rollback current turn and up to 3 previous turns to the battlefield menu. All other players have to agree to the rollback to let it happen. 2015-06-07 00:53:08 +02:00
LevelX2
a50447c84d * Setting of mana automatic payment option is saved and restored now so persistent between games (fixes #1002). 2015-06-05 00:05:40 +02:00
LevelX2
3b9cb1dc6e Add land dialog is now also shown during free deck building. Added a set selection drop down box to select the set the lands are used from. 2015-06-04 19:37:54 +02:00
LevelX2
bafd27f5b3 Identifier are shown for Looked at and revealed cards view 2015-06-03 17:05:59 +02:00
LevelX2
022d8790fc Saved skill filter setting of active tables list. 2015-06-03 00:11:15 +02:00
LevelX2
eb96b08dfa Release 1.4.0v2 2015-05-25 23:33:41 +02:00
LevelX2
51397a93df Added some checking for valid deck and game type combinations on match creation dialog. 2015-05-22 22:37:54 +02:00
LevelX2
ae89cef011 * Fixed a bug in table sort that could produce a cast error if tables are sorted by skill level. 2015-05-22 21:25:59 +02:00
LevelX2
ab79a6a308 * Changed some references from xmage.info to xmage.de. 2015-05-22 00:42:02 +02:00
LevelX2
d7255f971c * Some more minor changes. Added test. 2015-05-21 23:25:46 +02:00
LevelX2
bc61ef6fb8 * Update to version 1.4.0v0. 2015-05-13 01:05:12 +02:00
LevelX2
fa847e8feb * Update to version 1.4.0v0. 2015-05-12 23:11:25 +02:00
LevelX2
ed501cad21 * Some minor adjustements/changes. 2015-05-12 23:00:34 +02:00
LevelX2
28d46e2a95 * Added a simple identifier to tooltip and game log to be able to identify the exact target if multiple objects with the same name exist. 2015-05-12 17:30:14 +02:00
LevelX2
69b381779b * Added a simple skill level to set and filter for tables. 2015-05-12 15:10:24 +02:00
LevelX2
15efe14fd5 * Fixed human players controlling other human players turn (e.g. by Mindsliver). 2015-05-12 01:10:56 +02:00
LevelX2
be11d287dc [MM2] Added new download source mythicspoiler.com. 2015-05-11 22:06:38 +02:00
LevelX2
5c018b15af Changed Modern Masters 2015 short designation to MM2. 2015-05-10 11:26:35 +02:00
LevelX2
7e9340dee7 Fixed that action column was not handled correctly after client restart if user changed their position in column order. 2015-05-10 10:54:54 +02:00
LevelX2
9c97953b6b Added some font color to object and player names output to game logging and feedback area. 2015-05-09 21:18:00 +02:00
LevelX2
853be4ce65 Added some tests and an legacy example deck. 2015-05-08 09:12:37 +02:00
LevelX2
951198a578 Added some more handling for missing images. 2015-05-07 23:54:28 +02:00
LevelX2
4cf21739c4 * Saved position and size of choice window during a game session. 2015-05-06 16:58:14 +02:00
LevelX2
383b3f3bdb Added 2 legacy example decks. 2015-05-06 08:31:41 +02:00
emerald000
3e2f992fae Added Sin of the Past. 2015-05-05 17:06:37 -04:00
Nathaniel Brandes
2f476b7c53 Cleanup sets. 
This is an extensive renaming of sets to their correct names. "Duel
Decks" and "Not Standard Legal" have been merged into a "Supplemental"
set type. MTGO-only sets have been put into their own set type, just
like magiccards.info. Supplemental sets now have a "block" which is the
block that they have under magiccards.info, for easier organization. The
deck builder on the client now relies on an autogenerated list instead
of a hardcoded one.
 2015-05-03 20:07:13 -07:00
LevelX2
9e8157827a * Fixed that face down exiled cards were revealed in player specific exile view window. 2015-05-02 12:19:09 +02:00
LevelX2
efb02f633c Fixed handling of default columns width. 2015-04-27 23:13:00 +02:00
emerald000
ffaffa39f8 Fixed NPE in the Tables panel. 2015-04-27 16:52:10 -04:00
LevelX2
0adeb0770f Added limited as format to the active table filter. 2015-04-26 21:45:24 +02:00
LevelX2
e662111ddd Added save/restore of active table columns order. 2015-04-26 21:31:27 +02:00
Nathaniel Brandes
e53079c36c Fix some gatherer image loading. 2015-04-26 04:13:20 -07:00
LevelX2
987a62448e Added save/restore of column width of active tables. 2015-04-26 10:31:24 +02:00
LevelX2
b846d0c411 Some minor changes to active table handling. 2015-04-25 16:37:08 +02:00
LevelX2
8add25f74f Finished table selection updates. 2015-04-25 13:06:50 +02:00
LevelX2
a3dba9b1d0 Added some error handling client startup. 2015-04-25 11:07:01 +02:00
LevelX2
b096379881 Update to table filtering. 2015-04-25 02:20:54 +02:00
LevelX2
26b88d3b48 Update table selection. 2015-04-24 16:34:50 +02:00
LevelX2
c285fc6c4d Started adding a simple filter to list of open tables. 2015-04-23 17:51:05 +02:00
LevelX2
2157c63160 State if table with completed games is shown is saved in java prefs now. 2015-04-23 16:19:24 +02:00
LevelX2
55322b4015 Added Masters Edition Sets I - IV. 2015-04-23 15:44:01 +02:00
LevelX2
49e89a9a19 Fixed a problem with downloading cards with AE in name from Gatherer. 2015-04-23 15:42:34 +02:00
LevelX2
d245ce1ad2 * Fixed that card name text was covered by next card beneath if cards are displayed close together (library search). 2015-04-16 16:29:54 +02:00
LevelX2
e556dcea51 * Trail of Mystery - Made basic land selection optional. 2015-04-15 17:18:14 +02:00
LevelX2
809bf663df * Fixed land image downloading from gatherer and handling of Anthology Duel Decks. 2015-04-12 10:37:16 +02:00
LevelX2
bfa82a9c3f Added the handling of paged visual lists for image download from Gatherer. 2015-04-10 15:13:25 +02:00
LevelX2
c65adebc57 Fixed that to allow watchers of a game to see the hand cards of players did not work correctly. 2015-04-10 12:36:22 +02:00
LevelX2
8f65053edb Merge origin/master 2015-04-10 00:40:04 +02:00
LevelX2
d3dba58358 * Fixed that continuous effects of copied cards with limited duration stop to work as the copied card stops to exist. 2015-04-10 00:39:06 +02:00
fireshoes
adfc4711d2 [TPR] Removed from the image url ignore list. 2015-04-09 17:21:29 -05:00
LevelX2
7292a1625c [TPR] Added Dracoplasm. 2015-04-09 18:09:05 +02:00
LevelX2
6ae9c01979 Merge pull request #888 from FenrisulfrX/thunder 
Added Thunder Dragon
 2015-04-07 13:45:10 +02:00
LevelX2
f62d3ac227 * Exploit - Fixed that Exploit also triggered if the creature with Exploit left the battlefield before the first ability of Exploit resolved. 2015-04-07 00:27:07 +02:00
FenrisulfrX
5eea5b9623 Added Thunder Dragon 
Also added both decks form the DUEL DECKS: KNIGHTS VS. DRAGONS set.
 2015-04-06 10:57:50 -03:00
LevelX2
5c2189fdd7 Added Exception to read of server list that shows local buffered list. 2015-04-05 09:43:45 +02:00
LevelX2
2723bf6cb7 * Fixed some problems with order selection of triggered abilities not showing the card images. 2015-04-04 14:11:49 +02:00
LevelX2
014e8a2f0f Update Jak Gem's Constellation Recursion.dck 2015-04-04 00:39:09 +02:00
LevelX2
35125e3462 Rename Jak Gem’s Constellation Recursion.dck to Jak Gem's Constellation Recursion.dck 2015-04-04 00:38:43 +02:00
LevelX2
dcdf37b31f Rename Thiago Rodrigues – Abzan Midrange.dck to Thiago Rodrigues - Abzan Midrange.dck 2015-04-04 00:29:56 +02:00
LevelX2
4a066b83e3 Rename Matteo Cirigliano – G_B Enchantress.dck to Matteo Cirigliano - G_B Enchantress.dck 2015-04-04 00:29:37 +02:00
LevelX2
175f84f22c Rename Lukas Blohon – G_B Enchantress.dck to Lukas Blohon - G_B Enchantress.dck 2015-04-04 00:29:05 +02:00
LevelX2
867f1da8b9 Rename Giovanni Rosi – Mono-red.dck to Giovanni Rosi - Mono-red.dck 2015-04-04 00:28:47 +02:00
LevelX2
f691e6acbb Rename Einar Baldvinsson – Temur Aggro.dck to Einar Baldvinsson - Temur Aggro.dck 2015-04-04 00:28:27 +02:00
LevelX2
cca261e3d5 Rename Christian Seibold – Sidisi.dck to Christian Seibold - Sidisi.dck 2015-04-04 00:27:40 +02:00
LevelX2
89065dd69e Rename Alexander Pasgaard – Jeskai.dck to Alexander Pasgaard - Jeskai.dck 2015-04-04 00:27:10 +02:00
LevelX2
82ecb27318 Rename White-Blue Tron – Kirby Kaufman.dck to White-Blue Tron - Kirby Kaufman.dck 2015-04-04 00:12:27 +02:00
LevelX2
05aa3a60e0 Rename White-Black-Red Burn – Phillip Gorz.dck to White-Black-Red Burn - Phillip Gorz.dck 2015-04-04 00:12:07 +02:00
LevelX2
d3c4105502 Rename White-Black Tokens – Jason Wrisley.dck to White-Black Tokens - Jason Wrisley.dck 2015-04-04 00:11:43 +02:00
LevelX2
fc5e68864d Rename Tribal Zoo – Billy Hahn.dck to Tribal Zoo - Billy Hahn.dck 2015-04-04 00:11:22 +02:00
LevelX2
99b1e9465a Rename Mono-Red Burn – Eric Rath.dck to Mono-Red Burn - Eric Rath.dck 2015-04-04 00:11:02 +02:00
LevelX2
086f042ba2 Rename Cruel Control – Scott Lewis.dck to Cruel Control - Scott Lewis.dck 2015-04-04 00:10:43 +02:00
LevelX2
789797fa91 Rename Cruel Control – Jeremiah Duggan.dck to Cruel Control - Jeremiah Duggan.dck 2015-04-04 00:10:19 +02:00
LevelX2
9bba381d9a Rename Affinity – Alex Ledo.dck to Affinity - Alex Ledo.dck 2015-04-04 00:09:08 +02:00
LevelX2
69832cbaf3 Rename RG Tron – Jacob Wilson.dck to RG Tron - Jacob Wilson.dck 2015-04-04 00:08:46 +02:00
LevelX2
fb62c44e45 Rename Soul Sisters – Chris Folk.dck to Soul Sisters - Chris Folk.dck 2015-04-04 00:08:22 +02:00
LevelX2
763d1ae32c Rename Krond — Clothes in a Bag.dck to Krond - Clothes in a Bag.dck 2015-04-03 19:36:07 +02:00
LevelX2
2d274ec39a [TPR] Added Wood Sage, Vhat-Il Dal and Soltari Guerillas. 2015-04-02 08:35:54 +02:00
LevelX2
71ca7ee8a1 Merge pull request #862 from FenrisulfrX/urzasrage 
- Added Urza's Rage
 2015-03-31 07:47:59 +02:00
fireshoes
2b2db2df6c Added set Tempest Remastered and reprints. Added Pit Trap. Updated latest Game Day, FNM, Buy-a-box, WMCQ, and Release promos. 2015-03-30 22:17:43 -05:00
FenrisulfrX
fa211acde7 - Added Urza's Rage 
Also added the Coalition deck.
 2015-03-30 20:43:41 -03:00
LevelX2
45aa5f675c * Update Gatherer Downloader. 2015-03-29 03:48:55 +02:00
fireshoes
4f63793578 Submitted Skeleton Shard (Planechase) and Wall of Deceit (Jace vs Chandra) 2015-03-28 09:30:28 -05:00
FenrisulfrX
2b58766d42 Implement 6 Cards 
Implemented 6 cards needed to add the Phyrexian deck from Phyrexia vs
coalition Duel Decks.
Cards Implemented:
* Hornet Cannon
* Phyrexian Battleflies
* Phyrexian Colossus
* Phyrexian Processor
* Phyrexian Totem
* Sanhuine Guard
 2015-03-23 18:59:58 -03:00
FenrisulfrX
fd4e4a7d72 Implement 7 cards 
Implemented cards need to recreate the Ajani vs. Nicol Bolas decks.
Cards Implemented:
Agonizing Demise
Fleetfoot Panther
Morgue Toad
Ogre Savant
Pain // Suffering
Spite // Malice
Steamcore Weird
 2015-03-22 16:54:23 -03:00
LevelX2
740611119b * Mikaeus, the Unhallowed - Fixed that the given undying ability did not trigger. 2015-03-22 19:47:46 +01:00
fireshoes
227052f108 Removed DTK from the ignore list in image.url.properties. [Homelands] Added Cemetery Gate 2015-03-18 11:33:11 -05:00
LevelX2
2198a01781 Changed font for feedback area from "times" to logical java font "Dialog". 2015-03-18 10:07:03 +01:00
betasteward
9ad8530dee moved faceDown property from Card to CardState 2015-03-12 22:09:12 -04:00
fireshoes
8256344871 [DTK] Updated mtg-cards-data.txt for basic lands. Updated DTK tokens. 2015-03-12 11:22:55 -05:00
LevelX2
8afc1e24bb * Added missing Centaur token reference, get cantaur token by random. 2015-03-12 16:55:12 +01:00
LevelX2
e29eea791c * Fixed null pointer exception for tooltip and triggered abilities (made a kind of workaround and it's still unclear to me what caused this problems). 2015-03-12 16:54:30 +01:00
LevelX2
36d9df40cb * Updated pom. 2015-03-12 01:20:08 +01:00
LevelX2
68255ac316 Removed http://mtgimage.com/ from image download sources. 2015-03-11 17:11:30 +01:00
fireshoes
977645f88f Fixed minor spelling errors 2015-03-06 17:25:17 -06:00
fireshoes
392631953d [DTK] Updated mtg-cards-data.txt. Added Epic Confrontation. [ORI] Added set Magic Origins. [MMB] Added set Modern Masters 2015 and Karn/Emrakul/Goyf reprints. 2015-03-06 17:18:39 -06:00
LevelX2
68efd82ee8 * Storm counter - Moved the counter to hot key area to prevent area movement for small screen resolutions. Added an option in preferences to switch counter on/off. 2015-03-05 18:03:43 +01:00
fireshoes
db379f6ff5 Added set Prerelease Events foralready implemented pre-release promos. Added latest Game Day and Launch promos. 2015-03-04 21:44:58 -06:00
fireshoes
2eb372909d Updated mtg-cards-data.txt with 3/2 DTK spoilers, added DTK Djinn Monk token to card-pictures-tok.txt 2015-03-02 13:29:56 -06:00
fireshoes
97a1c2228f Added Dragons of Tarkir set 2015-03-01 20:29:34 -06:00
LevelX2
6bd17716cd Some minor changes. 2015-02-27 18:09:49 +01:00
LevelX2
fa59699769 Made the storm counter more visible. 2015-02-27 01:08:08 +01:00
LevelX2
9fbd5a04bd * Maven - Added workaround for bug in compiler plugin 3.2 that alwas all sources were compiled. 2015-02-22 11:17:25 +01:00
LevelX2
79e9312893 * Fixed the annoying SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" on client start. Updated a lot of POM references. Fixed warnings of Test Project. Some changes to logging. 2015-02-20 13:58:13 +01:00
daagar
ca8e78e7d1 Add new Duel Deck "Devine vs. Demonic" 2015-02-16 20:02:40 -06:00
LevelX2
d8e1a843c6 * Tidehollow Sculler - Fixed that the exiled card did not return opponents hand. 2015-02-16 20:46:23 +01:00
LevelX2
2969ea2fac * Runic Repetition - Fixed that exiled cards not in the default exile window could not be selected as target (fixes #720). 2015-02-15 23:53:35 +01:00
LevelX2
0cda1f7731 * Fixed spelling error for Fire // Ice card of Holiday Cube 2014. 2015-02-08 09:54:23 +01:00
LevelX2
ea8446d097 * Added some error handling for connect to server action. 2015-02-07 18:15:11 +01:00
LevelX2
4e56e584b6 * Fixed that PriorityTimer was not canceled. Added gaeId to Timer name. 2015-02-05 22:43:51 +01:00
LevelX2
0f61f5269d * Fixed storm counter (removed +99 amount and showing only figues > 0). 2015-02-04 17:31:21 +01:00
LevelX2
2e38bf007a * Example decks - Some modern decks. 2015-02-04 00:35:57 +01:00
LevelX2
41c6c47092 * Added promotional, Duel Deck and Non-standard-legal sets to SetType. Changed sets and set selection accordingly. 2015-02-04 00:34:18 +01:00
LevelX2
91fe62b396 Added a little spell cast during current turn counter (Storm) below the phase panel. 2015-02-03 17:31:40 +01:00
fireshoes
7f5bb1ba01 Merge origin/master 2015-02-03 00:49:28 -06:00
fireshoes
e97dd1299f Added WPN Gateway set and reprints, Sol Grail, Spike Rogue, Quirion Elves, Krosan Wayfarer, Crookclaw Transmuter, and Centaur Glade 2015-02-03 00:46:33 -06:00
LevelX2
dd54269216 * Fixed handling of Split cards (fixes #670). 2015-02-03 00:05:30 +01:00
Kranken
f8dd3a1491 Fixed a bug when showing and hiding drafted cards 
This commit fixes the following bug:

1) Draft a couple of cards in draft mode
2) Hide a card
3) Show all cards
4) Hide another card

Here both cards got hidden, this commit makes sure
only the card in 4) gets hidden
 2015-02-01 16:45:05 +01:00
LevelX2
8d6c25b3e8 * Fixed handling of morphed cards in exile zone. 2015-01-31 12:45:54 +01:00
LevelX2
e74c10289e * Dash - Fixed that the return effect did also return the creature it it was already recast before end of turn. 2015-01-30 20:03:22 +01:00
LevelX2
6ef8b4f976 * Reworked DB comparison between client and server. 2015-01-25 19:21:50 +01:00
LevelX2
3d55659568 * Fixed that permanets attached to non permanents (Enchant player and no curse / enchant card in graveyard) are shown wrongly attached to the first other permanent on the battlefield (fixes #632). 2015-01-24 23:21:00 +01:00
LevelX2
001e17a73e * Fixed handling of enlarged view for manifested and morphed cards. 2015-01-24 19:43:53 +01:00
LevelX2
c8eb9f00a9 * Fixed that lose restricting effects could not be replaced (e.g. by Abysal Persecutor's ability) if the player has conceded or left the match. Fixed that "can't win" or "can't lose" messages where repeated send to the players if such an effect activly prevents a player from losing or winning. 2015-01-21 23:41:11 +01:00
LevelX2
fbf049ea2e Allow FRF image download. 2015-01-16 00:57:03 +01:00
fireshoes
89a991156d Updated some Media Inserts set information and added some reprints 2015-01-13 02:28:56 -06:00
LevelX2
97d8715488 [FRF] Added Temur War-Shaman, Yasova Dragonclaw, Whisperwood Elemental and Dromka, the Eternal. 2015-01-03 15:25:21 +01:00
LevelX2
f2a9a75e8f * Client cards db will be compressed nos as you close XMage client. 2014-12-31 15:57:18 +01:00
LevelX2
64176c1fa6 * Fixed possible null pointer exception for add land dialog. 2014-12-29 15:06:56 +01:00
LevelX2
dda73f304e * Fixed possible null pointer exception for add land dialog. 2014-12-29 15:05:01 +01:00
LevelX2
ef55b7fe2e * Jude Promo - Fixed wrong set code (from CMD to JR) that caused that Commander (2012) cards are not available for games. 2014-12-28 13:16:57 +01:00
LevelX2
d4ad6cf6a6 * Added some more set aliases. 2014-12-27 17:35:46 +01:00
LevelX2
c4ad51c4af * Tournament password - Fixed that the dialog to enter the password was not opened. 2014-12-27 03:52:07 +01:00
LevelX2
7d30d288be * Chnages to text of priority prompt. 2014-12-26 23:00:02 +01:00
LevelX2
c8c6cbc550 * Added Decklist - Speed vs. Cunning. 2014-12-26 21:31:18 +01:00
LevelX2
071a611f91 * Added phase step name to the priority prompt text. 2014-12-25 02:08:24 +01:00
LevelX2
9ff1f60903 * Added card name and set abbr. to error message if download failed. 2014-12-25 02:00:58 +01:00
fireshoes
f3707e1f53 Added Grand Prix, Launch Party, and WMCQ promos 2014-12-24 02:41:45 -06:00
fireshoes
8d0e277dbb Added Judge Promos 2014-12-23 22:08:13 -06:00
fireshoes
c93c5c3011 Added Game Day promos 2014-12-23 14:52:09 -06:00
fireshoes
a8b20f23d5 Added Friday Night Magic promos 2014-12-23 06:49:01 -06:00
fireshoes
086f860396 Added Fate Reforged set, Valorous Stance FRF card, KTK Block Constructed option, added missing card to Holiday 2014 Cube 2014-12-21 19:57:23 -06:00
fireshoes
9ea54b38c2 Merge origin/master 2014-12-20 04:47:33 -06:00
LevelX2
4d658909ee Added Sentinel, Wakestone Gargoyle, Silhana Starfletcher and Orchard Warden. 2014-12-17 15:28:33 +01:00
fireshoes
bf29352ba6 Added Fate Reforged set and Pride of the Clouds card 2014-12-16 14:07:59 -06:00
LevelX2
7b738474a9 * Some fixes to the exile effects with duration. Fixed that exiled cards/permanets did not come back if causing card was put into play and exiled by Whip of Erebos. 2014-12-14 22:56:37 +01:00
LevelX2
424448b38f * Handling of resource images fixed. 2014-12-14 22:54:58 +01:00
LevelX2
f5b131f7fa Readded unintended deleted wav file. 2014-12-13 17:57:44 +01:00
LevelX2
213275de5a Some changes to play of audio clips. 2014-12-12 18:16:23 +01:00
LevelX2
1ed1bc2e0d * Added a color indication in the tooltip window. 2014-12-12 11:34:34 +01:00
LevelX2
44c797f88e Added 4 missing duel sets and the already implemented cards. Some changes to logging of download. Some fixes to token download configuration. 2014-12-11 12:46:06 +01:00
LevelX2
b3f1cc002e * Changes to server lock handling and logging. 2014-12-10 15:00:55 +01:00
LevelX2
30869beca0 * Some changes to game start logic (better handling for disconnected users). Changes to server logging. 2014-12-08 01:30:18 +01:00
LevelX2
cee5d0d487 * Added sound for starting game. 2014-12-05 20:13:48 +01:00
LevelX2
8748220ce2 * Updated serverlist.txt. 2014-12-05 20:13:31 +01:00
LevelX2
496331995a [C14] Added decklist of the green deck. 2014-12-03 20:21:34 +01:00
LevelX2
00bbadd0c3 * Added red C14 deck. 2014-12-02 16:59:34 +01:00
LevelX2
2af52cfd3a [C14] 11 white cards + 1 Artifact + white deck list + some minor fixes to framework and other cards. 2014-12-01 16:59:36 +01:00
LevelX2
1b80bc3cfb [C14] Added the blue C14 deck (complete). 2014-11-29 01:45:24 +01:00
LevelX2
07b509684a * Fixed some handling problems with face down creatures (Ixidron). 2014-11-28 17:38:53 +01:00
LevelX2
4262850553 Modified logic that decides when the popup window will be enlarged. 2014-11-28 09:13:28 +01:00
LevelX2
4cd5fa9636 Moved Commander 2013 decks to subfolder. 2014-11-27 15:21:38 +01:00
LevelX2
4ae5ac129d Some tweaking to the size of the card popup window. 2014-11-27 15:20:45 +01:00
LevelX2
eca6042257 [C14] Added some colorless cards. + Ruhan of the Fomori. 2014-11-27 15:20:08 +01:00
LevelX2
1cdf2ab4b0 [C14] Added two planeswalker and 10 black cards. 2014-11-27 00:56:35 +01:00
LevelX2
67479bb5a4 * Fixed wrong timer handling while other player controlled a player's turn. Attackers now marked with blue frame. Playable cards have a violet frame. If a player has to select cards from hand, the possible cards are marked yellow now. Discard of multiple cards now marks already selected cards and happens in one selection. 2014-11-26 01:48:00 +01:00
LevelX2
7e145d2cfd * Added possibility to allow other players to see hand cards of player. 2014-11-24 23:03:21 +01:00
LevelX2
c22b54d262 *Draft - Non hidden picked cards go to the deck. Hidden cards to sideboard. 2014-11-23 18:43:31 +01:00