External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-29 23:12:10 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
12906 commits 38 branches 229 tags 969 MiB
Commit graph

583 commits

Author SHA1 Message Date
LevelX2
78a3e649bc Fixed CardInfo and ExpansionInfo compare with server. Fixed UserData update. 2015-09-27 19:38:24 +02:00
LevelX2
36a48780e4 Merge commit 'b95d7ca705' into Network_Upgrade 
Conflicts:
	.gitignore
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Server/src/main/java/mage/server/Session.java
 2015-09-27 15:06:14 +02:00
LevelX2
b95d7ca705 * Fixed some problems with new avatar handling. 2015-09-27 14:50:44 +02:00
LevelX2
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
c591e4b75a Merge commit 'ae8ada286c' into Network_Upgrade 
Conflicts:
	Mage.Common/src/mage/view/CardView.java
 2015-09-13 18:03:07 +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
betasteward
49558e091d Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
	Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
 2015-09-10 10:30:51 -04:00
LevelX2
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
ad9f325b72 Merge origin/master into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/MageFrame.java
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Common/src/mage/view/UserDataView.java
 2015-08-27 15:23:31 +02:00
LevelX2
b63cc121ef Some minor changes. 2015-08-27 14:51:21 +02:00
LevelX2
155b7fafd0 Merge origin/master into Network_Upgrade 2015-08-27 14:37:49 +02:00
LevelX2
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
betasteward
1e60605d84 Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/cards/Card.java
	Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
 2015-08-25 14:07:31 -04:00
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
betasteward
b9c8a2598d Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
 2015-08-19 14:49:46 -04:00
betasteward
129b6d1e82 cleanUp 2015-08-19 11:05:33 -04:00
LevelX2
f0162a6b56 Xmage 1.4.3v2 2015-08-19 12:20:18 +02:00
betasteward
d9f1d71d98 Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
	Mage.Client/src/main/java/mage/client/table/TablesPanel.java
	Mage.Common/src/mage/view/CardView.java
 2015-08-17 09:20:44 -04:00
LevelX2
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
betasteward
8bff961caf fixed some bugs + improved some messages 2015-07-20 21:34:18 -04: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
betasteward
5c829b79d5 Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
	Mage.Server/src/main/java/mage/server/User.java
	Mage.Server/src/main/java/mage/server/game/GameController.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
	Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
 2015-07-12 12:25:44 -04: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
betasteward
1ff7f4ba5c and more refactoring 2015-07-02 09:08:56 -04: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
betasteward
27da366eea added Construct and Sideboard callbacks 2015-07-01 23:26:07 -04:00
betasteward
1d2108fe7f added UpdateDeck + filled out callback method templates 2015-07-01 15:10:23 -04:00
betasteward
88e30ee6e1 Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/MageFrame.java
	Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
	Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
	Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
	Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
	Mage.Common/src/mage/interfaces/MageServer.java
	Mage.Common/src/mage/remote/Connection.java
	Mage.Common/src/mage/remote/SessionImpl.java
	Mage.Server/src/main/java/mage/server/MageServerImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
	Mage.Server/src/main/java/mage/server/SessionManager.java
	Mage.Server/src/main/java/mage/server/TableController.java
	Mage.Server/src/main/java/mage/server/User.java
	Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
	Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
 2015-06-30 23:13:29 -04:00
betasteward
14f156d626 fixed ConcurrentModificationException 2015-06-28 18:59:30 -04: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