Tomasz Wegrzanowski
b57d628278
Made Ctrl-V importer work more robust.
2013-11-12 11:46:38 +00:00
Daenyth
92ff503832
Merge pull request #7 from skoh-fley/play-to-stack-option
...
Added a UI option to play all nonlands to the stack instead of the battlefield
2013-07-11 10:58:55 -07:00
Daenyth
db43a0609b
Merge branch 'master' of github.com:Daenyth/Cockatrice
2013-07-11 13:51:18 -04:00
Frederik Holden
c0fdbb2cca
Fix two bugs in the price tag feature
...
"The price tag feature currently has two bugs.
1. The final price that a card ends up with is the one in the last set
alphabetically, instead of the one from the set with the lowest price.
2. Black Lotus Project sometimes gets in prices for cards from Masters
Edition, for some reason. This set only exists in Magic the Gathering:
Online, i.e., not physically, and should not be considered. This might
be considered a BLP bug and not a Cockatrice bug.
This patch fixes those two bugs. I also changed the price value to be
based on BLP's "price" value instead of the "average" value. Seems more
logical."
Signed-off-by: Daenyth <Daenyth+git@gmail.com>
2013-07-11 13:50:31 -04:00
Daenyth
2dd5080294
Merge pull request #20 from solygen/master
...
some markdown
2013-05-23 06:33:17 -07:00
Frank Paczynski
7733f3014f
added USERMANUAL markdown based on USERMANUAL.tex
2013-05-23 13:37:11 +02:00
Frank Paczynski
8b742e6f4b
SHORTCUTS to markdown
2013-05-23 13:30:20 +02:00
Frank Paczynski
482ae82007
ADD_SETS to markdown
2013-05-23 13:23:48 +02:00
Frank Paczynski
81a8151ada
FAQ to markdown
2013-05-23 13:21:49 +02:00
Frank Paczynski
a657aa403c
TODO to markdown
2013-05-23 13:13:32 +02:00
Daenyth
6d69fe728a
Merge pull request #19 from VanNostrand/documentation
...
Documentation-Branch v2
2013-05-15 13:13:35 -07:00
Mark Morschhäuser
69fe801034
Changed Arch Linux to Arch Linux (AUR).
2013-05-15 22:10:06 +02:00
Mark Morschhäuser
562de0553f
Fixed compile warnings due to missing \n at EOF.
2013-05-15 21:31:47 +02:00
Mark Morschhäuser
187fa23fef
Improved/added Linux/BSD compilation documentation.
2013-05-15 21:30:48 +02:00
Daenyth
8ba6424e0d
Merge pull request #17 from VanNostrand/compilewarnings
...
Compilewarnings
2013-05-11 11:34:27 -07:00
Mark Morschhäuser
8484de4277
Added TODO list
2013-05-11 18:48:01 +02:00
Mark Morschhäuser
0022425687
Fixed implicit conversions from double to int warnings regarding
...
QPainter.drawRect()
2013-05-11 17:41:11 +02:00
Daenyth
d462870ea2
Merge pull request #16 from VanNostrand/smallfix
...
Changed sets.xml URL due to w32-qt ssl problem
2013-05-09 11:08:10 -07:00
Mark Morschhäuser
314db1f464
Changed sets.xml URL due to w32-qt ssl problem
2013-05-09 19:53:13 +02:00
Mark Morschhäuser
cf70843d0b
Merge branch 'master' into smallfix
2013-05-09 19:46:24 +02:00
Daenyth
a1bdece3e8
Merge pull request #15 from VanNostrand/nsis
...
Add usermanual.pdf to startmenu if created.
2013-05-09 04:10:20 -07:00
Mark Morschhäuser
382394b54c
Add usermanual.pdf to startmenu if created.
2013-05-09 08:17:11 +02:00
Daenyth
a5ee926862
Merge pull request #14 from VanNostrand/smallfix
...
Changed default server to woogerworks
2013-05-08 15:53:00 -07:00
Mark Morschhäuser
f801f4f64d
Changed default server to woogerworks
2013-05-08 23:56:09 +02:00
Daenyth
c31a9526e3
Merge pull request #13 from VanNostrand/nsis
...
NSIS updates
2013-05-08 11:56:51 -07:00
Mark Morschhäuser
66f4041cb3
Updated usermanual to installer changes.
2013-05-08 20:48:05 +02:00
Mark Morschhäuser
90b64a257f
Installer shows GPL, appends git hash, uses solid lzma now.
2013-05-08 20:46:57 +02:00
Mark Morschhäuser
204f457e2b
Updated COPYING (GPLv2) with GPLv2 from GNU.org (trivial)
2013-05-08 20:45:38 +02:00
Mark Morschhäuser
284d2a8615
Merge branch 'documentation'
2013-05-08 15:09:37 +02:00
Daenyth
e449520a3e
Merge pull request #12 from VanNostrand/documentation
...
Documentation
2013-05-08 06:02:41 -07:00
Mark Morschhäuser
6bf0045967
Installer: added usermanual, use default paths, add timestamp to exe.
2013-05-08 13:42:50 +02:00
Mark Morschhäuser
91366a6f43
Fixed the Windows howto, it uses the official nsis script now.
2013-05-08 13:41:43 +02:00
Mark Morschhäuser
a176cf0940
Moved the CentOS6 Howto into the usermanual.
2013-05-08 11:26:51 +02:00
Mark Morschhäuser
1a63fa233e
Added a Windows compilation howto.
2013-05-08 10:53:56 +02:00
Mark Morschhäuser
6e85f15688
Added some linebreaks.
2013-05-08 09:35:42 +02:00
Mark Morschhäuser
9284a9e40f
Merge branch 'documentation'
2013-05-07 22:58:10 +02:00
Daenyth
1c10c27217
Merge pull request #10 from VanNostrand/documentation
...
Added Dragon's Maze to sets.xml
2013-05-07 09:11:05 -07:00
Mark Morschhäuser
dd4ffc0f8a
Added Dragon's Maze to sets.xml
2013-05-07 12:07:23 +02:00
Mark Morschhäuser
8359b5a451
Merge branch 'oracle-fixes'
2013-04-21 19:20:22 +02:00
Daenyth
7ce8a93767
Merge pull request #8 from VanNostrand/oracle-fixes
...
Oracle fixes
2013-04-21 10:17:44 -07:00
Daenyth
78e8ea230f
Merge pull request #9 from VanNostrand/documentation
...
Documentation-Branch v2
2013-04-21 10:17:28 -07:00
Mark Morschhäuser
f53fff9a7b
create_sets_xml.sh now creates the correct header for sets.xml.
2013-04-21 18:31:23 +02:00
Mark Morschhäuser
9dd5697213
Restored picture/set url entries from 2011-01-26.
2013-04-21 18:22:11 +02:00
Mark Morschhäuser
8bd247e681
Fixed spoiler list parsing, oracle works again.
2013-04-21 17:31:07 +02:00
Mark Morschhäuser
b179f446f5
Get sets.xml directly from github.
2013-04-21 17:30:08 +02:00
Mark Morschhäuser
bd861bbff1
Removed two unused variables.
2013-04-21 15:53:27 +02:00
skoh-fley
03852f0409
To-be permanents on the stack now enter the battlefield when double-clicked
2013-04-17 08:23:31 -07:00
skoh-fley
2727781c0e
Added a UI option to always play nonlands onto the stack
...
Previously this behavior only occured for instants and sorceries
Woops, missed a file
Missed some parentheses
2013-04-17 08:23:12 -07:00
Daenyth
1accaffb70
Merge pull request #6 from skoh-fley/cursorhandclenchbug
...
Fixed a cursor bug
2013-04-16 19:59:53 -07:00
skoh-fley
69e6c9ac69
Fixed a cursor bugo
...
Click-holding on a card then immediately releasing now properly changes the
cursor from a closed hand back to an open hand
2013-04-16 18:12:48 -07:00
