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
7610 commits 2 branches 0 tags 782 MiB
Commit graph

615 commits

Author SHA1 Message Date
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
magenoxx
8ba88ff5f2 config changes 2012-06-29 17:19:12 +04:00
magenoxx
5541fe4163 updated version from 0.8.6.r5 to 0.8.7 2012-06-29 14:56:13 +04:00
magenoxx
354b07d50e Draft bot - only draft picks, will be auto eliminated and doesn't participate in tournament 2012-06-28 19:32:32 +04:00
magenoxx
b5032226f4 Showing already chosen cards in choice dialog 2012-06-27 18:44:03 +04:00
magenoxx
f44ceee263 NPE fix 2012-06-27 15:06:30 +04:00
magenoxx
7d4aaec015 Card names, types file based caching 2012-06-25 14:31:28 +04:00
magenoxx
29de517736 updated plugin jars 2012-06-20 11:19:25 +04:00
North
239a4fb100 [refactoring][minor] Replaced all tabs with four spaces. 2012-06-19 23:50:20 +03:00
magenoxx
0a12e0af7e Updated server plugin jars 2012-06-17 13:12:01 +04:00
Loki
29f117fba2 update revision to r5 2012-06-14 21:10:50 +03:00
magenoxx
5be6f78d59 Adding writting amount of mana payed for {X} cost 2012-06-12 10:38:39 +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
4e0a5c65e3 Fixed AI attacking not causing attack triggers 2012-05-29 09:09:38 +04:00
magenoxx
51ff877f8d Commented out saving game (not used) 2012-05-28 16:18:44 +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
bebd9644be updated jars 2012-05-25 19:23:25 +04:00
magenoxx
12b21abe52 changed version from 0.8.5 to 0.8.6 2012-05-25 19:04:40 +04:00
magenoxx
87c111a253 [AVR] 5 cards. Various fixes. 2012-05-08 18:41:39 +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
95e4ef4ff8 [mad ai] removed dynamic aggression calculation for now. doesn't work correctly 2012-05-06 23:40:38 +03:00
Loki
ee73ac75eb npe fix appearing on server 2012-05-06 23:40:37 +03:00
Loki
a746ca680b [load] one place server ping 2012-05-06 23:40:37 +03:00
Loki
e62f06cc54 two minute timeout 2012-05-06 23:40:36 +03:00
Loki
231582f039 optimizations 2012-05-06 23:40:34 +03:00
magenoxx
18f8fa17ad starting server at 0.0.0.0 2012-05-04 11:05:37 +04:00
magenoxx
8a0117359f added startServerWin7.bat like it was for client 2012-05-03 18:24:50 +04:00
magenoxx
0f950dbc50 [AVR] Miracle keyword 2012-05-01 23:59:36 +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
d10385fad2 changed "already connected" state handling 2012-04-28 03:00:11 +04:00
magenoxx
11df72593c changed version from 0.8.4.dev to 0.8.4 2012-04-27 18:09:19 +04:00
magenoxx
deb6533bd8 [mad ai] emulating block declaration. safe block. (in progress) 2012-03-26 22:04:31 +04:00
BetaSteward
e859e142fa 2 DKA 2012-03-26 08:55:30 -04:00
magenoxx
523481b5a2 Added additional parameter for effect outcome. Updated choosing permanents for AI. 2012-03-26 10:59:04 +04:00
magenoxx
3875c1f7c0 Changed component version from 0.8.3 to 0.8.4 (dev) 2012-03-25 12:16:46 +04:00
magenoxx
f5acfcc58a [mad ai] migrating to static attack\block algorithm 2012-03-15 20:37:02 +04:00
BetaSteward
68391a7522 fixed some NPE's and other errors 2012-02-23 15:26:57 -05:00
BetaSteward
48f5a469d4 fixes for monte carlo ai 2012-02-13 09:05:01 -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
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
BetaSteward
e6d38e6558 updated jars 2012-02-02 23:28:34 -05:00
magenoxx
b52a0f1c2c Displaying server uptime message at the last (otherwise it is hard to inform players about anything). 2012-01-30 20:33:22 +04:00
magenoxx
803947e053 Fixed capital letters in startup scripts. 2012-01-28 22:23:21 +04:00
BetaSteward
d641a6de72 update MCTS + removed from config.xml 2012-01-27 21:40:33 -05:00
magenoxx
3434dc1a97 Added User Feedback support. 2012-01-26 22:13:44 +04:00
magenoxx
e50de69420 compilation error fix. 2012-01-26 01:59:53 +04:00
magenoxx
6defeeed1f minor change 2012-01-26 01:53:44 +04:00
magenoxx
b9a65e7c62 MageServerImpl refactoring. More event logging. 2012-01-26 01:50:08 +04:00
magenoxx
a60c61cb00 More actions got logging. Some refactoring to use ActionWithResult. 2012-01-26 00:40:00 +04:00
magenoxx
b0a1c07067 LogService. Added saving game started event to DB. Some refactoring. 2012-01-25 20:27:08 +04:00
magenoxx
bdb2754847 Added sending broadcast message to all users on server from Admin Console. 2012-01-25 19:13:27 +04:00
BetaSteward
436a8ea440 Merge branch 'master' of ssh://109.200.159.85/var/lib/git/mage 2012-01-24 22:52:38 -05:00
BetaSteward
7fce6c552d fixes + optimizations + updates to monte carlo ai 2012-01-24 22:51:31 -05:00
magenoxx
e901343aad Changed version exception message. Added logging about version difference on registering (for stats). 2012-01-24 12:17:50 +04:00
magenoxx
0e3a368d66 test commit 2012-01-20 01:13:50 +04:00
magenoxx
ffd6deeabe test commit 2012-01-20 01:12:36 +04:00
magenoxx
df44d5b666 test commit 2012-01-20 00:22:54 +04:00
magenoxx
0a8de07828 [config] updated init.txt.example 2012-01-19 02:53:17 +04:00
BetaSteward
377dd54fca single-threaded monte carlo + some fixes 2012-01-16 18:55:35 -05:00
BetaSteward
dfffdfcf8c latest monte carlo ai - has a memory leak 2012-01-10 21:29:53 -05:00
BetaSteward
7df6bb8db6 add step name to message 2012-01-10 21:09:11 -05:00
magenoxx
569d2c240a Fixed Issue 424. 
Number of poison counters not updated when winning the game with an attack.
 2011-12-30 17:27:40 +04:00
