Gavin Bisesi
1139c73dd9
Merge pull request #53 from mattkelly/userman-linux-fix
...
Fix Linux and BSD section formatting
2014-06-10 10:36:45 -04:00
Gavin Bisesi
e938c54926
Merge pull request #59 from VanNostrand/rng
...
RNG Update
2014-06-10 10:34:25 -04:00
Mark Morschhäuser
ccab97ca7d
RNG: added additional checks (which forced an interface redesign), updated comments
2014-06-09 13:31:21 +02:00
Mark Morschhäuser
197dd0f3c8
Remove useless bound checks.
2014-05-30 11:48:07 +02:00
Mark Morschhäuser
bf6ec478cb
Dealt with SFMT compile warnings.
2014-05-18 11:10:29 +02:00
Mark Morschhäuser
69201460e6
Included climits for UINT_MAX non-aware compilers.
2014-05-18 10:54:41 +02:00
Gavin Bisesi
02c2b29701
Merge pull request #63 from mattkelly/tab-changephase
...
Add Tab shortcut for next phase
2014-05-17 18:09:35 -04:00
Mark Morschhäuser
f964dcc656
Added additional bound checks.
2014-03-20 15:37:21 +01:00
Mark Morschhäuser
fbf54b62bc
Test if macro already exists to shutup warning.
2014-03-18 20:41:39 +01:00
Matt Kelly
082ab73152
Add Tab shortcut for next phase
2014-03-13 01:08:49 -04:00
Mark Morschhäuser
4eb845d438
Throw exception if RNG is used with invalid bounds.
2014-03-11 09:41:37 +01:00
Mark Morschhäuser
9a20e5e2e2
Commented a pitfall in case of RNG replacement.
2014-03-11 08:18:54 +01:00
Mark Morschhäuser
800f7e6373
Use distribution function with rejection sampling.
2014-03-10 14:13:46 +01:00
Mark Morschhäuser
424513eb90
Forgot to add lower bound in RNG generation.
2014-03-08 17:45:59 +01:00
Mark Morschhäuser
a15eb6f29f
Updated SFMT RNG code, removed Qt RNG
2014-03-08 17:08:40 +01:00
Gavin Bisesi
ed5f02bf7a
Merge pull request #52 from mattkelly/whitespace
...
Convert rest of source to 4-space indent
2014-02-21 20:53:18 -05:00
Gavin Bisesi
02d5fc64be
Merge pull request #54 from mattkelly/pthread-fix
...
Fix pthread compile errors on Linux
2014-02-21 20:49:17 -05:00
Matt Kelly
b93317cc17
OS X still works with pthread fix - added explanation
2014-02-14 14:14:10 -05:00
Matt Kelly
e366bd7a71
Fixed for Linux - pushing to test on OS X
2014-02-14 13:58:54 -05:00
Matt Kelly
7269d0a1b7
Merge branch 'userman-linux-fix' of https://github.com/mattkelly/Cockatrice into userman-linux-fix
2014-02-14 13:38:34 -05:00
Matt Kelly
cc08893c12
Fix another typo in Usermanual
2014-02-14 13:38:06 -05:00
Matt Kelly
5e2d3a2f3e
Additional typo and formatting fixes
...
For example, fixed the card type table which wasn't showing as a table.
2014-02-13 12:59:04 -05:00
Matt Kelly
e003114ce3
Fix Linux and BSD section formatting
2014-02-13 11:56:36 -05:00
Matt Kelly
1bc48a7849
Convert rest of source to 4-space indent
2014-02-11 11:14:19 -05:00
Gavin Bisesi
cf26ecb8a1
Merge pull request #51 from mattkelly/master
...
Resolve all compiler warnings
2014-02-11 11:00:34 -05:00
Matt Kelly
a171df744d
Convert to 4-space indents
2014-02-11 10:47:51 -05:00
Matt Kelly
ac8c967d10
Remove compiler warnings from TODO
2014-02-11 01:53:04 -05:00
Matt Kelly
96ec49936e
Resolve all compiler warnings
2014-02-11 01:52:06 -05:00
Gavin Bisesi
44e83e91c6
Merge pull request #43 from VanNostrand/doc2
...
Improved Linux/BSD section in the usermanual.
2014-01-24 06:53:12 -08:00
Mark Morschhäuser
91138b7e84
Improved Linux/BSD section in the usermanual.
2014-01-24 14:00:29 +01:00
Gavin Bisesi
7ee396503b
Merge pull request #36 from arxanas/master
...
Fix #34
2014-01-21 14:16:04 -08:00
arxanas
629668d7c0
Fix #34
...
This is @mcallahan's patch — see #35 . I had to apply this diff by hand,
because both `git` and `patch` refused to apply it and I didn't know
how to resolve that. Consequently, there might be an error.
2014-01-17 20:30:06 -05:00
Daenyth
0da2647a7b
Merge pull request #26 from jfreake/master
...
Deck Load Mods and Movable Tabs
2014-01-08 09:01:31 -08:00
jfreake
504a56cf95
Right aligned the regex check
...
decklist - Right aligned the regex check
2014-01-08 12:55:44 -04:00
jfreake
67c4d089be
Deck Load Mods and Movable Tabs
...
Changes:
Deck Load - Default to all types *.*
Decklist - Strip "|edition" from .dec formats that include a pipe and
the edition after the card name
Tab_Supervisor - Make tabs movable (able to rearrange tabs)
2014-01-08 11:54:02 -04:00
Daenyth
95c6058dc3
Merge pull request #25 from dreamcwli/master
...
Repeatly download text spoiler until a valid XML document is received
2013-12-17 08:08:25 -08:00
Chia-Wei Li
01277e9ad9
Repeatly download text spoiler until a valid XML document is received
2013-12-17 19:16:00 +08:00
Daenyth
611d61e48b
Merge pull request #24 from arxanas/master
...
Added setting to enable/disable notifications
2013-12-10 12:25:58 -08:00
arxanas
b1af4237e7
Added setting to enable/disable notifications
...
When something happens, the taskbar icon lights up/the dock icon
bounces. This can be annoying, so here is a setting to disable that.
2013-12-06 21:04:00 -05:00
Daenyth
f699cd4b0f
Merge pull request #23 from taw/master
...
Made Ctrl-V importer work more robust.
2013-11-12 09:49:24 -08:00
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
