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

943 commits

Author SHA1 Message Date
North
90559b8d69 [6ED] added set 2012-07-29 20:42:17 +03:00
North
355f4bcb7b [7ED] added set 2012-07-29 20:42:16 +03:00
magenoxx
50ffb96a3f [UI] Quick game start missing test.dck handling 2012-07-29 08:34:04 +04:00
magenoxx
e832ff3b53 [UI] made cheat button not focusable 2012-07-27 17:11:16 +04:00
magenoxx
0e0f90d29d [draft] M13 draft picks 2012-07-25 20:29:25 +04:00
magenoxx
0e361959c6 Removed list of M13 cards (all h.b. implemented) 2012-07-25 19:39:00 +04:00
magenoxx
721c87757b [UI] trasnparent players list in gamefind panel 2012-07-25 09:54:40 +04:00
magenoxx
421732a404 [UI] Displaying current phase 2012-07-25 00:21:53 +04:00
magenoxx
bef51b5085 Cropped startup image 2012-07-25 00:21:33 +04:00
magenoxx
0d20e954dc [UI] Phases new Look and Feel 2012-07-24 19:40:09 +04:00
magenoxx
5c58edced6 [UI] Added Phases component to the right centered by Relative Layout. 2012-07-24 14:42:52 +04:00
magenoxx
886bd640ea [UI] RelativeLayout 2012-07-24 14:41:57 +04:00
magenoxx
3d03a37e2d [UI] New background for startup and gamefind panels. Update mage theme plugin version from 0.4 to 0.5. Removed unused images. 2012-07-24 13:55:13 +04:00
magenoxx
47d44c6aef Returned game info panel to the right 2012-07-24 09:32:55 +04:00
North
1542ba9ab6 [filters] converted FilterCard conditions to Predicates 2012-07-23 21:53:54 +03:00
magenoxx
29e57830b4 Remembering toggle state for BigCard component between games 2012-07-23 09:07:25 +04:00
magenoxx
c783cbc41f personal game messages 2012-07-23 01:29:56 +04:00
North
265bc900a9 Added sets: Mirage, Visions 2012-07-21 15:38:58 +03:00
North
eeca9e6db2 Added sets: Stronghold, Exodus 2012-07-21 15:27:32 +03:00
North
3351d9420b Added sets: Mercadian Masques, Nemesis, Prophecy 2012-07-21 14:31:43 +03:00
North
a9b95595dc Added Odyssey and Torment sets 2012-07-21 14:31:41 +03:00
magenoxx
6fbf4c1257 Renamed parameter name. [UI] Fixed big card image blinking on mouse move 2012-07-21 14:10:07 +04:00
North
6bbb7521c7 [SCG] added set 2012-07-21 11:46:08 +03:00
North
9cf12d4c15 [LGN] Added Set 2012-07-21 11:46:07 +03:00
magenoxx
59b9087257 BigCard component back with toggle option. 2012-07-20 17:33:48 +04:00
North
5d0a832642 cleaned pom files and updated sqlight dependency 2012-07-19 21:15:09 +03:00
magenoxx
de146458a9 [UI] Some sounds 2012-07-19 18:11:00 +04:00
magenoxx
99b32dcc33 Deleted server msg file from mage.client module 2012-07-18 17:16:49 +04:00
magenoxx
b2cd3e75bd changed version from 0.8.7.dev to 0.9.0.dev 2012-07-18 15:59:07 +04:00
magenoxx
9c6dc78842 Shuffling player seats in multi player 2012-07-18 12:12:12 +04:00
magenoxx
ed0af0faee Added skip-all-turns-and-actions feature. Bound to F9. 2012-07-18 10:15:50 +04:00
magenoxx
8598f9ead1 Displaying tray message on player join and quit events 2012-07-17 14:18:38 +04:00
magenoxx
e198b317e4 [UI] new game background 2012-07-17 10:32:14 +04:00
magenoxx
872ced4344 [UI] Tray menu. Blinking on new players added to table. Added window restore on double-click. 2012-07-16 20:23:56 +04:00
magenoxx
9214051279 [UI] Mage tray icon 2012-07-16 19:08:03 +04:00
magenoxx
2de4506ad2 [UI] Added popup menu. Moved Concede action to popup. 2012-07-16 16:49:09 +04:00
magenoxx
44a3c05ba8 [UI] displaying tooltips: clean up and code refactoring 2012-07-16 16:14:53 +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
6d24c7001b Fixed tooltip not displayed in Collection Viewer 2012-07-16 09:07:28 +04:00
magenoxx
ccf201cfc4 stack min size 2012-07-16 09:06:55 +04:00
North
43322d3c1a Merge branch 'filters' 2012-07-13 23:10:10 +03:00
magenoxx
fc2283898c [UI]Alt+E:enlarge card. New game panel layout (experimental). 2012-07-13 14:55:52 +04:00
North
ecf765ecf5 [filters] Replaced CardType conditions with Predicate 2012-07-12 23:42:46 +03:00
magenoxx
9187cbff07 (Issue#6) Fixed tooltip not displayed until updated in Preferences dialog 2012-07-12 06:00:26 +04:00
magenoxx
7d1bdfb0ce Added F4 hot key for 'End Turn' action 2012-07-08 18:42:28 +04:00
magenoxx
5294e2cba4 Changed title for graveyard dialog 2012-07-08 18:40:53 +04:00
magenoxx
6d670fa3ff [UI] Moved Concede button from helper component to bottom-left 2012-07-08 09:41:04 +04:00
magenoxx
d9e0590763 fix for m13 type in deck generator 2012-07-08 08:06:54 +04:00
magenoxx
3ddff4a113 Added M13 option for deck generator 2012-07-08 07:21:26 +04:00
North
ff2f12fcc7 [USD] added set 2012-07-07 22:33:23 +03:00
North
4ee6ea5ae9 [JUD] added set 2012-07-07 22:19:45 +03:00
North
6395e82e47 [M13] added set 2012-07-06 14:23:24 +03:00
North
7734abe87f Fixed quick start action (for testing). 2012-07-03 08:25:50 +03:00
magenoxx
9ac166abc9 updated version to r2 2012-07-03 00:38:41 +04:00
magenoxx
375cc311b9 Fixed ClassCastException for Client windows 2012-06-30 09:10:36 +04:00
magenoxx
8ba88ff5f2 config changes 2012-06-29 17:19:12 +04:00
magenoxx
4d6b48b661 Another two decks for AI 2012-06-29 17:02:29 +04:00
magenoxx
5541fe4163 updated version from 0.8.6.r5 to 0.8.7 2012-06-29 14:56:13 +04:00
magenoxx
ebf8e372bd Minor helper fix 2012-06-29 10:01:37 +04:00
magenoxx
7bcd512351 Not included changes (can be ignored for now) 2012-06-28 16:40:46 +04:00
magenoxx
30264a4326 Made button non visible on helper component rather than disabled 2012-06-28 10:08:13 +04:00
magenoxx
6ad352709a Focus on button for space and enter hot keys 2012-06-28 01:06:38 +04:00
magenoxx
25bdce4b67 Hiding 'End Turn' button 2012-06-28 00:53:59 +04:00
magenoxx
004aa20d08 Decreased tooltip display delay from 700ms to 300ms 2012-06-28 00:16:26 +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
8f0159d706 Displaying tooltips over card choice dialogs 2012-06-27 17:34:58 +04:00
magenoxx
0f15fd1186 ClassCastException fix on game close 2012-06-27 17:33:47 +04:00
magenoxx
a8588c1c83 Added displaying 'Your turn' message 2012-06-27 15:35:37 +04:00
magenoxx
d5c5a89e85 Made stack window bg color transparent 2012-06-27 15:13:59 +04:00
magenoxx
75e641580c Displaying text in helper component. Removed feedback component 2012-06-27 15:07:01 +04:00
magenoxx
c2a517f1b3 New helper component 2012-06-27 14:25:12 +04:00
magenoxx
b11d843d0b Unlocked 3 avatars 2012-06-27 12:59:38 +04:00
magenoxx
d31197a8c2 Fix for arrows not removed on game end 2012-06-27 12:59:06 +04:00
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