Loki
d0b82cb1b0 fix char case 2011-12-27 00:40:28 +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
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
af05af7050 Fixed Issue 441. 2011-12-11 15:53:34 +04:00
magenoxx
21852af144 updated server plugins jars 2011-12-09 13:30:18 +04:00
magenoxx
ba6508cbeb Updated component version from 0.8.1 to 0.8.2. 2011-12-09 13:15:07 +04:00
BetaSteward
d7e694713c added jar 2011-12-01 14:52:09 -05:00
BetaSteward
4651d68f95 fixed infinite loop with certain cards 2011-11-23 09:54:18 -05:00
BetaSteward
c902998fa0 fixed monte carlo NPE's 2011-11-22 13:56:00 -05:00
BetaSteward
ec297c243c fixed shuffle event 2011-11-22 10:59:53 -05:00
magenoxx
58b959ff65 Fixes in MAD ai. 2011-11-16 10:44:55 +04:00
magenoxx
d89131e63c Updated server messages. 2011-11-15 16:01:43 +04:00
magenoxx
38e5ae1f03 Fixed init.txt not working for hand zone. 2011-11-05 12:38:54 +03:00
magenoxx
0a300cf610 fixed wrong artifactIds used in pom.xml 2011-11-05 11:42:28 +03:00
BetaSteward
c508f07910 added monte carlo AI - still needs some work 2011-11-04 23:02:32 -04:00
BetaSteward
a1f1ed44c0 adjustment to GameState.getValue 2011-11-04 22:57:50 -04:00
BetaSteward
7c69bc6f30 fixes + optimizations + allow games to be paused and resumed 2011-11-02 21:39:03 -04:00
BetaSteward
8fd03a5bb5 disable timeout if game contains any non-human players 2011-11-02 21:18:25 -04:00
Loki
a004ced17d artifactId to lowercase 2011-10-28 15:42:54 +04:00
magenoxx
416e8cd30b added memory settings to scripts. fixed .command script for server. 2011-10-28 14:38:25 +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
BetaSteward
7ab5649132 some server optimizations 2011-10-27 11:20:10 -04:00
magenoxx
e97d655bd1 Fixed Issue 339. 2011-10-27 12:28:36 +04:00
BetaSteward
517a0cae26 optimizations + some fixes - mostly for monte carlo simulations 2011-10-25 15:17:42 -04:00
magenoxx
8983a26e5b Some server NPE fixes 2011-10-24 20:48:58 +04:00
maurer.it
53d47c3228 Doh, don't need this test.dck in here. 2011-10-21 08:08:42 -04:00
maurer.it
d652ad2417 Puts the fixed ai built jar into the server's plugin path for local testing. 2011-10-21 08:08:01 -04:00
BetaSteward
ca6e1556f0 fixed several NPEs on server 2011-10-20 12:49:31 -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
magenoxx
6933c5a9f3 Added the possibility to force AI to play cards in cheat mode. 2011-10-19 19:13:51 +04:00
Loki
778b0dc15f fix libs path for launch4j 2011-10-16 22:34:37 +03: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
magenoxx
8a668c4880 server message fix 2011-10-16 18:05:41 +04:00
magenoxx
538dd696ad Server statistics - server uptime in hours, games played count. 2011-10-13 17:50:29 +04:00
magenoxx
a81dde0cdb Some more fixed in choosing targets. 2011-10-12 20:03:34 +04:00
magenoxx
3cadbeb68b Some fixes for targeting (this bug caused game freezes). 2011-10-12 19:39:58 +04:00
BetaSteward
f2c44688d0 fixed issue 93 2011-10-09 14:27:38 -04:00
magenoxx
82dcb53cb9 Target refactoring. Fixed Issue 273. 2011-10-08 12:46:34 +04:00
magenoxx
b3ac9c2f87 Fixed Issue 271 2011-10-05 00:56:11 +04:00
Loki
ab3a09181c fix running client and server from bat files 2011-09-26 19:30:22 +03:00
magenoxx
fc275e7e5e updated message for picking triggered abilities 2011-09-22 19:31:30 +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
North
3ff462e20b Modified ExaltedAbility to use fixed target 2011-09-21 23:11:31 +03:00
magenoxx
5978d57298 Custom avatar for "Rahan" 2011-09-21 13:46:04 +04:00
BetaSteward
16aa9ad3da Merge 2011-09-19 15:03:51 -04:00
BetaSteward
4b8d7b2649 NPH - Praetors Grasp 2011-09-19 14:51:10 -04:00
Loki
19f0a6b7b0 move Mage-Server and Mage-Client jars to lib 2011-09-19 20:58:03 +03: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
BetaSteward
8c011aeb36 fixed invalid deck messages + added some banned/restricted cards 2011-09-12 22:10:59 -04:00
BetaSteward
798eb7813b fixed issue 247 2011-09-12 21:20:18 -04:00
BetaSteward
ad4b4e82c2 fixed various NPEs 2011-09-12 21:15:54 -04:00
BetaSteward
2c5463d5eb fixed client not disconnected if error occurred during callback 2011-09-11 22:19:26 -04:00
magenoxx
444341dee9 custom avatar for "Alive" 2011-09-10 11:17:18 +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
bf1a49dd0b Sending user data. Sending avatar to server on connect. 2011-09-07 21:18:58 +04:00
BetaSteward
f5c3494723 improved replays - can now skip forward 10 moves or let the client play through the moves 2011-09-05 22:12:36 -04:00
BetaSteward
fe79ee97a9 update deck every 5 seconds while constructing or sideboarding 2011-09-04 13:23:16 -04:00
BetaSteward
ea44fc973f added timeout on sideboard + show construct and/or sideboard on reconnect 2011-09-03 21:44:05 -04:00
magenoxx
c9a3f112b7 Fixed Issue 239. 2011-09-03 11:47:33 +04:00
magenoxx
75c04f49d1 Forgot to change version in the code. 2011-09-02 08:44:03 +04:00