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

2842 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
7eb0b19cac added back removed cards - still getting the hang of git 2012-02-02 23:45:06 -05:00
BetaSteward
c2da5df068 Merge branch 'master' of ssh://109.200.159.85/var/lib/git/mage 
Conflicts:
	Mage.Server/plugins/mage-player-ai-ma.jar
	Mage.Server/plugins/mage-player-ai.jar
	Mage.Server/plugins/mage-player-aimcts.jar
	Mage.Server/plugins/mage-player-aiminimax.jar
	Mage.Server/plugins/mage-player-human.jar
	Mage.Tests/plugins/mage-player-ai-ma.jar
	Mage.Tests/plugins/mage-player-ai.jar
 2012-02-02 23:40:49 -05:00
BetaSteward
e6d38e6558 updated jars 2012-02-02 23:28:34 -05:00
BetaSteward
dda11116fc added legendary supertype 2012-02-02 23:28:12 -05:00
BetaSteward
1d32f49fd0 modified triggered abilities, continuous effects and zones 2012-02-02 23:27:23 -05:00
BetaSteward
fe0c5e48e9 cache already rated cards if not drafting or constructing 2012-02-02 23:01:56 -05:00
magenoxx
0ef737fe20 Fixed a critical bug that caused game freezes. Updated plugin jars. 2012-02-02 20:08:47 +04:00
magenoxx
f94c529410 forgot to update mage-version in root pom (from 0.8.2 to 0.8.3) 2012-02-02 19:55:22 +04:00
North
e623249791 updated mtg-cards-data.txt 2012-02-02 13:51:14 +02:00
Loki
16458ba31e Merge branch 'master' of ssh://git.magefree.com/var/lib/git/mage 2012-02-02 11:46:20 +04:00
Loki
d8284c8196 [DKA] Executioner's Hood, Forge Devil 2012-02-02 11:45:59 +04:00
North
92873a1b5b [GathererCrawler][minor] changed back a file from my previous commit (change was meant only for local testing) 2012-02-02 07:55:04 +02:00
North
a014ca5c1d Merge branch 'master' of ssh://git.magefree.com/var/lib/git/mage.git 2012-02-02 00:15:22 +02:00
North
141044382c [GathererCrawler] updated function that outputs util file to support flip, split and double faced cards 
updated mtg-cards-data.txt (was mising second face data for double faced cards)
 2012-02-02 00:14:36 +02:00
magenoxx
e84b21c95b [DKA] Chant of the Skifsang 2012-02-02 01:53:41 +04:00
magenoxx
e7e3c4c2f4 changed version from 0.8.2 to 0.8.3.dev 2012-02-02 00:49:02 +04:00
North
38af41872d [DKA] 15 cards 2012-01-30 23:04:47 +02:00
North
d863e957fc Merge branch 'master' of ssh://git.magefree.com/var/lib/git/mage.git 2012-01-30 22:06:48 +02:00
North
053c630b3c fixed NPE for LookLibraryControllerEffect 2012-01-30 22:05:47 +02:00
magenoxx
ca0fcbad58 Fixed bug with the email value not sent to server ;(( 2012-01-30 20:34:14 +04: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
db42295314 Updated server-list in admin console. 2012-01-30 20:32:26 +04:00
Loki
f793664aba remove invalid autogenerated card 2012-01-30 12:13:11 +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
North
1bc4805306 Generated Urza's Saga Simple Cards and Extended Cards. 2012-01-29 15:25:40 +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
49c403da0e Fixed static text. 2012-01-28 11:04:41 +04:00
BetaSteward
d641a6de72 update MCTS + removed from config.xml 2012-01-27 21:40:33 -05:00
BetaSteward
f7354dc69c Merge branch 'master' of ssh://109.200.159.85/var/lib/git/mage 2012-01-27 21:37:07 -05:00
BetaSteward
1b965f358b Urza's Saga - courtesy of Backfir3 2012-01-27 21:36:36 -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
039d9663f0 ActionWithResult interface, ActionWithBooleanResult. 2012-01-26 00:38:45 +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
magenoxx
8536d9d78d minor change in EntityManager 2012-01-25 18:09:42 +04:00
magenoxx
fd25002578 SQLite EntityManager 2012-01-25 14:26:37 +04:00
magenoxx
9a5eca433d updated install maven files 2012-01-25 14:25:08 +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