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

814 commits

Author SHA1 Message Date
LevelX2
4aca2506d8 * Added table info about range set in a multiplayer game (fixes #3878). 2017-08-24 18:57:23 +02:00
LevelX2
c2d70fa1cc Xmage 1.4.25V1 2017-08-18 00:12:57 +02:00
LevelX2
8ab9abb8e8 * Some more changes to user disconnect handling. 2017-08-16 07:51:48 +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
fe2ee5dfec Xmage 1.4.25V0 2017-07-29 20:35:16 +02:00
LevelX2
c6cd713f0d * Mind's Desire - Fixed a problem with playing lands. 2017-07-22 12:09:28 +02:00
igoudt
ea14f9c361 fix order of subtypes on a cardview 2017-07-17 10:08:20 +02: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
5774deb90c XMAGE 1.4.24V3 2017-07-16 19:46:41 +02:00
LevelX2
75aff217da Xmage 1.4.24V2 2017-07-09 21:09:42 +02:00
LevelX2
8e666c9403 Xmage 1.4.24.V1 2017-07-09 01:29:26 +02:00
LevelX2
7d911ae803 XMage 1.4.24V0 2017-07-08 16:33:09 +02:00
LevelX2
d1f61f48f1 XMage 1.4.24V0 2017-07-08 15:54:06 +02:00
LevelX2
d03bd3bf57 Fixed a bug that the owner of controlled cards were no longer shown in the card tooltip. 2017-06-11 09:52:29 +02: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
0b7a50e48f * Xmage 1.4.23V6 2017-05-21 01:01:50 +02:00
LevelX2
11ba007fd3 Xmage 1.4.23V5 2017-05-18 21:55:44 +02:00
magenoxx
d73709bdbe Moved CardView to src/main/java 2017-05-13 18:55:54 +03:00
spjspj
e73e7d8600 Token refactor 2017-05-06 23:35:14 +10:00
LevelX2
97a4e9ed05 Xmage 1.4.23V4 2017-04-30 00:23:33 +02:00
LevelX2
3cc157bc2c * Fixed null pointer exception problems in client. 2017-04-30 00:07:37 +02:00
igoudt
b6fe6f772a finish rewriting watchers 2017-04-29 12:07:46 +02:00
spjspj
241691b153 spjspj - Add in Tokens to the Card Viewer (first version) 2017-04-29 17:25:54 +10:00
igoudt
9ca9975cb0 remove sun reference 2017-04-29 08:39:26 +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
LevelX2
85e44017ea Xmage 1.4.23V3 2017-04-25 22:17:22 +02:00
spjspj
6ab4a94bd7 spjspj - Add in 'View Current Deck' option. 2017-04-23 13:06:09 +10:00
LevelX2
900e7b29ba XMage 1.4.23V2 2017-04-23 01:57:26 +02: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
magenoxx
ee7026f71d Revert "Added hashCode and equal to main server objects" 
This reverts commit 27a454f042.
 2017-04-21 20:43:32 +03:00
magenoxx
27a454f042 Added hashCode and equal to main server objects 2017-04-20 20:06:52 +03:00
magenoxx
21eb420c16 Moved Mage.Common classes from src to src/main/java 2017-04-20 19:05:09 +03:00
LevelX2
d55c82adf4 XMage 1.4.23V1 2017-04-18 07:50:49 +02: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
spjspj
7937bcda9e Revert 2017-04-16 20:06:27 +10:00
ingmargoudt
1649530e7b remove helper functions from cardUtil 2017-04-07 16:40:38 +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
ingmargoudt
ff6d1541c3 clientcallbacks to enums 2017-04-04 21:52:15 +02:00
ingmargoudt
211d433ea9 playertype, enum singleton 2017-04-02 22:09:20 +02:00
ingmargoudt
6f8f10fcc3 move static function to CardImpl, and other api fixes 2017-03-30 20:09:47 +02: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
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
ingmargoudt
ff6c6405aa rewrites to optionals 2017-03-19 19:48:32 +01:00
LevelX2
9d8a8a33f1 Xmage 1.4.22V0 2017-03-11 13:38:55 +01:00
Nathaniel Brandes
34ea9e53d0 Rev .pom Java version to fix compilation. 2017-03-07 22:31:30 -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
0a77c186be moved sessionstate enum to sessionImpl 2017-03-07 22:15:58 +01:00
ingmargoudt
1bc8e2248b changed enum equals to ==, removed contains check for set 2017-03-07 21:47:11 +01:00
ingmargoudt
1caf3a6be4 change getLibrary().size() > 0 to hasCards() 2017-03-07 17:28:26 +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
vraskulin
11dc1e10f1 Few lambda's and removed explicit type from creating lists and hashmaps 2017-02-28 13:46:57 +03:00
vraskulin
498c8cf60c Made utility classes final to explicitly forbid it's inheritance 2017-02-27 17:03:38 +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
3a152ab3d6 rewrote enum comparisons, iterator to removeIf, added some stream and filters 2017-02-11 22:37:00 +01: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
LevelX2
d71ebdcea9 Merge origin/master 2017-02-05 11:41:20 +01:00
LevelX2
3525e46514 XMage 1.4.21V2 2017-02-05 11:39:43 +01:00
spjspj
fa97e4647e Add field for server console 2017-02-05 14:11:05 +11:00
LevelX2
082210a4bd Xmage 1.4.21V1 2017-01-25 00:14:05 +01:00
LevelX2
6625bf86be Xmage 1.4.21V0 2017-01-15 17:44:02 +01:00
LevelX2
c6c88ee197 * Chnaged some handling of transformable cards. 2017-01-15 16:21:06 +01:00
spjspj
b397e2849c Add missing field to userData 2017-01-15 23:33:20 +11:00
spjspj
f943b81c73 Merge pull request #2794 from spjspj/master 
spjspj - Add Set Active to server console
 2017-01-14 16:04:33 +11:00
spjspj
6ed569b37f spjspj - Add Set Active to server console 2017-01-14 16:03:30 +11:00
spjspj
ee285e36f6 Merge pull request #2793 from spjspj/master 
spjspj - Add Set Active to server console
 2017-01-14 15:30:02 +11:00
spjspj
6d3324378f spjspj - Add Set Active to server console 2017-01-14 15:29:15 +11:00
igoudt
ac8962cb29 replaced enum comparison from equals to == 2017-01-11 09:53:16 +01: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
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
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
LevelX2
862ac38f51 * Fixed that special actions (e.g. delve mana payment) were handled correctly if a player plays a turn for another player. 2016-12-24 16:52:06 +01:00
LevelX2
da9e9a1180 * Fixed some possible null pointer exceptions and some minor editing. 2016-12-18 15:02:19 +01:00
LevelX2
40d8a32695 XMage 1.4.19V1 2016-12-17 10:35:45 +01:00
LevelX2
3d95849c10 Some fixes to the Monarch designation. 2016-12-07 17:14:08 +01: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
LevelX2
c9e1b415e2 Xmage 1.4.18V0 2016-11-06 18:11:19 +01:00
LevelX2
1791b809db Added some more info to some logger and game messages. Removed unused method. 2016-11-01 23:02:11 +01: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
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
8b62eece68 XMage 1.4.17V0 2016-10-23 10:03:01 +02:00
spjspj
d53fe3ae52 Add confirmation dialog to server.console 2016-10-23 01:44:34 +11:00
LevelX2
bf43ea9936 Added test and fixed some possible null pointer exception. 2016-10-22 12:45:50 +02:00
fireshoes
89dd981075 Merge 2016-10-17 23:45:47 -05:00
LevelX2
2e1f8c07cb Xmage 1.4.16v3 2016-10-09 15:54:12 +02:00
LevelX2
f92e827d3b Xmage 1.4.16v2 2016-10-09 00:13:01 +02:00
LevelX2
4ec7d626fa * Fix to get land images shown again. 2016-10-08 19:03:32 +02:00