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,805 Commits 53 Branches 176 Tags
a716d73a42e61329eb8e61386f6e276b077fc0bf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Bisesi 8d2e5d3c43 Merge pull request #306 from Mawu3n4/translation 
French translation
 2014-11-07 10:11:53 -05:00
Gavin Bisesi 8f801825a9 Merge pull request #379 from poixen/uicolors 
Changed UI colors
 2014-11-05 15:45:53 -05:00
Gavin Bisesi 5ad869c636 Merge pull request #378 from poixen/animation 
Card Animation performance improvement
 2014-11-05 15:45:24 -05:00
Gavin Bisesi 67db347d12 Merge pull request #366 from poixen/removeoldimages 
Resource cleanup
 2014-11-05 15:31:17 -05:00
Gavin Bisesi a051133af9 Merge pull request #397 from woogerboy21/patch-1 
Correct gametype primary key
 2014-11-03 10:22:24 -05:00
Gavin Bisesi 1d7850fff8 Merge pull request #406 from ctrlaltca/fix_405 
Fix for #405
 2014-10-29 09:53:21 -04:00
Gavin Bisesi 07cccda17b Merge pull request #377 from poixen/newhandsvg 
Updated hand.svg
 2014-10-20 10:28:58 -04:00
Gavin Bisesi d264191ee6 Merge pull request #381 from poixen/abstractcarddragitemcleanup 
Removed inline logic
 2014-10-17 15:07:04 -04:00
