 Gavin Bisesi
|
1260ccc531
|
Merge pull request #111 from Daenyth/better-invalid-db-ux
Don't be a jerk when card database isn't usable.
|
2014-06-22 15:28:45 -04:00 |
|
|
Gavin Bisesi
|
ab3b3f3bae
|
Merge pull request #106 from VanNostrand/doc
Added Mac OS X build instructions.
|
2014-06-22 07:53:58 -04:00 |
|
|
Gavin Bisesi
|
c3ad6b1f69
|
Merge pull request #85 from ctrlaltca/mtgjson-importer
Mtgjson importer (fixes #84)
|
2014-06-21 08:13:11 -04:00 |
|
|
Gavin Bisesi
|
032c41f3d5
|
Merge pull request #93 from VanNostrand/doc
Updated Windows build howto.
|
2014-06-20 07:53:12 -04:00 |
|
|
Gavin Bisesi
|
da4c25597e
|
Merge pull request #61 from VanNostrand/win32
Windows MSVC support
|
2014-06-19 22:56:18 -04:00 |
|
|
Gavin Bisesi
|
552a8e0c23
|
Merge pull request #89 from dylan/master
Added new app icons, SVG icon not replaced however...
|
2014-06-17 19:48:12 -04:00 |
|
|
Gavin Bisesi
|
d0f3ae6c80
|
Merge pull request #87 from Daenyth/offline-buddy
Add the ability to friend/ignore an offline user
|
2014-06-17 15:17:53 -04:00 |
|
|
Gavin Bisesi
|
74163dba5d
|
Merge pull request #86 from VanNostrand/doc
Usermanual update
|
2014-06-15 08:11:02 -04:00 |
|
|
Gavin Bisesi
|
f7e5a2491f
|
Merge pull request #83 from ctrlaltca/cmake-overhaul
Cmake overhaul
|
2014-06-14 09:19:54 -04:00 |
|
|
Gavin Bisesi
|
50ac14e8ff
|
Merge pull request #82 from ctrlaltca/osx-compilation-fix
Fix compiling on OSX
|
2014-06-10 14:06:23 -04:00 |
|
|
Gavin Bisesi
|
2b7d5d0ef2
|
Merge pull request #47 from sylvan-basilisk/editor-redesign
addition of advanced filtering features in deck editor
|
2014-06-10 10:37:35 -04:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Gavin Bisesi
|
cf26ecb8a1
|
Merge pull request #51 from mattkelly/master
Resolve all compiler warnings
|
2014-02-11 11:00:34 -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 |
|
|
Gavin Bisesi
|
7ee396503b
|
Merge pull request #36 from arxanas/master
Fix #34
|
2014-01-21 14:16:04 -08:00 |
|
|
Daenyth
|
0da2647a7b
|
Merge pull request #26 from jfreake/master
Deck Load Mods and Movable Tabs
|
2014-01-08 09:01:31 -08: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 |
|
|
Daenyth
|
611d61e48b
|
Merge pull request #24 from arxanas/master
Added setting to enable/disable notifications
|
2013-12-10 12:25:58 -08: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 |
|
|
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
|
2dd5080294
|
Merge pull request #20 from solygen/master
some markdown
|
2013-05-23 06:33:17 -07:00 |
|
|
Daenyth
|
6d69fe728a
|
Merge pull request #19 from VanNostrand/documentation
Documentation-Branch v2
|
2013-05-15 13:13:35 -07:00 |
|
|
Daenyth
|
8ba6424e0d
|
Merge pull request #17 from VanNostrand/compilewarnings
Compilewarnings
|
2013-05-11 11:34:27 -07: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 |
|
|
Daenyth
|
a1bdece3e8
|
Merge pull request #15 from VanNostrand/nsis
Add usermanual.pdf to startmenu if created.
|
2013-05-09 04:10:20 -07:00 |
|
|
Daenyth
|
a5ee926862
|
Merge pull request #14 from VanNostrand/smallfix
Changed default server to woogerworks
|
2013-05-08 15:53:00 -07:00 |
|
|
Daenyth
|
c31a9526e3
|
Merge pull request #13 from VanNostrand/nsis
NSIS updates
|
2013-05-08 11:56:51 -07:00 |
|
|
Daenyth
|
e449520a3e
|
Merge pull request #12 from VanNostrand/documentation
Documentation
|
2013-05-08 06:02:41 -07: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 |
|
|
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 |
|
|
Daenyth
|
1accaffb70
|
Merge pull request #6 from skoh-fley/cursorhandclenchbug
Fixed a cursor bug
|
2013-04-16 19:59:53 -07:00 |
|
|
Daenyth
|
cd190aeb7e
|
Merge pull request #5 from skoh-fley/master
Various Markdown fixes in README.md
|
2013-04-08 17:36:00 -07:00 |
|
|
Daenyth
|
39624ec077
|
Merge pull request #3 from VanNostrand/documentation
Documentation-Branch
|
2013-04-02 10:14:56 -07:00 |
|
|
Daenyth
|
a975f0ddba
|
Merge pull request #2 from VanNostrand/RespUsernameInvalid-fix
Fixed duplicate case compile error
|
2013-04-02 06:19:09 -07:00 |
|
|
DaenythandDaenyth
|
1dd7695e9a
|
Make games created reg-only by default.
|
2011-12-28 23:47:30 -05:00 |
|