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
8826 commits 2 branches 0 tags 782 MiB
Commit graph

443 commits

Author SHA1 Message Date
LevelX2
c22a75a6c3 * PopUp Menus -Added F2/F3/F4/F9 to menu. Set correct popup menu for watcher. 2013-10-19 18:40:20 +02:00
LevelX2
b005e7b03f * Deck generator - Fixed a bug that during the generation cards with multiple colored mana symbols of the same color were unintended rated higher. So all generated decks tend to include more or nearly only cards with double or tripple colored mana symbols ignoring all other cards. 2013-10-13 01:59:11 +02:00
LevelX2
a26b8947d0 * Showing used sets also for finished tournaments, showing start time of match or tournament in table view creation time column as the match or tournament is started. 2013-10-09 17:10:19 +02:00
LevelX2
e2532a9b11 Improvements player cancels or leaves match or tournament. Draft can replace human player by draft bot if human leaves. 2013-10-03 22:42:16 +02:00
LevelX2
0468fe7299 Show info in card tooltip of permanents if controller not equal owner. 2013-09-23 14:58:21 +02:00
LevelX2
fea6b0633a * Deck generator - Fixed a bug that the selection of mana lands did favor the overall most needed land too much. 2013-09-19 17:04:12 +02:00
LevelX2
182839d41a Added some new sound files (PlayerLost, PlayerWon, PlayerSubmittedDeck, PlayerLeft). 2013-08-31 19:00:38 +02:00
LevelX2
ae697db2d8 * Fixed possible NPE in CardView (fixes #278). 2013-08-28 16:23:04 +02:00
LevelX2
7cf2b0cc97 Fixed a bug that player names of finished matches were no longer shown in the list of fnished matches. 2013-08-23 14:35:59 +02:00
LevelX2
ae44981cfa Added a game end dialog, that shows the result of the finished game. 2013-08-07 16:50:25 +02:00
LevelX2
c3ea17bab8 Cleanup in DeckBuilder. 2013-08-04 17:52:48 +02:00
LevelX2
78dc712944 Allow to generate 40 or 60 cars decks. 2013-07-30 13:42:20 +02:00
LevelX2
7d0cf3cd8c Set version to 1.1.0 dev. 2013-07-21 22:52:25 +02:00
LevelX2
6098aa1d7c Handling of players that cancel tournament improved. 2013-07-19 14:05:56 +02:00
LevelX2
85b8edf630 Improved player quits / leaves mage handling for tournaments (not perfect yet, will more improve it). 2013-07-18 17:40:06 +02:00
Plopman
e6847a472d [Commander] Display Commander in client 2013-07-17 20:35:52 +02:00
Plopman
930e70fbbb [Commander] Added CommanderView 2013-07-17 20:33:58 +02:00
Plopman
f64aa7e6ae [Commander] Added CommandObjectView and change EmblemView (implements commandObjectView) 2013-07-17 20:33:25 +02:00
LevelX2
9838dea551 Added possibility to show tournament panel and watch tournament games (if allowed at tournament start) for spectators . 2013-07-16 17:39:02 +02:00
LevelX2
bc9dca4d8a Fixed some handling to possible NPEs. 2013-07-15 00:53:30 +02:00
LevelX2
a3e041e364 Cleaned up PhaseManager. 2013-07-07 18:18:40 +02:00
LevelX2
f540e78045 Fixed some display problems with emblems and there abilities on the stack. 2013-07-05 18:49:42 +02:00
LevelX2
42dc0d142c Improved Emblem handling. Added a MageObjectType to CardView (in progress). 2013-07-05 15:29:55 +02:00
North
96ff08dc9a Merge branch 'decouple-client' 
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
 2013-07-03 21:42:40 +03:00
LevelX2
7b260c960b Added a quit match option. FFA game gets no more killed if host left mage or quitted match. 2013-07-02 22:15:49 +02:00
North
5809e7783b added auto-update of database on connect 2013-07-02 22:29:35 +03:00
North
5e3970a0e0 added method for updating cards database 2013-07-02 22:29:06 +03:00
LevelX2
35433e55b8 Show match time value in table view. 2013-07-02 17:02:03 +02:00
North
e4ea8adf94 added method for updating expansions database 2013-07-02 00:32:25 +03:00
North
d541779d66 Removed embedded server from Session 2013-07-01 23:58:29 +03:00
LevelX2
06163d6ac5 Adding Player state to TournamentPlayer and TournamentPanel. 2013-07-01 17:11:44 +02:00
LevelX2
17c893799f Added a close button, tournament header infos, name in window item and movable divider bars to the tournament panel. 2013-06-29 22:30:43 +02:00
LevelX2
853810ce45 Added support for casting modal spells or activating modal abilities with more than one mode to choose. 2013-06-22 19:35:22 +02:00
LevelX2
738efcc47f Added option to select time limit (also none) on match or tournament creation. 2013-06-21 21:34:06 +02:00
magenoxx
7c187a1d2a Fixes for timers. 2013-06-20 15:50:06 +04:00
magenoxx
6532aaffdf Timers on client side. Refactored. 2013-06-20 00:17:06 +04:00
magenoxx
42dd9d81b4 Timers (In progress) 2013-06-19 17:12:31 +04:00
LevelX2
95a12028e6 Added small icon for tokens on token permanents. Token copied from permanents (Giant Adephage) show now the image of the permanent. 2013-06-17 17:00:17 +02:00
LevelX2
5216eddb71 In the card info (tooltip) tokens have now the work "Token" written below the expansion symbol. Some code cleaning concering handling of counters. 2013-06-17 13:59:23 +02:00
North
0bb110be45 [refactor] moved enums from Constants class 2013-06-16 12:28:10 +03:00
LevelX2
84df0f2c43 * Added tournament options for adjustable construction time and free mulligans 
* Added duel options for free mulligans
 2013-06-14 23:45:30 +02:00
LevelX2
3dbdba32e9 * Number of wins can be set for tournaments. * Current score of running matches is shown in the table list. 2013-06-10 16:25:31 +02:00
LevelX2
dec8f24c68 * The list of completed matches and tournaments shows now also columns with start and end time. 2013-06-10 14:12:24 +02:00
LevelX2
aef53bc4ce * The list of open tables shows now the codes of boosters selected for sealed or draft tournaments in the deck type column. 2013-06-10 12:38:38 +02:00
LevelX2
dbd59f1b5c Support selection of triggered abilities from cards on the stack. 2013-06-03 21:46:56 +02:00
LevelX2
31da9dcdfd [minor] Some formatting, remove unused code, changes to logging. 2013-05-19 08:29:38 +02:00
LevelX2
5336d4c0f9 Pushed version to 1.0.3 dev. 2013-05-12 16:00:25 +02:00
LevelX2
6b38cd5b18 Mage Version 1.0.2 2013-05-11 23:06:30 +02:00
LevelX2
101194acf7 Many changes to split cards handling (showing arrows and log text for fused spells., handling protection and other things correctly). 2013-05-11 20:11:58 +02:00
LevelX2
b352217e17 Some improvements to split card handling. Better display of tooltip of split cards, also added handling if not cast from hand. 2013-05-09 21:26:15 +02:00
LevelX2
b6ddaabe44 Show user name in title bar of MAGE. Clear table chat after disconnect. Remove user from chat after disconnect. Some tweaking about the messages if a user disconnected/session expired. 2013-04-29 17:18:43 +02:00
LevelX2
f644ffe041 Changed color of frame of avatar for active player to green again. Checked that a player of a game can't also watch his own game. Added a match score to the start of the game log. Changed the color of the Turn [X] message. Tips and join messages during a game are displayed in the chat panel instead the game log panel. Display of the player name when hovering over the avatar is more vertical centered. 2013-04-07 21:29:27 +02:00
magenoxx
97acebacdd Pumped version to 1.0.2.dev 2013-04-01 16:00:30 +04:00
magenoxx
143f0f76e7 Fixed #180 : Paying additional cost of Mana Leak or Spell Rupture isn't handled correct 2013-04-01 14:24:56 +04:00
LevelX2
c88093d699 The table list of current matches / tournaments shows now all names of players. 2013-03-31 20:13:04 +02:00
magenoxx
29b84e0d92 Closed #169: Make it possible to untap lands 2013-03-29 20:35:16 +04:00
magenoxx
05191e8793 Closed #168 : Enhance priority hot keys 2013-03-29 17:18:12 +04:00
LevelX2
402f7fffd9 Tournaments status is updated now and if tournament finished, it's moved to the lower finished matches view. 2013-03-27 22:31:15 +01:00
LevelX2
12a01788e6 Added a new column to the table list showing the number of wins for matches and number of used / total seats for tournaments. 2013-03-26 17:18:43 +01:00
LevelX2
a76d3ac16e Added a "-" sign between the player names in the tournament match view. 2013-03-26 15:34:39 +01:00
LevelX2
d8961a7a82 [minor] formatting 2013-03-26 13:43:24 +01:00
North
a7a565bb8f [minor] access modifer order 2013-03-10 14:53:02 +02:00
LevelX2
ec546a5ae6 Merge branch 'master' of https://github.com/magefree/mage.git 2013-03-10 13:46:02 +01:00
North
2b7471df3f [minor] removed unused imports 2013-03-10 14:17:55 +02:00
LevelX2
aa0290fd32 Set Version to 1.0.1 2013-03-10 11:40:56 +01:00
North
01eee3995c [refactor] replaced JDBC implementation of logging with OrmLite 2013-03-10 11:05:03 +02:00
LevelX2
dc131fa8dd Changes to show name and number of counter on a card. 2013-03-04 00:03:21 +01:00
North
b5e4d9e795 removed unused classes 2013-03-02 18:02:06 +02:00
magenoxx
5577d5b3a8 Changed version from 0.10.1 to 1.0.0 2013-02-26 14:11:00 +04:00
magenoxx
7f6d730975 Fixed Issue#125: Show source/reason of triggering abilites 2013-02-22 22:54:43 +04:00
LevelX2
5f3a8eb360 Changed logic of adding basic lands in deck generation and the add land function in limited deck editor to use lands from the sets of the cards in the decks. Added missing attributes to set definitions. 2013-02-03 16:54:03 +01:00
magenoxx
2c652770fb Fixed Issue#122: Check of deck and game type during creating a new table doesn't show a qualified error message 2013-01-21 21:14:22 +04:00
magenoxx
55f40d2e9d Implemented Issue#73: Enchant Player enchantments - show enchanted player 2013-01-14 18:57:13 +04:00
magenoxx
17b8619b3e Implemented Issue#106: Display emblems of players 2013-01-14 18:16:12 +04:00
magenoxx
78e1bb99d9 Fixed Issue#45: Textbox for tooltip is sometimes too small to show all the text 2013-01-07 18:02:45 +04:00
magenoxx
b9554ac31a Fixed EntityManager not setting arguments. Added class for calculating and displaying statistics. 2013-01-07 16:06:18 +04:00
Loki
aa31ef23d3 bump version to 0.10.1 2012-12-28 12:48:26 +13:00
North
c0ad7812cd minor changes (mostly code style) 2012-12-24 18:43:54 +02:00
North
fde10788db removed redundant modifiers from interfaces 2012-12-20 23:45:47 +02:00
LevelX2
4b2e6a8bc0 Redesigned handling of various art for cards. 2012-11-27 15:24:29 +01:00
LevelX2
153e3bc12e Fixed a bug, that images of basic lands in game were not displayed. 2012-11-26 00:25:39 +01:00
LevelX2
f72e1a1038 Improved the handling of image files for handling also different images of non basic lands (e.g. Fallen Empires). 2012-11-25 20:09:13 +01:00
Loki
f017ab903c version bump to 0.10.0 2012-11-15 22:47:15 +13:00
LevelX2
14a4a786e8 Showing for modal spells on the stack, which mode was chosen by the caster. 2012-11-07 17:20:06 +01:00
North
f64149971a Merge branch 'CardRepository' 2012-11-05 19:37:51 +02:00
magenoxx
575cebad7f Displaying arrows for fixed targets in effects (for Jace, Architect of Thought first ability) 2012-10-24 17:45:55 +04:00
North
56a11f4da2 Replaced CardStorage references from MageFrame with CardRepository 2012-10-21 18:15:42 +03:00
LevelX2
7c44b16504 AbilityPicker shows abilities now always in the order they were defined on the object. 2012-10-10 20:43:18 +02:00
magenoxx
6b895d90cf Fixed Issue#46: Creature display order on the battlefield random 2012-09-07 21:11:24 +04:00
magenoxx
214dc7326d Removed random order in grave: Fixed Issue#45: Card display order in graveyard random 2012-09-07 20:54:23 +04:00
North
8ff5ddf9d4 Fixed build 2012-09-04 14:06:15 +03:00
Loki
46ec86b54c 0.9.2 dev 2012-09-04 21:24:44 +12:00
magenoxx
0758f4bb72 Fixed Issue#52 2012-08-31 12:43:46 +04:00
North
0589ef94cb [minor] Moved PLUGINS_DIRECTORY constant 2012-08-26 18:54:22 +03:00
Loki
85b31df2d5 Bump version to 0.9.1dev 2012-08-14 15:28:06 +12:00
North
38cfa14b34 updated pom 2012-07-19 22:49:13 +03:00
North
5d0a832642 cleaned pom files and updated sqlight dependency 2012-07-19 21:15:09 +03:00
magenoxx
b2cd3e75bd changed version from 0.8.7.dev to 0.9.0.dev 2012-07-18 15:59:07 +04:00
magenoxx
a293da3095 Fixed Issue#18: Unrecoverable error on server with copy tokens 2012-07-18 00:29:42 +04:00
magenoxx
7443e2a9fa [UI] card image zoom in/out on mouse wheel with 700 ms timeout 2012-07-16 16:08:12 +04:00
magenoxx
fc2283898c [UI]Alt+E:enlarge card. New game panel layout (experimental). 2012-07-13 14:55:52 +04:00
magenoxx
5541fe4163 updated version from 0.8.6.r5 to 0.8.7 2012-06-29 14:56:13 +04:00
magenoxx
b5032226f4 Showing already chosen cards in choice dialog 2012-06-27 18:44:03 +04:00
magenoxx
638a6368d2 Displayint card name in choice dialog. Bigger cards for choice many. 2012-06-27 18:07:13 +04:00
magenoxx
6b57822f40 Fixed Rebound 2012-06-25 10:10:07 +04:00
North
239a4fb100 [refactoring][minor] Replaced all tabs with four spaces. 2012-06-19 23:50:20 +03:00
magenoxx
0c785abb46 New way for displaying combat 2012-06-17 13:13:51 +04:00
magenoxx
48f2018af6 New stack dialog (experimental) 2012-06-16 19:33:03 +04:00
magenoxx
e34ee2e7f6 Added downloading and displaying emblem images 2012-06-13 09:48:10 +04:00
magenoxx
4393a55569 Added token type for displaying different images 2012-06-12 22:58:21 +04:00
magenoxx
9c8fe7268b Reworked emblems 2012-06-12 20:57:23 +04:00
magenoxx
2c175dadf4 Fixed random stack abilities display order in client 2012-06-05 17:26:17 +04:00
magenoxx
205710a777 New message on wrong client-server versions 2012-05-27 11:02:44 +04:00
magenoxx
5274472d7d minor changes in MageServer interface 2012-05-27 11:02:17 +04:00
North
06a185a3a5 removed unused imports 2012-05-26 20:08:39 +03:00
magenoxx
af2cfd8095 Refactoring 2012-05-26 21:00:47 +04:00
magenoxx
12b21abe52 changed version from 0.8.5 to 0.8.6 2012-05-25 19:04:40 +04:00
magenoxx
d15499748d Fixed 1,5 years old bug with battlefield scroll missing. Also removed unnecessary gap. 2012-05-21 21:55:04 +04:00
magenoxx
5a88f2750b Fixed bug in ManaPoolView 2012-05-20 15:58:18 +04:00
magenoxx
1bf0e216de Displaying tooltips and green arrows for paired creatures 2012-05-17 11:59:47 +04:00
magenoxx
fa0e623120 changed version from 0.8.4 to 0.8.5 2012-05-07 07:50:07 +04:00
Loki
a746ca680b [load] one place server ping 2012-05-06 23:40:37 +03:00
magenoxx
b88e7d7a4e Commented out the possibility to start embedded mage server 2012-04-30 19:03:13 +04:00
magenoxx
537c326789 [load] loading testing: added simple test for starting game by two players 2012-04-30 18:56:36 +04:00
magenoxx
96cfb51686 Extracted Session interface, moved implementation to SessionImpl 2012-04-29 19:03:08 +04:00
magenoxx
850103c694 upgraded jboss-remoting version from 2.5.4.SP2 to 2.5.4.SP3 2012-04-28 03:05:32 +04:00
magenoxx
d10385fad2 changed "already connected" state handling 2012-04-28 03:00:11 +04:00
magenoxx
3875c1f7c0 Changed component version from 0.8.3 to 0.8.4 (dev) 2012-03-25 12:16:46 +04:00
BetaSteward
48f5a469d4 fixes for monte carlo ai 2012-02-13 09:05:01 -05:00
magenoxx
10eb7955eb Displaying additional info from feedback db in test. 2012-02-13 01:49:01 +04:00
BetaSteward
6205ebaeb9 fixed Liliana Of The Veil npe when targeting tokens + added choose pile dialog 2012-02-07 15:15:47 -05:00
BetaSteward
d813283c19 adding back recent changes - not quite sure how I managed to revert all this 2012-02-02 23:48:25 -05:00
magenoxx
3434dc1a97 Added User Feedback support. 2012-01-26 22:13:44 +04:00
magenoxx
e50de69420 compilation error fix. 2012-01-26 01:59:53 +04:00
magenoxx
b9a65e7c62 MageServerImpl refactoring. More event logging. 2012-01-26 01:50:08 +04:00
magenoxx
039d9663f0 ActionWithResult interface, ActionWithBooleanResult. 2012-01-26 00:38:45 +04:00
magenoxx
b0a1c07067 LogService. Added saving game started event to DB. Some refactoring. 2012-01-25 20:27:08 +04:00
magenoxx
bdb2754847 Added sending broadcast message to all users on server from Admin Console. 2012-01-25 19:13:27 +04:00
magenoxx
8536d9d78d minor change in EntityManager 2012-01-25 18:09:42 +04:00
magenoxx
fd25002578 SQLite EntityManager 2012-01-25 14:26:37 +04:00
magenoxx
20402f1cad Initial sqlite support. 2012-01-25 02:07:23 +04:00
magenoxx
e901343aad Changed version exception message. Added logging about version difference on registering (for stats). 2012-01-24 12:17:50 +04:00
magenoxx
3f20b725db [MAD2.0] New scoring and undo system. Migrated draw cards action. 2011-12-25 11:42:32 +04:00
magenoxx
a7a496af0e Now client can start embedded Mage Server (player's feature request). 
Works only for "localhost". Still can be used with external server but in such case server should be started first.
 2011-12-23 13:14:32 +04:00
magenoxx
ba6508cbeb Updated component version from 0.8.1 to 0.8.2. 2011-12-09 13:15:07 +04:00
BetaSteward
550ad2bc69 another improvement to cannot connect message 2011-11-04 22:53:40 -04:00
BetaSteward
10e1469cfd improved cannot connect error message 2011-10-30 21:15:14 -04:00
Loki
a004ced17d artifactId to lowercase 2011-10-28 15:42:54 +04:00
magenoxx
e302a12f5d Updated component's version from 0.8 to 0.8.1 
manually
 2011-10-28 11:36:42 +04:00
magenoxx
3350c3e829 Updated components' version from 0.7.6 to 0.8 2011-10-16 21:02:04 +04:00