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

869 commits

Author SHA1 Message Date
magenoxx
559ba76906 New graveyard dialog 2012-06-27 12:09:14 +04:00
magenoxx
59a2eaafd8 Minor changes 2012-06-26 18:13:32 +04:00
magenoxx
653f236c65 Cards lazy loading 2012-06-26 17:20:05 +04:00
magenoxx
96daa4e0a9 Added support for splash image 2012-06-26 15:39:00 +04:00
magenoxx
541be44d21 Updated splash image 2012-06-26 15:38:08 +04:00
magenoxx
22acb87c37 Good deck for AI 2012-06-25 18:00:51 +04:00
magenoxx
830533360e Fixed close dialog not working correctly 2012-06-25 13:43:43 +04:00
magenoxx
cac2490f77 Displaying background in draft picks dialog 2012-06-25 13:04:41 +04:00
magenoxx
0c4217adf1 Removed stack dialog 2012-06-25 10:08:45 +04:00
magenoxx
37e7941807 sorting sets in drafts by release date 2012-06-24 22:44:37 +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
25edb58811 Added sideboard to Pro Tour Barcelona Miracle deck 2012-06-17 11:17:17 +04:00
magenoxx
48f2018af6 New stack dialog (experimental) 2012-06-16 19:33:03 +04:00
Loki
29f117fba2 update revision to r5 2012-06-14 21:10:50 +03: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
d895b3e8d0 Lazy card loading 2012-06-05 19:41:17 +04:00
Loki
f088039c35 fix ULG symbols downloading 2012-06-05 17:49:47 +03:00
magenoxx
2c175dadf4 Fixed random stack abilities display order in client 2012-06-05 17:26:17 +04:00
magenoxx
d07236352b Turbo Poison deck 2012-06-05 14:16:57 +04:00
Loki
7001caa64d bump version to 0.8.6.r4 2012-06-04 21:32:40 +03:00
Loki
1adee62789 bump revision to 0.8.6 r3 2012-06-01 23:21:32 +03:00
magenoxx
9c3cc85ff2 Added filtering by Standard cards into DeckEditor. Changed sorting to release date. 2012-06-01 01:23:48 +04:00
magenoxx
500b4ab651 [WTH] Weatherlight set and simple cards 2012-05-28 16:11:23 +04:00
magenoxx
c4cbc2a34e Changed version to 0.8.6.r2 2012-05-27 11:03:49 +04:00
North
06a185a3a5 removed unused imports 2012-05-26 20:08:39 +03:00
magenoxx
032a261e5f 2 decks 2012-05-25 22:24:10 +04:00
magenoxx
4ae362c050 Displaying lands from the same set but different images separately in deck editor 2012-05-25 21:33:29 +04:00
magenoxx
6bd53a856f Remove buttons in DeckEditor 2012-05-25 21:22:22 +04:00
jeffwadsworth
fb6d7eac1f - Added 2 decks. 2012-05-25 11:46:53 -05:00
magenoxx
342b5a8444 moved old decks to 2011 folder 2012-05-25 19:40:16 +04:00
magenoxx
bebd9644be updated jars 2012-05-25 19:23:25 +04:00
magenoxx
135f4d6841 reverting java-image-scaling version back to 0.8.5 2012-05-25 19:21:38 +04:00
magenoxx
12b21abe52 changed version from 0.8.5 to 0.8.6 2012-05-25 19:04:40 +04:00
magenoxx
675d2f1183 UI fix for attachments z-order 2012-05-25 10:19:31 +04:00
magenoxx
9a5000616d Fixed UI bit with cards z-order 2012-05-25 08:58:16 +04:00
magenoxx
5e97b56508 UI battlefield transparency fix 2012-05-25 01:32:17 +04:00
magenoxx
32e29392d2 [AVR] Second Guest + tests. Refactored filters. 2012-05-24 09:01:31 +04:00
magenoxx
2ac151bf25 Added Urza's Legacy set 2012-05-22 09:45:26 +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
2312b38a75 UI battlefield layout fix 2012-05-21 00:18:31 +04:00
magenoxx
1bf0e216de Displaying tooltips and green arrows for paired creatures 2012-05-17 11:59:47 +04:00
magenoxx
0e2481c0a9 Saving collection viewer format in preferences 2012-05-11 19:25:07 +04:00
magenoxx
be7f01b0ba Enhanced card-by-text searching in deck editor 2012-05-08 14:28:06 +04:00
magenoxx
7740143e07 Added Innistrad block option to deck generator 2012-05-07 08:41:12 +04:00
magenoxx
5d0ce8ac09 Fixed token description 2012-05-07 08:30:02 +04:00
magenoxx
fa0e623120 changed version from 0.8.4 to 0.8.5 2012-05-07 07:50:07 +04:00
Loki
9de37bea5a Fixed memory leak 2012-05-06 23:40:44 +03:00
Loki
2577f708bf card plugin fix for null rule in tooltip 2012-05-06 23:40:40 +03:00
Loki
a746ca680b [load] one place server ping 2012-05-06 23:40:37 +03:00
magenoxx
9edac9426e starting server at 0.0.0.0 2012-05-04 11:11:13 +04:00
magenoxx
80a25377b5 GatekeeperOfMalakir kicker test. Fails. 2012-05-03 18:21:30 +04:00
magenoxx
f6ef3fdd89 Fixed CollectionViewer with layoyt config not set on startup. 2012-05-03 05:47:51 +04:00
magenoxx
ef2a36c329 Fixed Issue#5: 'Show tooltips' doesn't affect cards in all zones 2012-04-30 19:26:26 +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
0970856fc8 Added saving layout configuration in collection viewer. Fixed bug with empty pages on layout switching. 2012-04-29 18:57:32 +04:00
North
0c1cccbd03 Added Avacyn Restored set 2012-04-28 11:26:09 +03:00
magenoxx
42108ef59c fixed downloading images from flip cards according to changes on magiccards.info site 2012-04-28 03:27:36 +04:00
magenoxx
11df72593c changed version from 0.8.4.dev to 0.8.4 2012-04-27 18:09:19 +04:00
magenoxx
6ea1983696 commented out launch4j plugin 2012-04-27 18:08:00 +04:00
North
47bd74a24c [refactoring] Moved Sets.loadDeck to a DeckImporterImplementation 2012-04-08 16:52:21 +03:00
North
e9ac5a180b [refactoring] removed dead code (action for Challenge button) 2012-04-08 12:14:52 +03:00
magenoxx
33f19e9f8d Fixed NPE in client 2012-04-06 12:40:57 +04:00
magenoxx
4ab62efc38 Now it is possible to choose game format in deck generator. 2012-03-28 11:52:38 +04:00
magenoxx
2b7cb8ca19 Changed default tab in collection viewer to DKA. 2012-03-28 11:52:00 +04:00
magenoxx
653b2c8a05 Displaying card count in deck editor. 2012-03-26 10:06:16 +04:00
magenoxx
3875c1f7c0 Changed component version from 0.8.3 to 0.8.4 (dev) 2012-03-25 12:16:46 +04:00
Loki
770bc451c9 add missing set images, fix non-utf8 char 2012-03-09 13:41:00 +04:00
North
263c937133 Ignored Integration tests (would fail when building Mage Client) 2012-02-29 22:38:20 +02:00
BetaSteward
d79cbcb54f fixes 2012-02-09 15:58:14 -05: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
65ce0c3948 fixed resizing 2012-02-04 16:57:22 -05:00
magenoxx
79919e1550 changed version from 0.8.3.dev to 0.8.3 2012-02-04 15:39:03 +04:00
BetaSteward
37e5c135f5 updated all jars - not sure which ones I might have messed up so I'm updating all 2012-02-02 23:55:39 -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
ca0fcbad58 Fixed bug with the email value not sent to server ;(( 2012-01-30 20:34:14 +04:00
North
b31c23d686 updated .gitignore 
removed deck file (should not be there)
 2012-01-29 22:46:27 +02:00
North
34765debdc [refactoring] removed DrawCardEffect (misleading and there was better solution already implemented); also fixed Cruel Ultimatum 
[refactoring] removed special char from deck name.
 2012-01-29 22:39:58 +02:00
North
90ad4a16c6 [sets] Added Dark Ascension 2012-01-29 17:00:23 +02:00
magenoxx
803947e053 Fixed capital letters in startup scripts. 2012-01-28 22:23:21 +04:00
magenoxx
bef2adadf2 Changed url for server-list.txt. 2012-01-28 21:37:16 +04:00
Loki
4ea776ce76 Merge remote-tracking branch 'origin/master' 2012-01-28 14:30:11 +04:00
Loki
3b1169e9d3 add USG set icon to download list 2012-01-28 14:29:54 +04:00
magenoxx
0cd53d37c7 Changed url for server-list.txt. 2012-01-28 13:37:32 +04:00
magenoxx
b3f99c43d5 Closing Feedback Dialog on send. 2012-01-28 13:37:12 +04:00
magenoxx
3434dc1a97 Added User Feedback support. 2012-01-26 22:13:44 +04:00
magenoxx
bdb2754847 Added sending broadcast message to all users on server from Admin Console. 2012-01-25 19:13:27 +04:00
LevelX
6a282d1e51 3 new cards 
[CHK] Marrow-Gnawer / Orochi Eggwatcher / Kiku, Night's Flower

Fix
ShisatoWhisperingHunter - using now sacrificeControllerEffect instead of sacrificeEffect

Framework
BeginningOfUpkeepTriggeredAbility - reverted change to set targetPointer if targetController == YOU (this caused unwanted side effects)
SacrificeControllerEffect - new effect that the controller of an ability has to sacrifice something
GainAbilityAllEffect - improved text generation
some minor comment and include fixes
 2012-01-24 23:33:27 +01:00
North
9ce828f491 Fixed name for two sample decks 2012-01-22 13:55:34 +02:00
LevelX
d441020f5f Font of Mythos - Fixed bug giving only opponent the draw efffect 2012-01-20 00:26:30 +01:00
magenoxx
3d4d3a0b34 one more 2011-12-26 22:23:00 +04:00
magenoxx
c570ea4e61 Lots of decks submitted by Iran. 2011-12-26 22:22:00 +04:00
magenoxx
4c7cbfa9dd Added server configs to release folder for embedded server. 2011-12-26 21:46:59 +04:00
magenoxx
4d9493a256 Update jars. BugCantFindCardInLibrary now works. 2011-12-26 18:49:32 +04:00
magenoxx
eb0bc89597 Tree optimizers. Fixed Issue 420. 2011-12-26 12:52:31 +04:00
magenoxx
3f20b725db [MAD2.0] New scoring and undo system. Migrated draw cards action. 2011-12-25 11:42:32 +04:00
magenoxx
24dea6a02c updated jars 2011-12-24 22:21:37 +04:00
magenoxx
e5999166d8 updated jars 2011-12-24 19:37:01 +04:00
magenoxx
cdb9cd69ff Now AI will use all abilities without paying attention to effect outcome. 
This fixes ObNixilistheFallenTest.
 2011-12-24 19:25:28 +04:00
magenoxx
53e9d2752b Fixed combat actions in MAD AI. Updated tests. 2011-12-24 18:45:13 +04:00
Loki
1f259ec772 fix symbol downloading for PLS and INV 2011-12-24 17:21:14 +04:00
magenoxx
dc2ebdd16d Some tests fixes. Returned back checking for repeated action with the fix. 2011-12-24 12:34:00 +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
7bd38bb208 Fixed assembly (daily builds were broken). 2011-12-18 12:29:16 +04:00
magenoxx
13c5177d54 [ui] Now pressing "Enter" on any text field in Connect dialog will force connecting - No need to press "Connect" button anymore. 2011-12-09 15:15:48 +04:00
magenoxx
e076c0b6ee Fixed client bug where pressing "No" on "Are you sure you want to disconnect?" closed the client anyway. 2011-12-09 15:10:09 +04:00
magenoxx
ba6508cbeb Updated component version from 0.8.1 to 0.8.2. 2011-12-09 13:15:07 +04:00
BetaSteward
afef9c06fe handle smaller screen sizes 2011-12-07 10:03:17 -05:00
BetaSteward
e911f0b662 fixed large hand cards + improved resizing 2011-12-01 14:49:14 -05:00
BetaSteward
70421439f0 resize game panel when window resizes 2011-11-25 08:20:05 -05:00
magenoxx
16c03d6d4d Test for multiple connects. Reproduces bug with "already connected" exception. 2011-11-24 13:17:15 +04:00
BetaSteward
b975d98bf5 partial fix for issue 81 2011-11-21 08:29:21 -05:00
honaker215
8c23757260 Updated startClient.command to refer to the current project version instead of the static value of 0.8 2011-11-01 13:39:34 +00:00
Loki
a004ced17d artifactId to lowercase 2011-10-28 15:42:54 +04:00
magenoxx
490b95bcc6 added additional scripts for Win 7 and MacOs. added "how to start" instructions. 2011-10-28 11:40:39 +04:00
magenoxx
e302a12f5d Updated component's version from 0.8 to 0.8.1 
manually
 2011-10-28 11:36:42 +04:00
maurer.it
5750f757ce [REF] references 291 - Thanks for the contribution, always nice to know non-windows OS's are used. 2011-10-19 21:08:07 -04:00
maurer.it
3c8e5d4ea2 Sample decks from a couple Star City Open Standard Series tournaments. 2011-10-18 20:29:57 -04:00
Loki
778b0dc15f fix libs path for launch4j 2011-10-16 22:34:37 +03:00
North
6467649b27 Removed duplicate decks 2011-10-16 21:13:51 +03:00
magenoxx
f42e9084f7 decks from slightlymagic.net 2011-10-16 21:44:45 +04:00
magenoxx
cbfc696c6b fixed version in launch4j 2011-10-16 21:18:20 +04:00
magenoxx
3350c3e829 Updated components' version from 0.7.6 to 0.8 2011-10-16 21:02:04 +04:00
North
63bfc59e26 [Decks] added the decks submited by Iran 2011-10-16 19:38:09 +03:00
magenoxx
c7dcd3605c change tournament ai level component size. changed default value to 10. 2011-10-16 18:06:13 +04:00
BetaSteward
a21e815ae9 fixed issue 281 2011-10-15 23:42:24 -04:00
BetaSteward
4c1d0728bc fixed issue 280 2011-10-15 23:41:57 -04:00
magenoxx
e2049409ab Fixed image not correctly resized for big card component. 2011-10-16 02:43:43 +04:00
magenoxx
ef1fa35555 Fixed Issue 256. 2011-10-16 02:27:37 +04:00
North
04e1d7efe2 Preconstructed decks 2011-10-16 01:26:00 +03:00
magenoxx
2926f0b6cb Transparent panel in Collection Viewer. 
was gray.
 2011-10-16 02:14:25 +04:00
magenoxx
3ab6b76c07 fix 2011-10-15 20:23:26 +04:00
magenoxx
ba19cc7f61 Added tab switching into Collection Viewer. 2011-10-15 19:45:16 +04:00
magenoxx
74b21979a5 Added choosing size to Collection Viewer. 2011-10-15 15:31:29 +04:00
magenoxx
5fbb8b1053 Sorting by formats in Collection Viewer. 2011-10-15 14:16:13 +04:00
magenoxx
446c1517cf Added random colors to deck generator. Fixed Issue 267. 2011-10-13 17:18:05 +04:00
Loki
6f177b1d82 Magic Player Rewards - full art cards 2011-10-12 20:39:05 +03:00
magenoxx
3e0e1e6ecd Updated AboutDialog. 2011-10-12 20:22:55 +04:00
magenoxx
0bb803a681 Added download tokens for ISD. 2011-10-12 13:02:01 +04:00
magenoxx
bf62ef248c unban ISD in magiccards.info image source 2011-10-12 12:53:30 +04:00
North
f4aa7fb71f Added remaing sets from modern. 
Added simple cards for added sets
Fixed blockName for existing sets.
 2011-10-10 22:21:00 +03:00
North
4b995918a2 removed ISD from unimplemented list 2011-10-10 21:53:39 +03:00
magenoxx
57d5dde609 Made ISD default opened set in Collection Viewer 2011-10-07 23:59:15 +04:00
North
8fe2ffc8f8 [ISD] Starter Decks 2011-10-07 21:40:11 +03:00
Loki
6f4d3b3963 Time Spiral set added 2011-10-06 23:58:30 +03:00
Loki
4d53d7ce00 add ISD symbol to downloading list 2011-10-06 10:26:03 +03:00
magenoxx
06b83d8a5e Fixed transform animation. 2011-10-04 20:14:04 +04:00
magenoxx
f8c853fe4e Test that reproduces Issue 266. Fixed Issue 266. 2011-09-28 09:00:44 +04:00
Loki
ab3a09181c fix running client and server from bat files 2011-09-26 19:30:22 +03:00
BetaSteward
835879fe78 reformatted chat panel and game message - you can now see both areas at the same time 2011-09-25 21:53:27 -04:00
North
d050c80de0 Fixed function that reads unimplemented cards 2011-09-25 15:24:14 +03:00
North
529de2f8cf return null if url is not available for current download source 2011-09-25 15:23:25 +03:00
magenoxx
e63bec1977 Removed repaint override in CardPanel. 
Ccaused awt deadlocks.
 2011-09-25 15:08:21 +04:00
magenoxx
f3316853a2 For a while ISD images are restricted for downloading from magiccards.info 
Images have too bad quality
 2011-09-25 14:25:54 +04:00
North
04a7e79ada Added unimplemented ISD to collection viewer. 
Removed unimplemented list files for completed sets.
 2011-09-25 11:56:07 +03:00
BetaSteward
5efe352305 removed modal messages in game panel 2011-09-24 22:05:19 -04:00
North
27c8514d64 minor changes (removed unused imports, added @Override ...) 2011-09-24 22:37:53 +03:00
North
e72da7f4ed Fixes issue 260. 
Fixes download issue from magiccards.info (optimized CPU usage too).
 2011-09-24 22:37:03 +03:00
magenoxx
2a25b207ea Merge 2011-09-24 13:08:05 +04:00
North
b0b6b1186c Download possible for Double faced cards from wizards spoilers. 2011-09-24 11:06:08 +03:00
magenoxx
617374e13f fixed night card not displayed in the stack 2011-09-24 11:00:50 +04:00
magenoxx
a3105dae8c Merge 2011-09-23 11:27:21 +04:00
magenoxx
49da09ce65 Token images for M12 and DDH 2011-09-23 08:15:16 +04:00
magenoxx
08baa314f4 Added downloading double-faced cards images from magiccards.info 2011-09-23 07:01:54 +04:00
magenoxx
9e7f3ad787 new custom avatars for me 2011-09-22 19:31:11 +04:00
BetaSteward
bbb4f8a346 fixed issue 255 2011-09-21 23:21:40 -04:00
magenoxx
5978d57298 Custom avatar for "Rahan" 2011-09-21 13:46:04 +04:00
magenoxx
a4fd5e6fb7 Possible fix for Issue 256 2011-09-21 12:25:22 +04:00
magenoxx
4534f11f3d Fixed Issue 244 2011-09-20 22:42:36 +04:00
magenoxx
9f868daf3e Now players may choose avatars in Preferences Dialog. 2011-09-20 21:05:22 +04:00
Loki
19f0a6b7b0 move Mage-Server and Mage-Client jars to lib 2011-09-19 20:58:03 +03:00
North
ec734f73c3 [NPH] Preconstructed decks 2011-09-19 20:15:29 +03:00
magenoxx
474b022b6c fix 2011-09-18 16:33:50 +04:00
magenoxx
0d30981443 removed debug messages 2011-09-18 14:06:22 +04:00
magenoxx
2d8948b8f6 Changed version from 0.7.5 to 0.7.6 2011-09-18 13:57:43 +04:00
magenoxx
abdff12e15 Fixed MOD. 2011-09-18 13:50:13 +04:00
magenoxx
41aae0c71d Images. fix for transform rules text. 2011-09-17 16:54:55 +04:00
magenoxx
e7bb796d48 Double-faced cards support 2011-09-17 16:47:28 +04:00
magenoxx
b81992bf9d Removed transform from all cards. 2011-09-16 09:04:17 +04:00
Loki
970bef84d1 2 cards with kicker redone and fix AE 2011-09-15 23:44:13 +03:00
BetaSteward
a73d04af1a clean up 2011-09-12 22:11:17 -04:00
magenoxx
a74344a81a changed avatar for "Askael" 2011-09-12 12:02:32 +04:00
North
d09db1d58a special character fix 2011-09-12 07:27:20 +03:00
North
f1bf37bbd0 Fix for Avacyn's Pilgrim image download. 2011-09-11 22:58:18 +03:00
Loki
8df6df5faf [ISD] Gavony Township 2011-09-11 17:00:40 +03:00
North
a5d5f012a8 images not needed anymore 2011-09-11 11:50:19 +03:00
North
49435820d1 Updated WizardCardsImageSource (can get images from an uncomplete spoiler now) 2011-09-11 11:48:40 +03:00
magenoxx
2a408cfc13 added temporary images for available cards 2011-09-11 10:50:03 +04:00
magenoxx
436f4923cd [ISD] 5 green cards 2011-09-10 12:23:33 +04:00
magenoxx
444341dee9 custom avatar for "Alive" 2011-09-10 11:17:18 +04:00
magenoxx
b5b96e7ec1 [ISD] dual lands 2011-09-10 10:31:23 +04:00
BetaSteward
d512fc1021 fixed client proxy settings 2011-09-09 23:07:55 -04:00
magenoxx
c2594f7b17 more solid border for active player 2011-09-09 00:35:52 +04:00
magenoxx
903dc0c5ef Added card transform in UI. For now for all cards. 2011-09-08 22:23:35 +04:00
magenoxx
8e9b6ac821 avatar for "loki" 2011-09-08 13:50:59 +04:00
magenoxx
33be6bd828 UserDataView. More custom avatars. 2011-09-08 10:41:52 +04:00
magenoxx
0b223bfe4f Added custom avatars for "nantuko", "i_no_k", "Askael" 2011-09-07 21:20:29 +04:00