gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,598 Commits 53 Branches 176 Tags
9e12c5b2d44caf3f02beee8bb81bfea07331e92d
Commit Graph
64 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Bisesi ea897ee2ef Merge pull request #229 from arxanas/deckbrew-prices 
Fix issue mentioned in #152: price updater loads all cards now.
 2014-07-25 08:42:20 -04:00
Gavin Bisesi abdaa610ee Merge pull request #152 from ctrlaltca/master_feature_prices 
Add pricing from deckbrew.com (refs #147)
 2014-07-24 07:45:37 -04:00
Gavin Bisesi a8031321c6 Merge pull request #226 from arxanas/deckstats-multiple-cards 
Fix #225: Multiples of cards are now sent to deckstats.
 2014-07-23 15:38:09 -04:00
Gavin Bisesi 395658988a Merge pull request #220 from arxanas/deck-parser-ampersand 
Fix #183: Deck parser doesn't too eagerly replace ampersands.
 2014-07-23 08:53:04 -04:00
Gavin Bisesi a50e7ba936 Merge pull request #156 from arxanas/master 
Fix #45: don't send tokens to deckstats.
 2014-07-23 08:41:15 -04:00
Gavin Bisesi 0f627958c7 Merge pull request #224 from arxanas/case-insensitive-card-tag 
Æ now actually works with the case-insensitive tags.
 2014-07-23 08:12:54 -04:00
Gavin Bisesi 27eca25057 Merge pull request #197 from arxanas/case-insensitive-card-tag 
Fix #117: Card tags now match disregarding case and punctuation.
 2014-07-21 13:02:09 -04:00
Gavin Bisesi 1973df10e8 Merge pull request #221 from arxanas/travis-osx-no-cmake 
Removed cmake from Travis's OS X dependencies.
 2014-07-19 22:02:42 -04:00
Gavin Bisesi 843eba817b Merge pull request #194 from ctrlaltca/master_regression_180_tab 
Room and Message tabs: focus input line when convenient; Fix #180
 2014-07-13 09:16:06 -04:00
Gavin Bisesi 1137179b88 Add WITH_QT4 note to README 2014-07-13 09:08:32 -04:00
Gavin Bisesi b15d8e076c Merge pull request #209 from ctrlaltca/cpack_win_fixes 
Cpack fixes for windows (fixes #207)
 2014-07-13 08:07:34 -04:00
Gavin Bisesi f83d58309b Merge pull request #126 from ctrlaltca/cmake_qt5 
Qt5 support
 2014-07-10 13:13:51 -04:00
Gavin Bisesi 86fa8f304d Change client send-ping timer back to 1sec 
9sec was causing too many timeout issues.

Timeout from both client and server perspective needs to be revisited
 2014-07-09 19:06:31 -04:00
Gavin Bisesi 52827573b0 Merge pull request #204 from ctrlaltca/master_issue_203 
Fixes #203
 2014-07-09 16:31:48 -04:00
Gavin Bisesi ca5d719d7d Merge pull request #200 from arxanas/4x-cardname 
Fix #184: Deck loader reads 4x cardname correctly.
 2014-07-09 11:50:33 -04:00
Gavin Bisesi 73e5e12c24 Merge pull request #199 from arxanas/remember-game-filter-preferences 
Fix #137: Game filter preferences are saved.
 2014-07-08 12:49:45 -04:00
Gavin Bisesi 7f77082466 Merge pull request #151 from ctrlaltca/master_input_focus 
Focus the Input line in chat when convenient (fixes #113)
 2014-07-03 10:34:21 -04:00
Gavin Bisesi e198f775dc Merge pull request #168 from woogerboy21/servatrice-shellmaint-scripts 
DB Maint Scripts
 2014-07-02 17:56:32 -04:00
Gavin Bisesi fb4a7b3274 Give more friendly login error message 2014-07-01 12:04:33 -04:00
Gavin Bisesi e955732ba8 Merge pull request #163 from arxanas/vanguard-card-names 
Fix #155: Vanguard card names no longer conflict with regular card names.
 2014-07-01 07:04:01 -04:00
Gavin Bisesi e258f8625a Merge pull request #121 from woogerboy21/serverlog-filtering 
Server log filtering
 2014-06-27 19:02:30 -04:00
Gavin Bisesi fcc62a1e1f Use defined(Q_OS_WIN) in #elif to satisfy MSVC 
It's always windows.
 2014-06-25 17:09:17 -04:00
Gavin Bisesi 0e7a5e582c Merge pull request #129 from VanNostrand/doc 
Recompiled usermanual.
 2014-06-25 10:12:12 -04:00
Gavin Bisesi 65f59747c9 Merge pull request #116 from ctrlaltca/feature-cpack 
Use cpack to create osx's dmg
 2014-06-24 21:08:57 -04:00
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