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

805 commits

Author SHA1 Message Date
magenoxx
c7ae032d5a Fixed possible NPE between callbacks (as client and server are not synchronized between calls) 2011-06-22 20:35:16 +04:00
magenoxx
2977afea2d fixed socket leak. 2011-06-22 18:40:29 +04:00
BetaSteward
4dc0c33819 fixed issue 142 - damage assignment order now works with tokens 2011-06-17 23:41:32 -04:00
BetaSteward
82654f10d5 fixed issue 103 - this should catch most card logic errors, log the error on the server and trigger a message on the client 2011-06-17 22:42:04 -04:00
BetaSteward
a0192c0e47 fixed issue 160 2011-06-17 10:29:50 -04:00
BetaSteward
f1558a255a implemented Damage Assignment Order 2011-06-16 23:02:24 -04:00
magenoxx
97eea533f3 updated version (from 0.7.3 to 0.7.4) in all pom files 2011-06-16 11:39:20 +04:00
magenoxx
8230775e0c Updated version to 0.7.4 beta-2 2011-06-16 11:35:19 +04:00
BetaSteward
952b46bc1f fixed tournament not starting error 2011-06-15 23:24:36 -04:00
BetaSteward
c4a3a496aa moved Session to Mage.Common 2011-06-15 23:24:03 -04:00
BetaSteward
c38804af5f rolled back changes since 0.7.3 R2 - going to switch client/server architecture 2011-06-14 23:09:18 -04:00
magenoxx
2a7b412a8c [client] new chat 2011-06-14 21:08:38 +04:00
maurer.it
f5b08fcaed Modified the <fileVersion> and <productVersion> to be dynamic based on the project.version. Modified the <originalFilename> to be mage-server.exe. 2011-06-11 21:52:33 -04:00
magenoxx
18a416d184 Change Mage version to 0.7.4-beta 2011-06-09 20:20:28 +04:00
BetaSteward
6cbd5369c3 Merge 2011-06-05 09:50:31 -04:00
BetaSteward
14891b1b77 added deck validation feedback to client + queue all RMI messages 2011-05-31 00:10:44 -04:00
BetaSteward
b676e59001 more client server improvements 2011-05-29 23:52:02 -04:00
BetaSteward
a03c084015 updated release config.xml 2011-05-29 23:49:46 -04:00
magenoxx
84b79000ff Phyrexian mana support. NPH: Mutagenic Growth, Dismember. 2011-05-29 23:12:21 +04:00
BetaSteward
3115ee3c5c Added deck types 2011-05-27 23:04:48 -04:00
BetaSteward
892f7cce1b client/server overhaul - tested on localhost, remote testing pending 2011-05-24 23:52:26 -04:00
magenoxx
8afc9a1023 Forgot to change version in Server. 2011-05-20 01:17:56 +04:00
magenoxx
74c7feb470 Moved version to 0.7.3 in pom files. 2011-05-19 23:49:43 +04:00
magenoxx
cbeab91889 Minor fixes in table manager and matchImpl. 2011-05-19 23:49:15 +04:00
magenoxx
4133a13120 Non modal tablewaiting dialog (allows to chat, to create several games). Pressing "Join" causes all your games appear on top. Updated logging. Fixed removing table not working (but not fully, as game ending still doesn't work). 2011-05-19 20:07:34 +04:00
BetaSteward
94c5a0cdfb client + server improvements 2011-05-17 21:55:20 -04:00
magenoxx
d056c8d05e Updated mage-player-human plugin (wasn't updated after npe issue fix). 2011-05-17 01:14:41 +04:00
BetaSteward
0e66c5e030 retrying without jars 2011-05-14 23:39:41 -04:00
BetaSteward
a4c3deb7ac Backed out changeset: 83cb579a3761 2011-05-14 23:32:22 -04:00
BetaSteward
473f6bcad9 fixed client/server ping + added server console 2011-05-14 23:28:07 -04:00
BetaSteward
55f3842464 fixed Issue 100 2011-05-13 23:11:06 -04:00
magenoxx
54adc043ec Getting information about connected players in Mage Client (without gui part at the moment, only logging to console). 2011-05-13 20:25:46 +04:00
BetaSteward
04120e4ee3 log to console and log file 2011-05-12 21:12:29 -04:00
magenoxx
90c54aad24 Backed out changeset: 0fd3c45486e4 2011-05-12 19:32:28 +04:00
magenoxx
a9a2fbd1c2 fixed log4j.properties - wrong parameters for file 2011-05-12 19:29:33 +04:00
magenoxx
5502098e65 Merge with backout 2011-05-12 09:20:32 +04:00
magenoxx
92d42c16b5 Backed out changeset: b5d9cea65b73 2011-05-12 09:20:19 +04:00
BetaSteward
301d16128b now need mage-player-ai.jar in lib folder + set default logging to console 2011-05-11 23:14:11 -04:00
BetaSteward
ab599dd335 added client/server ping + remove inactive connections from server 2011-05-11 22:08:11 -04:00
magenoxx
1ea69ee6c8 Fixed NPE in SessionManager. 2011-05-11 21:50:31 +04:00
magenoxx
7c18f9c6a8 Fixed NPE in SessionManager. 2011-05-11 21:50:11 +04:00
magenoxx
f78b4017bf Added support for looking at cards (Jace, The Mind Sculptor 2nd ability). Fixed Issue 50. 2011-05-11 21:24:17 +04:00
BetaSteward
b9eac322d2 added additional logging + keep session alive for most connection errors 2011-05-10 23:57:47 -04:00
BetaSteward
346e6d3e8f removed old AI's from config 2011-05-10 19:14:22 -04:00
Loki
28a5151131 update Launch4j 2011-05-10 18:25:22 +03:00
BetaSteward
017b2b4339 remove games from list when finished + added name and owner to tables 2011-05-09 23:02:54 -04:00
Loki
337eb9926e Mosquito Guard, update server plugins 2011-05-09 01:34:22 +03:00
BetaSteward
a326bcda92 use different method for determining server IP 2011-05-07 23:16:38 -04:00
BetaSteward
c87328d08e skill setting is now used by AIs 2011-05-07 23:16:00 -04:00
BetaSteward
b1ab23df37 missed file 2011-05-04 23:20:02 -04:00
BetaSteward
b81938210a changes for public server 2011-05-04 23:18:13 -04:00
Loki
1fdc50570f add initial Launch4j support and one card 2011-04-29 23:54:16 +03:00
magenoxx
be2fdd6487 Challenge Mode. In progress. 2011-04-29 20:32:22 +04:00
BetaSteward
86f708b17a detect client version + client changes for AI skill level 2011-04-28 22:52:52 -04:00
BetaSteward
74bdfb9ea7 updated to version 0.7.1 2011-04-02 23:10:02 -04:00
BetaSteward
84c6ab76e0 update to version 0.7 2011-04-01 21:05:43 -04:00
BetaSteward
b1fdc03c4e updated jars 2011-03-31 23:43:11 -04:00
BetaSteward
8287364f77 more optimizations 2011-03-24 00:09:07 -04:00
BetaSteward
35f0767f1b fixed replay + some other fixes 2011-03-18 18:27:01 -04:00
BetaSteward
0668548f4f more AI fixes - dont use x=0 for activated abilities 2011-03-10 22:07:13 -05:00
BetaSteward
42509dd4f8 optimizations + leave game fix 2011-03-10 22:05:15 -05:00
magenoxx
99735b368b New testing frameworks for cards. BurntheImpure test. 2011-03-10 15:27:15 +03:00
BetaSteward
6982608043 more AI fixes 2011-03-07 22:59:55 -05:00
BetaSteward
4f06f78621 UI fixes - can now play simultaneous games 2011-03-04 22:46:56 -05:00
BetaSteward
7e00b5cc25 AI fix - better time out support 2011-03-04 21:54:45 -05:00
magenoxx
734c2fbc2d Updated plugin jars (nullpointerexception still was there) 2011-03-01 09:33:02 +03:00
BetaSteward
a81e6da37c a few more AI tweaks 2011-02-26 00:16:04 -05:00
BetaSteward
bc3acccf2c fixed first turn draw skip 2011-02-26 00:15:15 -05:00
magenoxx
e9c2decd3c Merged X value changes. Some UI fixes. 2011-02-25 20:54:54 +03:00
BetaSteward
51a9c03ed1 additional fixes + some missed files 2011-02-24 22:02:32 -05:00
BetaSteward
1945538041 added X cost options to AI 2011-02-24 22:01:04 -05:00
magenoxx
f1472d1fa4 Merge 2011-02-23 10:59:30 +03:00
BetaSteward
17f87daf5a fixed issue with default AI playing unplayable spells 2011-02-22 21:40:25 -05:00
BetaSteward
47e1a7dd87 fixed issue with X costs 2011-02-22 21:39:24 -05:00
BetaSteward
85e1f68554 another AI fix 2011-02-21 00:20:36 -05:00
magenoxx
9bd5e95bda Test scenario for Earthquake. 2011-02-20 02:10:04 +03:00
magenoxx
98ee9ff0c2 [mad ai] Critical AI fixes. Sync with Steward recent changes. New test command for lifes. New test scenarios. 2011-02-19 16:52:13 +03:00
BetaSteward
659f790325 AI fixes and deck construction 2011-02-18 23:22:31 -05:00
magenoxx
d579248266 updated another plugin (caused classcastexception because of recent targetimpl updates) 2011-02-18 00:32:13 +03:00
magenoxx
c1bf73c4de updated server plugin. 2011-02-18 00:18:38 +03:00
BetaSteward
0c5261ce88 fixed canTarget error and started to convert logging to log4j 2011-02-14 14:41:29 -05:00
BetaSteward
fabcc28e46 more draft/sealed fixes 2011-02-13 08:20:14 -05:00
BetaSteward
d217d332b6 added sorting and counts to deck editor 2011-02-11 22:57:22 -05:00
BetaSteward
f7ffbb4773 added Sealed tournaments 2011-02-10 22:00:47 -05:00
magenoxx
3521b7d89f Added "AI vs AI" test. Removed clientside tests. 2011-02-10 18:38:44 +03:00
BetaSteward
e2fd0299c7 fixed multi-human drafting 2011-02-08 11:34:28 -05:00
magenoxx
f377eee8e0 added jar. 2011-02-07 21:15:53 +03:00
magenoxx
bda75873de Started working on new ai. 2011-02-07 21:14:50 +03:00
BetaSteward
ffc7b5bfd8 added tournaments - drafts are now a variant of tournament 2011-02-06 11:09:25 -05:00
magenoxx
5f4454c1e4 Change version to 0.6.1 2011-02-05 01:34:38 +03:00
BetaSteward
8952c96e1e fixed Swing deadlock 2011-02-04 14:36:30 -05:00
magenoxx
f6b812bce1 Updated to version 0.6. Fixed and updated rate plugin. 2011-01-30 10:42:35 +03:00
magenoxx
76b1d94977 Reuploaded server plugins (caused targeting issue after previous commit). Enhanced Proliferate (now "Done" button is displayed instead of default "Cancel") 2011-01-28 00:30:05 +03:00
magenoxx
a1b2127962 Added options to gameclient target message. 2011-01-27 18:27:41 +03:00
BetaSteward
cb73d4a25d added draft timing 2011-01-12 23:44:04 -05:00
magenoxx
982ee064a6 [draft] now computer chooses 2 or 3 card colors to draft starting from 3d pick. 2011-01-12 09:34:11 +03:00
maurer.it
0f514cc564 Fixes for release bundling. 2011-01-11 22:11:45 -05:00
BetaSteward
f74df18cc9 still more Deck Editor changes 2011-01-11 15:51:57 -05:00
maurer.it
01ef894fa2 merge 2011-01-11 13:49:42 -05:00
maurer.it
0a349e88dd Release configuration for current draft stuff. 2011-01-11 13:49:27 -05:00
magenoxx
41e2342540 [draft] AI picks based on card ratings. Added debug logging for a while. 2011-01-11 20:49:36 +03:00
magenoxx
42f045a7ff init.txt.example back 2011-01-11 02:23:13 +03:00
Loki
acfe8d1804 SOM and misc fixes 2011-01-11 00:02:23 +02:00
BetaSteward
c79758f0e5 added deck construction to draft 2011-01-09 23:33:22 -05:00
BetaSteward
03e3be90d6 draft stuff 2011-01-08 23:54:32 -05:00
BetaSteward
98d8a428a7 some more drafting stuff 2011-01-07 15:41:09 -05:00
BetaSteward
c67122b605 more draft stuff 2011-01-05 15:17:02 -05:00
BetaSteward
7bea472fff initial drafting stuff 2011-01-03 23:52:28 -05:00
magenoxx
40701fca4c init.txt renamed to init.txt.example (to avoid "uncommited changes" mercurial message). Mage still uses "init.txt", now it's just not in source control 2010-12-30 09:16:32 +03:00
maurer.it
ce8477bf2e Fixed config for release assmebly. 2010-12-29 15:35:15 -05:00
maurer.it
88627d5606 merge 2010-12-29 15:14:47 -05:00
BetaSteward
e460b9af20 fixed some match problems 2010-12-29 15:00:18 -05:00
maurer.it
4653a53078 Merge 2010-12-29 13:40:36 -05:00
BetaSteward
4b26727d71 changes to support multi-duel matches and sideboarding 2010-12-28 23:34:06 -05:00
maurer.it
f929d79b24 Fixes issue 19. 2010-12-26 14:06:25 -05:00
BetaSteward
6ae4ac3c5e changes to support matches 2010-12-26 00:34:34 -05:00
magenoxx
d1a8bf399b [core] Conditional effect. Condition interface. Metalcraft condition instance. Refactored SnapsailGlider. 2010-12-24 14:37:13 +03:00
BetaSteward
04ab3e11b6 fixes and new files 2010-12-21 23:26:51 -05:00
BetaSteward
66d3ad1b15 updated poms with new version 2010-12-21 23:25:54 -05:00
magenoxx
85c24cd66b Changed version from 0.5 to 0.5.1 (for release) 2010-12-21 22:34:47 +03:00
magenoxx
2e27a676ed [mage-tests] Added synchronization between steps. Updated bdd classes for step state handling. 2010-12-20 15:01:41 +03:00
magenoxx
1b6722f9b2 Added Mage.Tests project. Update server for test operations. Implemented bdd classes. 2010-12-20 01:03:12 +03:00
magenoxx
ddf1866d6e Removed using bdd tests because of weird behaeve framework. 2010-12-20 00:59:11 +03:00
magenoxx
a3086fb2c4 [tests] Land story for testing playing lands. 2010-12-17 20:17:49 +03:00
magenoxx
7695b92eb1 [tests] Added bdd embedder, steps configure and runner. Added poc for starting games. 2010-12-17 20:17:18 +03:00
magenoxx
2244fc45fe Merge 2010-12-13 09:54:47 +03:00
BetaSteward
d6c30e3734 fixed AI - will now attack if opponent has no defenders 2010-12-13 00:01:35 -05:00
Loki
6ce81d6ed9 Seaside Citadel 2010-12-12 11:09:25 +02:00
BetaSteward
7507a97712 check for server property 2010-12-10 10:49:56 -05:00
BetaSteward
681a030b8e use server ip address as default 2010-12-10 10:12:57 -05:00
BetaSteward
b2d9c3b344 fixes 2010-12-09 04:55:01 +00:00
BetaSteward
139faeb7a5 fixes + adjusted minimax AI 2010-12-07 05:03:35 +00:00
BetaSteward
ba937e4771 fixed issue 47 2010-12-06 04:48:06 +00:00
BetaSteward
4ad22c676d fixed RMI timing issues + other fixes 2010-12-06 04:33:17 +00:00
BetaSteward
2044b00a99 fixed issue 46 2010-12-05 23:55:54 +00:00
BetaSteward
63d1710cb7 fixed issue 36 2010-12-05 03:36:59 +00:00
BetaSteward
632775c617 fixed issue 39 2010-12-05 02:40:13 +00:00
BetaSteward
5d8b5e47f3 updated server plugins 2010-12-04 03:23:12 +00:00
BetaSteward
fad4cc6906 added limited deck validator - will add source code later 2010-12-03 18:17:45 +00:00
Loki
13e7826239 fix double included plugins 2010-12-03 13:06:18 +00:00
BetaSteward
b21e3e9a05 keep server window open if there is an error 2010-12-03 04:40:33 +00:00
BetaSteward
d97286b5d8 fixes 2010-12-03 04:37:09 +00:00
BetaSteward
81c080fe5f changed startup scripts to match artifact ids 2010-12-02 16:47:42 +00:00
Loki
592ba955f0 cleaning pom.xml, version bump to 0.5 2010-12-02 09:14:18 +00:00
BetaSteward
53d7e5623b send list of targets to client 2010-12-02 04:39:18 +00:00
BetaSteward
3ca748e16d fixed issue 25 - server waits for all clients to confirm initialization before starting game 2010-11-30 04:35:26 +00:00
BetaSteward
9c3ff863e8 fix for issue 22 + fix for planeswalker damage redirection 2010-11-28 04:31:48 +00:00
BetaSteward
8f45bc1717 more fixes 2010-11-27 05:23:35 +00:00
BetaSteward
428609ab8b fixes for issues 18, 19, 20, 21 + more fixes 2010-11-25 03:15:35 +00:00
Loki
7d9d2bc744 add assembly support for Mage.Server 2010-11-23 21:23:16 +00:00
Loki
5b10b13299 more cleaning 2010-11-23 21:07:06 +00:00
Loki
05ddef3629 more cleaning 2010-11-23 21:06:42 +00:00
Loki
e803d488db more cleaning 2010-11-23 21:06:19 +00:00
magenoxx
02114cb6e3 changed schema path for maven-jaxb2-plugin (possibly can be removed at all because of default path) 2010-11-23 18:07:50 +00:00
magenoxx
0afe7572f4 moved xml-resources to src/main/java 2010-11-23 18:05:55 +00:00
magenoxx
0f321af7f1 move code from Mage.Server/src to Mage.Server/src/main/java 2010-11-23 17:59:24 +00:00
BetaSteward
0cd0b7045a lots of fixes - mainly to continuous effects and zone changes 2010-11-23 05:08:45 +00:00
magenoxx
b1858396a5 Fixed NullPointerException in case card wasn't found by name. Fixed CardGrid (didn't removed mage card if card plugin was used) 2010-11-22 16:45:26 +00:00
BetaSteward
20826e850c fixed EldraziSpawnToken and added ability selector for sacrifice only abilities 2010-11-20 03:51:30 +00:00
magenoxx
c0139976bf [card.plugin] Copied tooltips from Mage.Client\Card. Moved TextPopup to Mage.Common. Need to rebuild mage-card-plugin.jar if you use it. 2010-11-19 16:19:11 +00:00
magenoxx
2cb1136a52 Updated Theme plugin interface and implementation (still in progress). 2010-11-16 18:32:49 +00:00
BetaSteward
a2561515a3 fixes 2010-11-14 04:23:52 +00:00
BetaSteward
d787bd70db clean up - removed Planechase and old server plugins 2010-11-14 04:18:50 +00:00
magenoxx
e4c01b0693 Small fixes: returned text component in card plugin for rules. Removed debug logging. Fixed NullPointerException for attached cards. 2010-11-13 06:47:50 +00:00
BetaSteward
c61881e5df fixes 2010-11-12 04:19:11 +00:00
BetaSteward
5acf46bb60 updated sets and added booster packs - commented out planechase set 2010-11-11 04:38:36 +00:00
BetaSteward
1ed7b3f486 fixes and new server plugins 2010-11-07 03:11:36 +00:00
magenoxx
ad50277430 ... 2010-11-05 15:53:24 +00:00
magenoxx
3333edcd37 fixed versions in poms. 2010-11-01 13:58:07 +00:00
magenoxx
1d1ce3b55d No need to install jar to local repository anymore. jar has system scope in dependencies now. 2010-11-01 10:44:47 +00:00
BetaSteward
93120eedea fixed some timing errors 2010-10-29 01:59:45 +00:00
magenoxx
875614b96c Added multitarget arrows (Fireball). 2010-10-28 11:52:54 +00:00
magenoxx
b0e4549959 Reverted r270 changes for all pom files. Added some files to svn:ignore. 2010-10-28 09:16:36 +00:00
BetaSteward
3a784f59ee ... 2010-10-28 03:19:26 +00:00
Loki
66e7a3beae fixes 2010-10-26 14:08:29 +00:00
Loki
784eb17456 removing all nb stuff 2010-10-26 09:03:18 +00:00
magenoxx
a60d7d383b changed maven artifactIds for all projects : now starts with capital letter 2010-10-24 09:56:15 +00:00
magenoxx
c82d3c6dd9 Mage.Server/config/init.txt for adding cards to any zone in testMode. Fix for icon being null. Temporary fix for expansionSetCode being null for BasicLands. 2010-10-22 07:08:41 +00:00
magenoxx
17f2e7dab5 Added maven project object models (pom) to all projects with the root pom that coordinates build order. Added target directories to svn ignore list. 2010-10-22 07:03:17 +00:00
BetaSteward
40a7ab9a4f ... 2010-10-06 02:05:54 +00:00
BetaSteward
e0b4388361 ... 2010-09-25 20:35:23 +00:00
BetaSteward
3fa0e8b8f4 ... 2010-09-01 03:01:43 +00:00
BetaSteward
ac69e684ad ... 2010-06-29 01:23:14 +00:00
BetaSteward
79dbfca2ff changes to support multiplayer 2010-05-17 03:19:39 +00:00
BetaSteward
4896421f17 ... 2010-05-04 02:49:07 +00:00
BetaSteward
e10b1be9c4 ... 2010-05-04 02:13:07 +00:00
BetaSteward
16b1cf42ae ... 2010-05-04 02:11:22 +00:00
BetaSteward
2f32d2e6cf ... 2010-05-02 15:14:36 +00:00
BetaSteward
01d5a3cbed ... 2010-05-02 15:13:44 +00:00
BetaSteward
4326bc4ddf Initial 2010-04-16 03:52:58 +00:00
BetaSteward
69e3a8c49c latest 2010-04-16 03:52:30 +00:00
BetaSteward
9013591805 latest 2010-04-16 03:51:49 +00:00
BetaSteward
a9a0075768 latest 2010-04-11 22:28:51 +00:00
BetaSteward
efdceacaf6 latest 2010-04-11 22:16:51 +00:00
BetaSteward
b32e1e1b9a latest 2010-04-11 22:13:22 +00:00
BetaSteward
de6a672d24 ... 2010-03-27 02:15:55 +00:00
BetaSteward
2e7e87d90b ... 2010-03-22 01:33:36 +00:00
BetaSteward
dd4bd8b0e1 ... 2010-03-22 01:18:07 +00:00
BetaSteward
22f00ff54f ... 2010-03-22 01:04:33 +00:00
BetaSteward
79dc6aeaff ... 2010-03-22 01:03:17 +00:00
BetaSteward
4b4123742e ... 2010-03-21 04:05:33 +00:00
BetaSteward
41d9cb30de ... 2010-03-21 03:54:48 +00:00
BetaSteward
70b4b76353 ... 2010-03-20 17:41:41 +00:00
BetaSteward
bc1f171500 ... 2010-03-20 17:39:52 +00:00
BetaSteward
5eee0c6de7 Initial 2010-03-20 03:44:53 +00:00