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

1165 commits

Author SHA1 Message Date
LevelX2
2225c6f988 [Minor] Formatting. 2013-08-05 18:03:38 +02:00
LevelX2
78dc712944 Allow to generate 40 or 60 cars decks. 2013-07-30 13:42:20 +02:00
LevelX2
3d2f262ff4 Field alignment in new table dialog. 2013-07-30 13:41:40 +02:00
LevelX2
0ba83a7d5d [minor] Formatting. 2013-07-30 13:41:07 +02:00
LevelX2
235d314104 Sample decks DailyMTG ReConstrcted Standard 2013-07-24 17:01:11 +02:00
LevelX2
0db3164ae4 Updated sample decks to use cards from newest editions. 2013-07-24 16:31:38 +02:00
LevelX2
94f5a0cc0f Sample decks SCG Richmond open (Standard) 2013-07-24 16:14:16 +02:00
LevelX2
a0c3f32b9b Added tip to tips shown at chatpanel at game start. 2013-07-23 17:21:03 +02:00
LevelX2
f76ee65bf5 Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-21 22:55:45 +02:00
LevelX2
7d0cf3cd8c Set version to 1.1.0 dev. 2013-07-21 22:52:25 +02:00
KholdFuzion
a6a09e0008 linux fixes (dox2unix) and basic lands added from LEA to 3ED 2013-07-21 03:18:23 -05:00
LevelX2
2e5fc5fc98 Some small changes for Release 1.0.3 2013-07-21 09:45:58 +02:00
LevelX2
57bec7a0c1 Fixed that the chat text input area's high was to small to show the descender of letters completely. 2013-07-19 14:20:16 +02:00
LevelX2
41034ccdd8 Split pane divider positions of table panel and tournament panel are saved and restored now. 2013-07-19 14:04:59 +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
Li REN
dcce8c30a1 [minor] fix a bug causes assembly plugin error 2013-07-18 04:36:21 -04:00
Plopman
e6847a472d [Commander] Display Commander in client 2013-07-17 20:35:52 +02:00
Li REN
1cea80fd5d fix error of audioManager when start client from IDE. 2013-07-17 13:51:59 -04:00
LevelX2
10fd7c6f6a Removed old debug messges. 2013-07-17 17:31:49 +02:00
LevelX2
69c3ae0666 Added 13 standard format decks using already M14 cards. 2013-07-17 16:09:53 +02:00
LevelX2
ffa8e53a68 Added another sample deck to client. 2013-07-17 14:22:05 +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
2abeba7c47 Deleted sample music. 2013-07-15 21:17:14 +02:00
LevelX2
178b4cb158 Fixed random set for basic land definition. (Fixed issue #274) 2013-07-15 13:27:12 +02:00
Li REN
60d81ffb37 fix a bug that cause incomplete multimedia files released 2013-07-13 17:18:00 -04:00
Li REN
ec1ee245f8 adjust path of sounds and music 
add sample BGM
delete a sample deck that cause error in release
 2013-07-12 16:57:58 -04:00
LevelX2
c4f6d95f5a Fixed deck generator for client decoupling. 2013-07-10 20:07:33 +02:00
LevelX2
68b2f589f0 Added some missing configurations for M14. 2013-07-10 14:11:11 +02:00
LevelX2
034f71cead Fixed NPE for picking order of triggered abilities. 2013-07-09 22:52:17 +02:00
LevelX2
5a8a7b19de Client add land set search uses now ExpansionRepository. 2013-07-07 18:23:31 +02:00
LevelX2
ec3565e5f7 Using now ExpansionRepository or tournament booster selection in client. 2013-07-07 18:22:13 +02:00
LevelX2
a3e041e364 Cleaned up PhaseManager. 2013-07-07 18:18:40 +02:00
LevelX2
52d90a8d6f Added sample decks from GP Kansas City (Modern). 2013-07-07 09:25:05 +02:00
LevelX2
51e4caca19 Tables panel - check for null value of date finished. 2013-07-06 15:15:20 +02:00
North
4657268476 fixed bug where one couldn't create a sideboard in the deck editor 2013-07-06 10:46:18 +03:00
Nicolas
ff5d16e132 Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-05 18:51:20 +02:00
LevelX2
f540e78045 Fixed some display problems with emblems and there abilities on the stack. 2013-07-05 18:49:42 +02:00
Plopman
e3ab68bb37 Added M14 in ConstructedFormats 2013-07-05 18:48:40 +02:00
LevelX2
42dc0d142c Improved Emblem handling. Added a MageObjectType to CardView (in progress). 2013-07-05 15:29:55 +02:00
LevelX2
5897f764e5 Fixed a NPE bug when calling the test.dck. 2013-07-04 23:36:51 +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
c28bdf8a02 Added alternate part as commets to get UI editor to run. 2013-07-02 23:48:02 +02: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
LevelX2
d39a581df9 Sample Deck: Craig Wescoe's WR Aggro 2013-07-02 07:54:15 +02:00
North
ae86414658 Removed getAllCards method from CardRepository 2013-07-01 23:46:27 +03:00
LevelX2
06163d6ac5 Adding Player state to TournamentPlayer and TournamentPanel. 2013-07-01 17:11:44 +02:00
LevelX2
319135b8ed Cleanup preferences dialog. 2013-07-01 12:41:13 +02:00
LevelX2
7ef8753183 Cleanup wrong includes in TournamentPanel. 2013-07-01 10:13:31 +02:00
LevelX2
4c129706ca Cleanup layout of preferences dialog. 2013-07-01 08:27:33 +02:00
Li REN
df6f43761e Merge pull request #257 from Noahsark/master 
update
 2013-06-30 12:07:20 -07:00
Li REN
70ebb6bfbc add UI to adjust BGM path 2013-06-30 15:05:30 -04:00
LevelX2
eaf55be919 * Draft tournament - NPE on draft construct deck start. 2013-06-30 16:40:11 +02:00
North
1fccbd6b87 Merge remote-tracking branch 'origin/master' into decouple-client 
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
 2013-06-30 11:26:40 +03: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
4cb4a377d2 Changed message of the day panel to full width. 2013-06-29 22:28:52 +02:00
LevelX2
55a6de849e Ignoring M14 cards for download. 2013-06-29 20:51:54 +02:00
LevelX2
63783d9fe2 * Tornament construction time - Fixed that the selected value was not used. 2013-06-29 17:52:19 +02:00
North
dc0db40428 removed planechase from wizards image source (doesn't exist) 2013-06-29 18:00:18 +03:00
North
3558a67f77 added M14 to wizards download source 2013-06-29 17:26:09 +03:00
North
619b7222e7 refactoring to cards downloading and image path generation 2013-06-29 16:59:23 +03:00
North
6c51bcd599 fix for lands download (wizards source) 2013-06-29 16:58:53 +03:00
North
a43bc8bed6 fixed issue where second face was considered a card 2013-06-29 12:52:43 +03:00
North
4c83fd7d6a fix for downloading cards from wizards spoilers 2013-06-29 00:08:10 +03:00
LevelX2
106b3831c4 One more sample deck. 2013-06-28 08:17:20 +02:00
North
a5eebbbf12 fixed NPE at downloading card images 2013-06-27 23:57:38 +03:00
LevelX2
e1ae922214 Some match time options added. Set the deafult macth time to 25 minutes per player. 2013-06-24 17:09:21 +02:00
LevelX2
ba7bf794f5 Some more Modern sample decks. 2013-06-24 16:33:20 +02:00
LevelX2
5898f8a798 [minor] Changed layout of create tournament table dialog. 2013-06-23 02:45:30 +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
66d1a66967 [Timers] Removed debug logging. 2013-06-20 18:09:30 +04:00
magenoxx
7c187a1d2a Fixes for timers. 2013-06-20 15:50:06 +04:00
Li REN
64f2452089 simplify image file filter for background 2013-06-20 01:24:16 -04:00
Li REN
7a6f42556e simplify image file filter for background 2013-06-20 01:21:36 -04:00
magenoxx
b6fddc301c Merge branch 'master' of https://github.com/magefree/mage 2013-06-20 00:20:42 +04:00
magenoxx
6532aaffdf Timers on client side. Refactored. 2013-06-20 00:17:06 +04:00
North
1b3a51484e replaced Card instances in client with MockCard 2013-06-19 22:53:53 +03:00
North
462992e838 removed dependency to Mage.Sets and Mage.Server 2013-06-19 21:21:35 +03:00
magenoxx
42dd9d81b4 Timers (In progress) 2013-06-19 17:12:31 +04:00
LevelX2
b7c88b3c6d * Added Sample deck. 2013-06-18 21:49:38 +02:00
North
fb2ea95f55 removed card scanning from the client 2013-06-18 22:47:01 +03:00
North
0166975e83 refactored getSetCodes to be used from ExpansionReposiitory 2013-06-18 22:46:09 +03:00
LevelX2
af4759f127 Added some background images to client/backgrounds. 2013-06-18 12:28:49 +02:00
LevelX2
e1db02baec Added a sound playing if human player joins a match. 2013-06-17 21:38:30 +02:00
Li REN
b8e7a50415 Merge pull request #11 from magefree/master 
update
 2013-06-17 11:28:58 -07:00
Li REN
200c791eed fix a bug causes npe. 2013-06-17 14:27:54 -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
Li REN
848e542ee4 clean 2013-06-17 00:01:37 -04:00
Li REN
b057857485 Transfer timeout counter to clock format (minute:second, for example, 100 -> 01:40) 2013-06-16 23:53:25 -04:00
North
d91813b08a removed Card dependency for image downloading 2013-06-16 18:13:51 +03:00
North
b13394f03c refactoring to CardImageSource 2013-06-16 17:19:10 +03:00
North
467d246a12 renamed CardInfo to CardDownloadData 2013-06-16 16:14:40 +03:00
North
1d4b3a2be6 Merge branch 'constants-refactor' 2013-06-16 15:25:35 +03:00
North
0bb110be45 [refactor] moved enums from Constants class 2013-06-16 12:28:10 +03:00
Li REN
2424c80718 Set default view of Sideboard to cardGrid. Make it similar to MTGO setting. 2013-06-16 04:06:28 -04:00
Li REN
1749eb7ded Add a feature to addlandDialog. Now it can help player calculate lands they need as the same function on MTGO. 2013-06-16 03:29:56 -04:00
LevelX2
df2fd3f68e Removed mage-theme-plugin dependency because it causes cyclic reference. 2013-06-15 20:02:39 +02:00
Li REN
fab2759579 update and adjustment 2013-06-15 04:12:26 -04:00
Li REN
11ed1f57d4 fix a bug of package importation that cause code not be able to compiled 2013-06-15 02:50:02 -04:00
Li REN
8ac58cfc41 Combine ThemePluginImpl into Mage Client project to avoid cycling dependency. 2013-06-15 02:01:58 -04:00