github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
16210 commits 2 branches 0 tags 782 MiB
Commit graph

668 commits

Author SHA1 Message Date
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
LevelX2
266a0870ca Xmage 1.4.12v0 2016-05-29 10:59:39 +02:00
Quercitron
c781728b97 Add rating to the client (#1498) 2016-05-17 17:27:43 +03:00
spjspj
f9e363fb30 spjspj - Update Rich Man draft to allow Random packs 2016-05-15 23:52:13 +10: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
LevelX2
1dbba3f7a9 * Soulbond - Reworked to two triggerd abilities (fixes #1882). 2016-04-16 02:43:52 +02:00
LevelX2
5770dd6014 Added some lost and reconnect statistics to footer data. 2016-04-14 23:43:08 +02:00
Fenhl
430ae503c7 Change all line endings to LF 2016-04-14 16:18:01 +00:00
LevelX2
3fbcfca1ee xmage 1.4.10v1 2016-04-09 00:05:12 +02:00
LevelX2
bcdde0a945 XMage version 1.4.10v0 2016-04-06 22:56:02 +02:00
LevelX2
a15f206233 Xmage 1.4.9v4 2016-03-27 19:49:16 +02:00
LevelX2
a317d368a3 Xmage Release 1.4.9v3 2016-03-27 12:54:59 +02: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
LevelX2
578cb128dd xmage 1.4.9v2 2016-03-12 12:50:26 +01:00
LevelX2
e29c4c3516 * Fixed that the storm counter was no shown on the game panel. 2016-03-06 02:06:10 +01:00
LevelX2
f53daaaf94 Xmage 1.4.9v1 2016-02-28 18:39:21 +01:00
LevelX2
e9638bcc4d Release 1.4.9v0 2016-02-21 12:58:58 +01: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
706d319f81 Some more changes to GUI to better support high screen resolutions. 2016-02-12 13:35:04 +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
d2eb6151f1 Fixed some possible exceptions. 2016-02-06 02:12:51 +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
a33aa5d2df Re-add the getHistory method. 2016-01-31 23:59:45 +09:00
LevelX2
8cbca2491b Fix for SeatView build error. 2016-01-31 15:31:31 +01:00
LevelX2
75f5a17135 Merge pull request #1505 from menocar/user-pane 
Split History column into Matches and Tourneys columns.
 2016-01-31 12:49:00 +01:00
LevelX2
b9db83f10a XMage 1.4.8v1 release 2016-01-31 10:35:13 +01:00
LevelX2
78ac6688ea Some tests and minor changes. 2016-01-31 09:51:23 +01: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
5981816a4b Switch to 1.4.8 for upcoming realease. 2016-01-22 22:33:58 +01: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
fe64d6e4fb Xmage 1.4.7v1 2016-01-13 08:43:27 +01:00
Me Car
746d034461 Implement a password reset flow. 2016-01-11 21:49:02 +09:00
LevelX2
121f40c019 Prepared 1.4.7. 2016-01-10 22:13:59 +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
LevelX2
95d777b4c8 Merge pull request #1448 from menocar/password 
Add a user registration dialog.
 2016-01-09 00:15:13 +01:00
LevelX2
782190bac3 Some changes to mana handling to handle {C} mana. 2016-01-08 23:25:42 +01:00
Me Car
835f08c18f Add a user registration dialog. 2016-01-09 06:43:10 +09:00
Me Car
787f4f010a Keep registerClient for older clients. Rename the new version to registerClientWithPassword. Add an error message on NoSuchMethodException so that this kind of version incompatibility can be handled and informed to user. 2016-01-07 23:43:28 +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
2ad15bbd48 Xmage 1.4.6v1 2016-01-06 23:23:12 +01:00
Me Car
d0ea7d9c37 Transfer password. 2016-01-05 02:40:05 +09:00
Me Car
a42c415404 Rename connection.password to connection.adminpassword. 2016-01-05 02:16:17 +09:00
LevelX2
207f486afc * Xmage 1.4.6v0 2015-12-13 19:47:04 +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
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
LevelX2
0d86e8e063 Xmage 1.4.5v0 2015-11-21 10:33:43 +01:00
LevelX2
4711e0cf99 Changed ability handling of modal spells to be able to select the same mode multiple times with different targets. 2015-11-14 01:56:56 +01: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
LevelX2
46ae07be23 Xmage 1.4.4v12 2015-10-31 12:30:55 +01:00
LevelX2
a5d7ca83d7 Checked objects possible to cause null pointer exceptions. Added some logging. 2015-10-31 11:55:20 +01:00
LevelX2
e88c60eb85 * Scroll Rack - Fixed that the cards were shown face down if setting the order they go to library. 2015-10-31 10:33:37 +01:00
LevelX2
f3184bb6c8 * Fixed that for a manifested morph creature of the opponent the tooltip for a morph creature instead a manifested creature was shown. 2015-10-30 23:24:33 +01:00
LevelX2
9863bce665 xmage 1.4.4v11 2015-10-21 23:56:51 +02:00
LevelX2
7ac0fe65ef * Fixed bug that prevented to use mana abilities manually. 2015-10-21 23:24:04 +02:00
LevelX2
415700ccb2 * Some more changes for rework of ENTERS_THE_BATTLEFIELD event and card movement. 2015-10-18 23:33:23 +02:00
LevelX2
52d0adcac1 Fixed some problems with UUID comparing and some problems with card moving. 2015-10-14 17:54:55 +02:00
LevelX2
3e27d07d0d Xmage 1.4.4v8 2015-10-04 10:33:33 +02:00
LevelX2
b95d7ca705 * Fixed some problems with new avatar handling. 2015-09-27 14:50:44 +02:00
LevelX2
0b23559949 Xmage 1.4.4v6 2015-09-27 10:54:02 +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
cd2842d457 XMage 1.4.4v4 2015-09-19 13:09:27 +02:00
LevelX2
ae8ada286c xmage_1.4.4v0 2015-09-13 10:09:13 +02:00
LevelX2
3d8494edb5 Fixed some possible exceptions. 2015-09-13 09:48:35 +02:00
LevelX2
a7fd898fcc * Fixed that activation of gained abilities of face down permanents (e.g. by Singing Bell Strike) did uninteded reveal the face down creature. 2015-09-11 00:13:48 +02:00
LevelX2
5b36eebdde * Travel Preparations - Fixed tooltip text. 2015-09-07 23:54:43 +02:00
LevelX2
b3eb6f536a Fixed some bugs causing null pointer or concurrent modification exceptions. 2015-09-07 07:42:19 +02:00
LevelX2
9a37bd28ad Xmage 1.4.4v0 2015-09-05 12:51:07 +02:00
LevelX2
9f4a0b008d Fixed an text reference to xmage.info. 2015-08-29 09:56:30 +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
78071ce0a3 * Fixed a bug that order of triggered abilities of tokens were not shown to human player and the UI was locked (fixes #910). 2015-08-25 23:34:15 +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
f0162a6b56 Xmage 1.4.3v2 2015-08-19 12:20:18 +02:00
LevelX2
f50e67e385 * Fixed card movement handling for face down cards. 2015-08-16 19:16:41 +02:00
LevelX2
c98577cc6a Xmage 1.4.3v0 2015-08-06 22:18:01 +02:00
LevelX2
662ee7ca10 * Fixed handling of face down card selection (e.g. for Scroll Rack). 2015-08-05 17:45:45 +02:00
LevelX2
5e250dca06 * Release 1.4.2v5 2015-08-04 08:26:15 +02:00
LevelX2
b029de3ec9 * Added id and colored font to shown related object names of stack abilities. 2015-07-26 10:17:04 +02:00
LevelX2
6f13574639 Release 1.4.2v4. 2015-07-25 12:54:57 +02:00
LevelX2
90c5c3c2f3 * Fixed that the emblem token images of the Origins Planeswalker were not shown. 2015-07-17 15:32:31 +02:00
LevelX2
4eb52fdc91 Xmage 1.4.2v3 2015-07-15 08:27:44 +02:00
LevelX2
60c7a2b34b * Stack - Fixed that name of face down cards were unintended shown while moving effect is on the stack (Necropotence). 2015-07-14 23:56:44 +02:00
LevelX2
244b1fbf89 Xmage Release 1.4.2v2 2015-07-09 11:45:27 +02:00
LevelX2
f0efc17f49 XMage 1.4.2v1 2015-07-04 19:50:33 +02:00
LevelX2
cd0cba6ec7 XMage Release 1.4.2v0 2015-07-04 01:28:19 +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
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
emerald000
07a8474721 Fixed typo. 2015-06-24 01:25:41 -04: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
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
LevelX2
0a3c081ded Merge pull request #1048 from brodee/master 
Chaos booster draft implementation
 2015-06-23 21:59:46 +02:00
brodee
e3b84eaab5 chaos booster draft implementation first check-in 2015-06-22 21:55:43 -07:00
LevelX2
78188d6f24 Removed dispay of card ID for looked at cards to prevent unfair use of card identity. 2015-06-22 15:31:15 +02:00