Gavin Bisesi 2a15b9c95a Merge pull request #376 from ctrlaltca/oh_my_sounds 
Fix sounds under windows and osx (fix #356)
 2014-10-16 11:32:30 -04:00
Gavin Bisesi 8dbb2d8e6f Merge pull request #364 from ctrlaltca/win32_openssl_cmake 
Deploy openssl libraries under win32
 2014-10-14 14:03:32 -04:00
Gavin Bisesi 592bb7c8f1 Merge pull request #368 from ctrlaltca/servatrice_linux_menu_entry 
Servatrice linux menu entry
 2014-10-14 11:58:50 -04:00
Gavin Bisesi ae7cdc1c23 Merge pull request #375 from Daenyth/revert-260-master 
Revert "Find cards by prefix"
 2014-10-14 11:57:41 -04:00
Gavin Bisesi a26d4078cc Revert "Find cards by prefix" 2014-10-14 11:28:30 -04:00
Gavin Bisesi ca60a469eb Merge pull request #363 from woogerboy21/win_servatrice_icon 
Servatrice Icon For Windows
 2014-10-10 08:25:51 -04:00
Gavin Bisesi 6810ae46d6 Merge pull request #260 from Mawu3n4/master 
Find cards by prefix
 2014-10-09 11:29:02 -04:00
Gavin Bisesi 4070ba8e26 Merge pull request #352 from poixen/image-refresh 
Image refresh
 2014-10-09 11:27:47 -04:00
Gavin Bisesi 0f5f82d492 Merge pull request #358 from poixen/serverlogo2 
Servatrice logo
 2014-10-09 11:27:15 -04:00
Gavin Bisesi 3c0a09bf5c Merge pull request #361 from woogerboy21/servatrice-dbtable-fix 
correct _room db table, add _rooms_gametypes table
 2014-10-08 08:50:00 -04:00
Gavin Bisesi 602fa25321 Merge pull request #359 from ctrlaltca/servatrice_reguser_fixes 
Servatrice reguser fixes
 2014-10-08 08:41:13 -04:00
Gavin Bisesi faa66e4d7f Merge pull request #355 from ctrlaltca/servatrice_passwordauth 
Servatrice password authentication
 2014-10-06 15:56:41 -04:00
Gavin Bisesi 006451f402 Merge pull request #238 from arxanas/no-overwrite-tokens-xml 
Fix #231: tokens.xml no longer overwritten by cards.xml.
 2014-10-06 11:34:58 -04:00
Gavin Bisesi 73c963e9c4 Merge pull request #346 from ctrlaltca/servatrice_win32 
Servatrice win32 fixes
 2014-10-03 10:56:13 -04:00
Gavin Bisesi 277aba79dc Merge pull request #336 from poixen/master 
Tokens use PT levels from cards.xml if available
 2014-10-02 15:00:17 -04:00
Gavin Bisesi 48817ed283 Merge pull request #314 from ctrlaltca/win32_setup_fix 
Fix oracle under windows
 2014-10-02 10:35:22 -04:00
Gavin Bisesi 9e63c7fa35 Merge pull request #313 from pliu037/oracle-error-msg 
Oracle error message
 2014-10-02 10:35:05 -04:00
Gavin Bisesi 3c598531ed Merge pull request #342 from acron0/auto-connect-fix 
[Issue 340] Changed 'value' to 'setValue' in settingsCache.cpp
 2014-10-02 10:06:47 -04:00
Gavin Bisesi 263b5a40f5 Merge pull request #341 from ctrlaltca/servatrice_install_configs 
Servatrice: install example ini and sql schema file
 2014-10-02 10:06:03 -04:00
Gavin Bisesi 283bac0b80 Merge pull request #339 from ctrlaltca/qt5_no_libgcrypt 
Drop libgcrypt dependency for qt5
 2014-10-02 10:05:17 -04:00
Gavin Bisesi 55b20343e9 Note that libgcrypt is needed only for qt4 2014-10-01 16:30:19 -04:00
Gavin Bisesi b32aeb2211 Merge pull request #280 from pliu037/remove-.full-req 
Support images without .full suffix
 2014-10-01 13:50:02 -04:00
Gavin Bisesi 7eed007f14 Merge pull request #281 from ctrlaltca/fix_202 
Fix crash #202
 2014-09-30 20:35:11 -04:00
Gavin Bisesi 9752dcf495 Merge pull request #332 from ctrlaltca/sideboard-helpers 
Sideboard helpers
 2014-09-30 13:46:43 -04:00
Gavin Bisesi b5de708756 Merge pull request #289 from acron0/auto-connect 
Added 'auto connect' checkbox to connect dialog.
 2014-09-29 10:24:06 -04:00
Gavin Bisesi ab7f354e36 Merge pull request #318 from catmanjan/master 
Change default scry to 1.
 2014-09-19 10:22:04 -04:00
Gavin Bisesi 2aeecc6063 Add note about tech support 2014-09-09 12:04:06 -04:00
Gavin Bisesi fce1d6ac3f Change Qt4 to Qt4+5 in readme 2014-09-08 14:46:27 -04:00
Gavin Bisesi 64791b45f6 Add note on updating translations. 2014-09-08 14:46:01 -04:00
Gavin Bisesi 3c7abecac6 Merge pull request #292 from ctrlaltca/cmake_translations 
Add a UPDATE_TRANSLATIONS option
 2014-09-08 09:38:55 -04:00
Gavin Bisesi 8c072224c8 Move travis ci badge to Building section 2014-09-03 17:53:32 -04:00
Gavin Bisesi d93cb0a637 Add link to Gitter chat 2014-09-03 17:52:31 -04:00
Gavin Bisesi 6f319c8b63 Merge pull request #286 from jturner/fix-build 
Remove invalid character
 2014-08-19 20:31:41 -04:00
Gavin Bisesi 59b8d7044a Merge pull request #285 from pliu037/fix-oracle-save 
Fixed Oracle save bug
 2014-08-15 09:24:22 -04:00
Gavin Bisesi 0bb0530a31 Merge pull request #245 from pliu037/oracle-cards-path 
Oracle cards.xml path
 2014-08-11 10:13:38 -04:00
Gavin Bisesi 134810b979 Merge pull request #279 from ctrlaltca/valgrind_unified 
Fixed Valgrind warnings
 2014-08-11 09:11:12 -04:00
Gavin Bisesi 5c46cfc169 Merge pull request #179 from woogerboy21/registered-user-only-server 
Registered Only Server
 2014-08-11 09:03:57 -04:00
Gavin Bisesi 8b32a1010a Merge pull request #265 from pliu037/clear-downloaded-pics 
Clear downloaded images from settings
 2014-08-10 13:34:14 -04:00
Gavin Bisesi 4e3d6a141c Merge pull request #274 from ctrlaltca/serva_memleaks 
Removed a servatrice memleak
 2014-08-08 12:22:44 -04:00
Gavin Bisesi 57efffcd2e Merge pull request #273 from ctrlaltca/picurl_handling 
Fix #259
 2014-08-08 08:59:41 -04:00
Gavin Bisesi e12d66df4f Merge pull request #271 from ctrlaltca/picurl_handling 
Picurl handling
 2014-08-07 17:25:38 -04:00
Gavin Bisesi 0de0658acd Merge pull request #269 from arxanas/style-guide-memory-management 
Added section on memory management to CONTRIBUTING.md.
 2014-08-07 15:51:51 -04:00
Gavin Bisesi fe3dc02513 Merge pull request #266 from arxanas/token-dashes 
Fix #258: Dashes to spaces.
 2014-08-07 15:34:47 -04:00
Gavin Bisesi ab7d70a9c8 Merge pull request #263 from ctrlaltca/oracle_icon 
Add icon to oracle
 2014-08-07 12:00:46 -04:00
Gavin Bisesi 1a4abc3d63 Merge pull request #264 from arxanas/style-guide 
Added style guide.
 2014-08-07 11:58:37 -04:00
Gavin Bisesi af4d662c54 Merge pull request #262 from ctrlaltca/fix_134 
add success notification to oracle; fixes #134
 2014-08-07 10:39:13 -04:00
Gavin Bisesi ef1fbc0db9 Merge pull request #256 from pliu037/handle-PNGs-2 
Handle PNGs (and other image formats)
 2014-08-06 10:42:15 -04:00
Gavin Bisesi 9837f8bb18 Merge pull request #254 from ctrlaltca/compilation_warning_246 
Fix compilation warning introduced in #246
 2014-08-04 14:37:06 -04:00
Gavin Bisesi 9ba2ae71a8 Merge pull request #244 from ctrlaltca/cards_xsd 
Added schema for cards.xml and tokens.xml in xsd format
 2014-08-04 10:51:11 -04:00
Gavin Bisesi 8d482245ff Merge pull request #251 from arxanas/case-insensitive-tokens 
Fix #248: the token dialog generates cards irrespective of their case and punctuation
 2014-08-04 10:50:25 -04:00
Gavin Bisesi 6f45bbc82c Merge pull request #246 from pliu037/create-CUSTOM-folder 
Picture path/CUSTOM folder creation
 2014-08-04 10:49:39 -04:00
Gavin Bisesi ffed0e00fe Merge pull request #214 from pliu037/master 
Added better support for custom card images
 2014-07-31 13:42:57 -04:00
Gavin Bisesi ca6bd669ce Merge pull request #233 from ctrlaltca/regression_card_picurl 
Add back support for custom picture urls in cards.xml
 2014-07-31 11:30:26 -04:00
Gavin Bisesi 7d5ce6f0ef Merge pull request #235 from ctrlaltca/offline_users_menu 
Disable some usercontextmenu actions if the user is offline; fix #234
 2014-07-30 15:49:43 -04:00
Gavin Bisesi 951e43b166 Update cmake build flags in README 2014-07-30 15:47:57 -04:00
Gavin Bisesi 1e5a00d100 Merge pull request #228 from ctrlaltca/error_suppression 
Fix building with debug
 2014-07-30 15:44:08 -04:00
Gavin Bisesi 14d6b011d7 Merge pull request #236 from arxanas/remove-price-column 
Fix #110: Price column is removed when the setting is disabled.
 2014-07-30 09:55:25 -04:00
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