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 |
|
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
|
63783d9fe2
|
* Tornament construction time - Fixed that the selected value was not used.
|
2013-06-29 17:52:19 +02:00 |
|
North
|
619b7222e7
|
refactoring to cards downloading and image path generation
|
2013-06-29 16:59:23 +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
|
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 |
|
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
|
e1db02baec
|
Added a sound playing if human player joins a match.
|
2013-06-17 21:38:30 +02:00 |
|
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 |
|
North
|
d91813b08a
|
removed Card dependency for image downloading
|
2013-06-16 18:13:51 +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 |
|
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
|
c5873fdc2a
|
Add UI for background image selection - selection, random, default
|
2013-06-15 00:53:18 -04: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 |
|
Li REN
|
7ce050641d
|
fix a bug of MusicPlayer that cause nullpointer exception
|
2013-06-14 13:04:48 -04:00 |
|
Li REN
|
cc49f71b3c
|
Clean the code
|
2013-06-13 20:24:26 -04:00 |
|
Li REN
|
c41a2df3ac
|
Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.
|
2013-06-12 23:34:43 -04:00 |
|
Li REN
|
6bbaa9fda1
|
Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.
|
2013-06-12 22:55:25 -04:00 |
|
Li REN
|
7102d08637
|
Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.
|
2013-06-12 22:27:08 -04:00 |
|
Li REN
|
3eef0b1080
|
Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.
|
2013-06-12 22:18:49 -04:00 |
|