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

655 commits

Author SHA1 Message Date
LevelX2
ad71ec6aad Set Version 1.3.0. 2014-01-25 15:55:39 +01:00
LevelX2
e490d6af61 Added cubes for Sealed and Daft Tournaments. Added a simple Swiss like tournament format. 2014-01-10 19:58:55 +01:00
LevelX2
c0323c168c Added user info text that user can set. Addd chat whisper command. Some minor changes to chat. Impoved display of user list. 2014-01-09 13:26:25 +01:00
LevelX2
b724d7fe13 Mage 1.2.0 Release 2013-12-31 17:29:00 +01:00
LevelX2
46e450fa96 Mage 1.2.0 Release 2013-12-31 17:28:34 +01:00
LevelX2
05cbd90fe2 * Commander - Added commander multiplayer format. Fixed commander damage win condition to only counting combat damage. Added some info to tooltip text of commander. 2013-12-23 17:14:56 +01:00
LevelX2
c58ecf366b Fixed possible NPE in GameController. 2013-12-08 09:36:15 +01:00
LevelX2
33c6bf1385 Ability picker shows now the name of the object instead of {this] in ability text.. 2013-11-06 14:32:50 +01:00
LevelX2
3d4bb90805 Updated for release 1.2.0. 2013-10-27 08:38:38 +01:00
LevelX2
d094f291aa Pushed version to 1.2.0dev. 2013-10-26 13:01:31 +02:00
LevelX2
6c54812068 * User list added info about games and tournaments. Fixed a logging NPE. 2013-10-21 23:58:11 +02:00
LevelX2
5a2b445e43 * Fixed a bug that tournament player was not removed correctly, if he left thetournament start panel. Changes to logging. 2013-10-21 00:38:59 +02:00
LevelX2
5f85d52837 Some changes to server logging messages. 2013-10-21 00:38:01 +02:00
LevelX2
038b15f399 * Changed some server logging. 2013-10-19 18:40:46 +02:00
LevelX2
c22a75a6c3 * PopUp Menus -Added F2/F3/F4/F9 to menu. Set correct popup menu for watcher. 2013-10-19 18:40:20 +02:00
LevelX2
51b93600e6 * Session - Added additional information for exception. 2013-10-15 00:47:13 +02:00
LevelX2
d6c1075125 * Release Mage 1.1.0 final 2013-10-12 11:22:06 +02:00
LevelX2
4513c7f7c3 Created a ConstrucedEliminationTournament (only the server plugin yet). 2013-10-10 16:19:30 +02:00
LevelX2
45c875384c * some logging changes. 2013-10-09 17:12:14 +02:00
LevelX2
d34779fa68 * Changed logging level back to info, changed level of a lot of messages to debug from info. Added check that certain AI players can't join a table with no appropriate format. 2013-10-09 15:22:40 +02:00
LevelX2
360a62917b Added optional server config parameter to limit the number of AI players when creating tournaments. 2013-10-07 18:14:27 +02:00
LevelX2
e2532a9b11 Improvements player cancels or leaves match or tournament. Draft can replace human player by draft bot if human leaves. 2013-10-03 22:42:16 +02:00
LevelX2
fe82b49930 * Join Table - Changed handling of messages while creating or joining a table. 2013-09-28 16:59:43 +02:00
LevelX2
50056df24e * TableController - Removed unneccessary warinings. 2013-09-28 14:37:10 +02:00
LevelX2
2b18ed76cb * TableController - Removed unneccessary warinings. 2013-09-28 14:36:44 +02:00
LevelX2
a9415db2e5 Fixing some possible NPE after player left tournamen/match and submits the construct/sideborading panel. 2013-09-28 11:56:15 +02:00
LevelX2
0357dcb59d Prevented 0 damage prevention events. 2013-09-27 16:14:13 +02:00
LevelX2
d2f83b1ade Added Theros block format. 2013-09-24 16:54:55 +02:00
LevelX2
faafa3f8be Fixed some possible NPE in MageServerImpl (Fixes #342). 2013-09-24 11:16:27 +02:00
LevelX2
d48a8b35fd Added timeout duration in seconds to timeout message. 2013-09-21 19:41:59 +02:00
LevelX2
be883d6b70 Fixed that timeout for autoconcede is only applied if the player has priority. This prevents that player autoconcede if other players need more time to finish their turns. 2013-09-21 19:30:03 +02:00
LevelX2
06d5e2a4c6 * Rescue From the Underworld - small fix to the tooltip text. 2013-09-19 14:42:07 +02:00
LevelX2
182839d41a Added some new sound files (PlayerLost, PlayerWon, PlayerSubmittedDeck, PlayerLeft). 2013-08-31 19:00:38 +02:00
LevelX2
3092373d1d * Fixed possible NPE in TableController (fixes #298). 2013-08-28 15:51:06 +02:00
LevelX2
ae44981cfa Added a game end dialog, that shows the result of the finished game. 2013-08-07 16:50:25 +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
7ba3d451da Small changes for Release 1.0.3 2013-07-21 09:46:45 +02:00
LevelX2
2e5fc5fc98 Some small changes for Release 1.0.3 2013-07-21 09:45:58 +02:00
LevelX2
ac23750310 * Fixed a bug that looked at cards were sometimes not shown (fixes #266 and fixes #264). Removed unused code. 2013-07-20 16:58:02 +02:00
LevelX2
a7a023b5c1 Fixed NPE if non tournament player submits a deck. 2013-07-19 19:14:33 +02:00
LevelX2
6098aa1d7c Handling of players that cancel tournament improved. 2013-07-19 14:05:56 +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
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
26ca873eb6 [minor] Some text renaming. 2013-07-15 23:56:10 +02:00
LevelX2
ded726d2ef Prevent that the tournament sub tables are deleted by expire check (delete logik must be added). 2013-07-15 15:03:38 +02:00
LevelX2
73fbfa1888 Deactivated call to replay because game savin is deactivated.. 2013-07-15 01:06:53 +02:00
LevelX2
40c6ba2efc Fixed some handling to possible NPEs. 2013-07-15 00:54:14 +02:00
Li REN
8612d17aaa add a comment for the fix 2013-07-13 20:24:50 -04:00
Li REN
71909e8310 Add exclusion condition 'two player duel' to expire checker in TableManager. That fix the bug cause the table with AI player be removed in tournament temporarily 2013-07-13 20:19:04 -04:00
LevelX2
bb06591f53 Finished changes for priority timer, works now per match and match will be continiued after first game is finished. 2013-07-06 15:14:15 +02:00
LevelX2
0f32fc72de Solution for the deck editor / sideboarding / construct - mockcards problem. 2013-07-06 00:44:13 +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
83ad29b0a9 Added missing change for quit match. 2013-07-02 23:49:07 +02:00
LevelX2
05b221fbbf Added a check to TableController. 2013-07-02 23:42:33 +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
5e3970a0e0 added method for updating cards database 2013-07-02 22:29:06 +03:00
LevelX2
a71285a768 Remove table if a user disconnects only if state is waiting or starting. 2013-07-02 17:00:57 +02:00
North
e4ea8adf94 added method for updating expansions database 2013-07-02 00:32:25 +03:00
LevelX2
06163d6ac5 Adding Player state to TournamentPlayer and TournamentPanel. 2013-07-01 17:11:44 +02:00
LevelX2
ccc107f7ef Added count for started tournaments. 2013-06-29 22:27:58 +02:00
LevelX2
c924ca8727 Posting a message to the tornament panel, if a player submits his deck. 2013-06-29 20:50:56 +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
6532aaffdf Timers on client side. Refactored. 2013-06-20 00:17:06 +04:00
magenoxx
42dd9d81b4 Timers (In progress) 2013-06-19 17:12:31 +04:00
LevelX2
ef83ec2874 Set the server release log level property to warn. 2013-06-18 13:28:09 +02:00
North
0bb110be45 [refactor] moved enums from Constants class 2013-06-16 12:28:10 +03:00
LevelX2
aef53bc4ce * The list of open tables shows now the codes of boosters selected for sealed or draft tournaments in the deck type column. 2013-06-10 12:38:38 +02:00
LevelX2
ef8d10a770 Some minor additions/changes to release assembly. 2013-06-08 16:56:23 +02:00
LevelX2
a734d604d5 Added mage-player-ai-draftbot to server dependencies to get it included in assembled release package. 2013-05-30 09:47:13 +02:00
LevelX2
449195daed Added check for JRE7 directory to the windows start .bat files. 2013-05-20 17:02:58 +02:00
LevelX2
31da9dcdfd [minor] Some formatting, remove unused code, changes to logging. 2013-05-19 08:29:38 +02:00
LevelX2
8c56231e15 [minor] some formatting 2013-05-18 14:55:50 +02:00
LevelX2
5336d4c0f9 Pushed version to 1.0.3 dev. 2013-05-12 16:00:25 +02:00
LevelX2
6b38cd5b18 Mage Version 1.0.2 2013-05-11 23:06:30 +02:00
LevelX2
b352217e17 Some improvements to split card handling. Better display of tooltip of split cards, also added handling if not cast from hand. 2013-05-09 21:26:15 +02:00
LevelX2
d00e953ad9 Added Levacy to the construced formats. 2013-05-03 08:37:30 +02:00
LevelX2
44d0df6bde Small changes to user/chat/session handling (not finished yet). 2013-04-30 17:10:35 +02:00
LevelX2
b6ddaabe44 Show user name in title bar of MAGE. Clear table chat after disconnect. Remove user from chat after disconnect. Some tweaking about the messages if a user disconnected/session expired. 2013-04-29 17:18:43 +02:00
North
a3411f2486 [cleanup] removed unused imports 2013-04-19 20:01:10 +03:00
LevelX2
6e4b06fc5b Added server config values to check user name minimal and maximal length and allowed chars for user name. Set to 3-14 length and [^a-z0-9_] chars (ignoring case) . 2013-04-13 14:21:42 +02:00
LevelX2
f644ffe041 Changed color of frame of avatar for active player to green again. Checked that a player of a game can't also watch his own game. Added a match score to the start of the game log. Changed the color of the Turn [X] message. Tips and join messages during a game are displayed in the chat panel instead the game log panel. Display of the player name when hovering over the avatar is more vertical centered. 2013-04-07 21:29:27 +02:00
LevelX2
a070c5a8e1 Fixed a bug that players were not removed properly from matches or tournaments they left before the match or tournament was started. 2013-04-06 02:09:04 +02:00
LevelX2
48f1560cb8 Added new AsThoughtEffectType to reveal face down cards (not a perfect solution I know, but better as using the cast type. If someone has a better idea to handle this, I'm open). 2013-04-06 00:04:21 +02:00
magenoxx
73793f6868 Merge branch 'master' of https://github.com/magefree/mage 2013-04-01 21:55:48 +04:00
magenoxx
6bc14d3da3 Updated formats in release config 2013-04-01 21:55:37 +04:00
magenoxx
97acebacdd Pumped version to 1.0.2.dev 2013-04-01 16:00:30 +04:00
LevelX2
5afb189315 Added modern format to the constructed formats. Updated list of banned cards of constructed formats. 2013-03-31 19:14:33 +02:00
magenoxx
29b84e0d92 Closed #169: Make it possible to untap lands 2013-03-29 20:35:16 +04:00
magenoxx
05191e8793 Closed #168 : Enhance priority hot keys 2013-03-29 17:18:12 +04:00
LevelX2
402f7fffd9 Tournaments status is updated now and if tournament finished, it's moved to the lower finished matches view. 2013-03-27 22:31:15 +01:00
LevelX2
8e3ebed11f [minor] formatting 2013-03-27 17:24:51 +01:00
LevelX2
7014b28797 Improved sceduled logic to remove bugged tables. Reactivated logic to show the list of the last finished 50 matches (no replay possible). 2013-03-27 16:58:34 +01:00
LevelX2
53a4caf9be Added a " (discon.)" suffix to player names in the list of players if they are disconnected. 2013-03-26 15:36:21 +01:00
LevelX2
d8961a7a82 [minor] formatting 2013-03-26 13:43:24 +01:00
LevelX2
e52c35fec9 Show player joins message in chat window only, if player isn't already connected. Suppres posting of empty strings in the chat window. 2013-03-17 23:44:45 +01:00
North
a7a565bb8f [minor] access modifer order 2013-03-10 14:53:02 +02:00
LevelX2
ec546a5ae6 Merge branch 'master' of https://github.com/magefree/mage.git 2013-03-10 13:46:02 +01:00
magenoxx
a3be8073e2 Moved job schedule time value to constant 2013-03-10 15:57:30 +04:00
magenoxx
a6decdbd14 Extending running schedule for the job 2013-03-10 15:33:14 +04:00
magenoxx
c1375f7b76 Job for removing expired tables 2013-03-10 15:32:06 +04:00
magenoxx
ef6d5e826e Fixed admin pswd not always parsed correctly on server 2013-03-10 15:26:01 +04:00
LevelX2
aa0290fd32 Set Version to 1.0.1 2013-03-10 11:40:56 +01:00
LevelX2
ffcd51989e [minor] formatting 2013-03-06 16:35:22 +01:00
LevelX2
cc96a55523 Some changes to logging. 2013-03-04 00:01:12 +01:00
magenoxx
9947fb9847 Updated server messages files 2013-02-26 15:44:56 +04:00
magenoxx
441a9870c8 Pumped version in java files and main pom 2013-02-26 15:44:21 +04:00
magenoxx
5577d5b3a8 Changed version from 0.10.1 to 1.0.0 2013-02-26 14:11:00 +04:00
magenoxx
77d7523dc4 Added MaxPermSize=256m to server startup scripts in release folder 2013-02-25 13:09:08 +04:00
LevelX2
169eec0ebf Added Commander Deck Type. Renamed block constructed deck types from "Constructed" to "Block Constructed". 2013-02-07 16:51:58 +01:00
magenoxx
2038adb707 Replaced Commander as a default game type by Two Player Duel 2013-01-21 21:18:27 +04:00
Backfir3
ef54888e01 Commander Game. Added placeholder game plugin 
- modified players life amount
- updated .gitignore
 2013-01-15 22:00:37 +01:00
Loki
aa31ef23d3 bump version to 0.10.1 2012-12-28 12:48:26 +13:00
North
fde10788db removed redundant modifiers from interfaces 2012-12-20 23:45:47 +02:00
North
bee9d63dec Removed rendundant repositories definitions from pom files 2012-11-25 12:23:26 +02:00
Loki
45316daf88 version bump to 0.10.0 dev 2012-11-17 01:46:36 +13:00
Loki
f017ab903c version bump to 0.10.0 2012-11-15 22:47:15 +13:00
LevelX2
8ccca932c1 Added some more block formats for deck validation. Sort list. 2012-11-14 07:51:24 +01:00
LevelX2
2745d31768 Fixed a bug that created multiple uneccessary windows for every computer player behind the correct waiting for players window when you created a match or a tournament. That fixed also the bug that the Ai joint the chat with the name of the human player. 2012-11-09 16:17:23 +01:00
North
25cd490be3 [CardRepository] moved Sets, DeckImporter and CardRepository to Mage Framework 2012-11-04 12:52:02 +02:00
North
cf93d74206 [CardRepository] Added card scanning on server startup 2012-10-22 23:49:26 +03:00
North
08815ffb88 [CardRepository] Replaced findCard methods from Sets and ExpansionSet 2012-10-22 23:48:52 +03:00
LevelX2
7c44b16504 AbilityPicker shows abilities now always in the order they were defined on the object. 2012-10-10 20:43:18 +02:00
LevelX2
b64e1658e9 Prevent some exceptions if sesssion is session is expired 2012-09-24 07:36:05 +02:00
Loki
46ec86b54c 0.9.2 dev 2012-09-04 21:24:44 +12:00
Loki
76bb3f827d 0.9.1 2012-09-04 18:33:51 +12:00
North
ae0ec7793b Removed server plugin binaries 2012-08-27 20:04:06 +03:00
Loki
85b31df2d5 Bump version to 0.9.1dev 2012-08-14 15:28:06 +12:00
Loki
b729631cc6 0.9.0 2012-08-13 18:58:51 +12:00
magenoxx
c97d5e8a35 AI enhancements 2012-08-03 16:53:01 +04:00
magenoxx
eefedc03b9 [AI] enhanced targeting. card fixes 2012-07-29 10:31:46 +04:00
magenoxx
2200fb8572 [AI] Improvements on repeating actions 2012-07-29 08:56:35 +04:00
magenoxx
1eb230e236 Fixed Issue#29: It is possible to cancel creature attack even if it must attack 2012-07-26 18:47:04 +04:00
magenoxx
0e0f90d29d [draft] M13 draft picks 2012-07-25 20:29:25 +04:00
North
987e28cef3 [M10] Mirror of Fate 2012-07-23 23:53:24 +03:00
magenoxx
c783cbc41f personal game messages 2012-07-23 01:29:56 +04:00
North
d773ed3d13 [filters] Replaced EvilTwin filter with predicate 
This commit also touches the targeting system. Changes were made for consistency.
 2012-07-21 23:18:17 +03:00
North
5d0a832642 cleaned pom files and updated sqlight dependency 2012-07-19 21:15:09 +03:00
magenoxx
23a75c39ba [M13] Odric Master Tactician 2012-07-18 20:45:39 +04:00
magenoxx
f92333504d Updated server.msg.txt with hotkeys description 2012-07-18 18:50:14 +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
c304812770 Debug logging for Issue#19 2012-07-18 13:57:54 +04:00
magenoxx
fce6756d77 Skipping attack declare if skipped turn. Made F4 and F9 working on declare attackers and blockers phases 2012-07-18 10:44:08 +04:00
magenoxx
ed0af0faee Added skip-all-turns-and-actions feature. Bound to F9. 2012-07-18 10:15:50 +04:00
magenoxx
4282afe023 Updated server plugin jars 2012-07-17 10:24:04 +04:00
North
9890d3d9c2 Removed cache objects from repository 2012-07-06 23:46:44 +03:00
magenoxx
9ac166abc9 updated version to r2 2012-07-03 00:38:41 +04:00
magenoxx
a60c05b861 Updated server message file 2012-06-29 20:22:42 +04:00
magenoxx
8f19d75374 configs 2012-06-29 20:12:35 +04:00