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

5440 commits

This branch
This branch
All branches
Author SHA1 Message Date
Li REN
200c791eed fix a bug causes npe. 2013-06-17 14:27:54 -04: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
Li REN
7d6e9eaadd Merge pull request #10 from magefree/master 
update
 2013-06-16 10:02:31 -07:00
LevelX2
9c57f27dfd [minor] fixed some import errors. 2013-06-16 17:34:03 +02:00
LevelX2
3d922c146e Merge branch 'master' of https://github.com/magefree/mage.git 2013-06-16 15:01:26 +02:00
LevelX2
e168e03d13 * Countryside Crusher - Fixed card reveal logic. 2013-06-16 15:00:40 +02:00
North
c9b736bec8 updated card template (fixed imports order) 2013-06-16 15:31:21 +03:00
North
1d4b3a2be6 Merge branch 'constants-refactor' 2013-06-16 15:25:35 +03:00
LevelX2
fb1dd2600b Merge pull request #246 from Noahsark/master 
Add a feature to addLandDialog; Change default view of sideboard to cardGrid;
 2013-06-16 04:12:00 -07:00
North
179f7200ec fixed constant imports in templates 2013-06-16 12:39:03 +03:00
North
0bb110be45 [refactor] moved enums from Constants class 2013-06-16 12:28:10 +03:00
Li REN
e8228195b2 Merge pull request #9 from magefree/master 
update
 2013-06-16 01:07:52 -07: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
0b8e7e88a7 [MMA] added 7 cards. 2013-06-16 09:23:06 +02:00
LevelX2
3def3230ee [minor] rule text formatting. 2013-06-16 09:22:44 +02:00
North
4d16535709 removed unused metadata from ExpansionSet 2013-06-16 09:52:29 +03:00
Li REN
68de6a76f6 Merge pull request #8 from magefree/master 
update
 2013-06-15 18:25:56 -07:00
LevelX2
df2fd3f68e Removed mage-theme-plugin dependency because it causes cyclic reference. 2013-06-15 20:02:39 +02:00
Li REN
c01253d265 Merge pull request #7 from magefree/master 
update code
 2013-06-15 09:32:35 -07:00
LevelX2
f99ba12b06 * Paladin en-Vec - Fixed protection ability. 2013-06-15 18:05:57 +02:00
LevelX2
5addb63757 * Changed indestructible to an ability according M14 rule change. Also fixed that for indestructible permanents the DESTROY_PERMANENT event was triggered what led to bugs with abilities like Totem Armor. 2013-06-15 17:57:01 +02:00
LevelX2
d6813e47c3 Merge pull request #243 from Noahsark/fab2759579276909b534de603feb01f50d326d37 
Add UI to set background, fix a little bugs, combine theme plugins to client project to avoid cycling dependency
 2013-06-15 02:32:00 -07:00
Li REN
a1b065c170 Merge pull request #6 from magefree/master 
update
 2013-06-15 01:14:08 -07:00
Li REN
fab2759579 update and adjustment 2013-06-15 04:12:26 -04:00
LevelX2
fb0d9c0f9d * Renegade Doppelganger - Fixed a bug that the copy effect did not end at end of turn and the copy was permanently renewed. 2013-06-15 09:43:01 +02: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
Li REN
8dd2a078e6 Merge pull request #5 from magefree/master 
update master code
 2013-06-14 21:54:50 -07:00
Li REN
3af6987333 Add UI for background image selection - selection, random, default 2013-06-15 00:53:35 -04:00
Li REN
c5873fdc2a Add UI for background image selection - selection, random, default 2013-06-15 00:53:18 -04:00
LevelX2
eeca9a66ca * Mul Daya Channelers - Fixed a bug that the mana givng ability did not work as mana ability. 2013-06-15 00:56:11 +02:00
LevelX2
b7a22aa283 * Sovereigns of Lost Alara - Fixed a bug that the effect attaching the aura to the attacking creature throws an error. 2013-06-15 00:24:10 +02:00
Li REN
bb48fd0c9b Merge pull request #4 from magefree/master 
update code
 2013-06-14 15:01:48 -07: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
fa5ddb23a2 Merge pull request #241 from Noahsark/master 
Clean my code and fix a bug of MusicPlayer
 2013-06-14 11:57:20 -07:00
Li REN
51515ff0ad Merge pull request #3 from magefree/master 
update code
 2013-06-14 10:06:34 -07:00
Li REN
7ce050641d fix a bug of MusicPlayer that cause nullpointer exception 2013-06-14 13:04:48 -04:00
LevelX2
574881f82c [MMA] Added Myr Retriever, Death Denied, Erratic Mutation. 2013-06-14 15:21:14 +02:00
LevelX2
6eebe83b20 * Explosive Revelation and Drown In Filth - Targets are mandatory now. 2013-06-14 15:20:34 +02:00
LevelX2
6c546220a3 Added AnotherCard predicate working for cards in graveyard. 2013-06-14 15:19:43 +02:00
LevelX2
4cf951399c Added method to player to put a list of cards on the bottom of the library in any order. 2013-06-14 15:18:51 +02:00
LevelX2
043fa36618 Merge pull request #236 from Noahsark/master 
Added music player that can if activated in preferences play music during the game. Added random background chooser (both developed by Noahsark).
 2013-06-13 23:04:50 -07:00
Li REN
c8f31960de Merge pull request #2 from magefree/master 
update from master
 2013-06-13 17:31:40 -07:00
Li REN
cc49f71b3c Clean the code 2013-06-13 20:24:26 -04:00
Li REN
37530f97ae Update ThemePluginImpl, know the client can randomly choose images in plugins/plugin.data/background/, nothing will be effect if there is no image files. 2013-06-13 20:23:26 -04:00
Li REN
2caa5cbf37 Update ThemePluginImpl, know the client can randomly choose images in plugins/plugin.data/background/, nothing will be effect if there is no image files. 2013-06-13 19:20:10 -04:00
LevelX2
faf8a450da [Minor] Formatting. 2013-06-14 00:31:29 +02:00
LevelX2
b3c3c571f4 * Abrupt Decay - Fixed the not working can't be countered ability (Issue #238). 2013-06-14 00:31:08 +02:00