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
2,227 Commits 53 Branches 176 Tags
5fc28e31a63d0ab46d66f78a685914f9101d6267
Commit Graph
68 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DaenythandFabio Bas 765e865aa2 Continue downloading card images after failing url on one. 
I should probably bust this out to a method.
 2014-08-08 09:33:38 +02:00
DaenythandFabio Bas 42f1c6938f Merged: First draft of better pic url error handling 
Cherry-picked b9cb61abd0
 2014-08-08 09:33:35 +02:00
Daenyth 4d6f46b06e Change client ping send interval to 9 sec 2014-06-29 14:46:06 -04:00
Daenyth ec3690fd29 Fix typo in gcc opts 2014-06-28 11:04:12 -04:00
Daenyth 09d6d26fb2 Merge branch 'master' into cmake_qt5 
Conflicts:
	cockatrice/src/main.cpp
 2014-06-28 09:13:10 -04:00
Daenyth 8d31fe6cbc Clean up deck load chat message 2014-06-28 09:04:45 -04:00
Daenyth 4c2a553f03 Have servatrice inform players of sideboard size 
Ref #142
 2014-06-28 00:36:43 -04:00
Daenyth c0bd7db658 Install libgcrypt on osx travis 2014-06-27 22:57:24 -04:00
Daenyth 38aa1f60ed Don't pass warn/err flags for release mode build. 
It's making travis complicated
 2014-06-27 22:50:21 -04:00
Daenyth 6d3fe428e7 Fix some warnings 
Ref #127
 2014-06-27 22:19:23 -04:00
Daenyth d3b4ef38a0 Compile servatrice on travis 2014-06-27 20:42:19 -04:00
Daenyth 6da64315d2 Merge branch 'pr138' 2014-06-27 20:00:46 -04:00
Daenyth 1d02e0d5ec Clarify comment about typedef for OSX compiling 2014-06-27 20:00:29 -04:00
Daenyth fb7de2ad1d Merge branch 'windows-nsis-fix' 2014-06-25 20:26:56 -04:00
Daenyth 144bb7fa89 Merge remote-tracking branch 'origin/invalid-windows-paths' 2014-06-25 20:26:46 -04:00
Daenyth aee86ce45a Mark QGraphicsItem for AbstractGraphicsItem 2014-06-25 01:53:19 -04:00
Daenyth 1c9540befa Set cmake module path to local for findqtmobility 2014-06-25 01:48:30 -04:00
Daenyth 0eb00fe39c Add build-essential to travis cfg 
This can't be causing the failure can it? It can't find QtMultimedia..
 2014-06-25 01:31:43 -04:00
Daenyth 5ea59908a8 Cache apt for travis 2014-06-25 01:29:06 -04:00
Daenyth 8a331e30c6 Don't install qtmultimedia - not needed 2014-06-25 01:24:14 -04:00
Daenyth 44445704e7 Install qt-multimedia-dev for travis 2014-06-25 01:21:24 -04:00
Daenyth ba1fc86f29 Install qt dep for travis 2014-06-25 01:18:52 -04:00
Daenyth 478c7f234f Set up dependencies for travis 2014-06-25 01:17:12 -04:00
Daenyth 0dd4661b7c Add travis build icon to README 2014-06-25 01:14:43 -04:00
Daenyth 0b87821497 Add rough draft for .travis.yml 2014-06-25 01:08:41 -04:00
Daenyth d811fee2f3 Include missing qdebug 
Dunno how I missed that.

Fix #128
 2014-06-25 00:11:55 -04:00
Daenyth df659e58fe Mask set shortcodes for windows illegal filenames 
Ref #122
 2014-06-24 20:49:03 -04:00
Daenyth e5d9692d78 Fall back to plain text load when xml load fails 2014-06-24 00:14:59 -04:00
Daenyth 0420f4f7af Log download failures 2014-06-23 23:44:13 -04:00
Daenyth 02fb28eb9b Merge branch 'master' into windows-nsis-fix 2014-06-23 23:16:20 -04:00
Daenyth 632e7f487c Add debugging to file for windows 2014-06-23 23:15:53 -04:00
Daenyth e925403bc5 Log cardname when downloading 2014-06-23 22:18:40 -04:00
Daenyth fc599972f3 Write to APPDATA/Cockatrice, not APPDATA 2014-06-23 21:25:09 -04:00
Daenyth f1e6aebaba Set cockatrice path settings to use appdata instead of instdir 
Putting user stuff in program files is bad
 2014-06-23 21:21:08 -04:00
Daenyth f7635f9e49 Don't recursive remove program files/cockatrice. 
This should prevent deleting old deck files
 2014-06-23 21:12:25 -04:00
Daenyth ea08fe168c Fix Q_INTERFACES warnings 
Fix #88
 2014-06-22 22:32:53 -04:00
Daenyth 4574df0a2e Remove testclient cmake option. 
This has been obsolete a long time
 2014-06-22 21:25:57 -04:00
Daenyth e5d15e8dbc Notify deck editor when price feature setting is changed 
Ref #112
 2014-06-22 21:20:14 -04:00
Daenyth 951f08dd11 Update CentOS doc in user manual 
Ref #109
 2014-06-22 20:50:49 -04:00
Daenyth c54f7b9245 Log on failed path copy 2014-06-22 20:14:22 -04:00
Daenyth 3e43429f13 Merge branch 'feature-cpack' of github.com:Daenyth/Cockatrice into feature-cpack 2014-06-22 20:08:30 -04:00
Daenyth 68c0932a2f Don't have decklist sort behavior rely on column order 2014-06-22 08:36:35 -04:00
Daenyth e99c1bbe6d Merge remote-tracking branch 'origin/master' into editor-sorting-v5 2014-06-22 08:10:22 -04:00
Daenyth 27847e1551 Don't be a jerk when card database isn't usable. 
Better error message and allow the user to still connect

Ref: #102
 2014-06-21 15:53:13 -04:00
Daenyth 38b83acae0 Fix #105 - remove emdash from card type when getting main type 2014-06-21 12:42:46 -04:00
Daenyth 53d2b82e61 Use picUrl templates to download cards. 
Add HQ card option
 2014-06-21 01:12:47 -04:00
Daenyth 8281f63134 Add settings fields for pic urls 2014-06-20 22:10:26 -04:00
Daenyth fa52ed00a3 Merge branch 'master' into mtgjson-importer 2014-06-20 20:43:19 -04:00
Daenyth 3401098e63 Revert "Merge pull request #89 from dylan/master" 
This reverts commit 552a8e0c23, reversing
changes made to d0f3ae6c80.
 2014-06-19 22:11:20 -04:00
Daenyth b749ddbc45 Add the ability to friend/ignore an offline user 2014-06-15 14:59:54 -04:00
Daenyth 6913f2bb4e Merge branch 'master' into musty 
Conflicts:
	common/server_cardzone.cpp
 2014-06-14 19:06:49 -04:00
Daenyth db43a0609b Merge branch 'master' of github.com:Daenyth/Cockatrice 2013-07-11 13:51:18 -04:00
Daenyth 347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
Daenyth b767b72230 Fix #64: Allow [[cardname]] shortcut for card:// 2012-07-25 00:38:26 -04:00
Daenyth af09d0d294 Reject more invalid usernames from clients. 
Specifically this should cover people connecting with a username of
"\u200C"
 2012-07-25 00:12:35 -04:00
Daenyth 00c03d857e Fix compile error with gcc >= 4.7 2012-06-10 00:11:12 -04:00
Daenyth 9586212f60 Merge remote-tracking branch 'upstream/master' into translation 2012-01-01 12:20:05 -05:00
Daenyth 4fbd6e0a9f .gitignore: Ignore ctags * translation build files 2011-12-28 23:47:29 -05:00
Daenyth edde8bec07 Add Planeswalker loyalty to CardInfoWidget 
CIW will also dynamically hide/show power/toughness as well as loyalty.
 2011-12-28 23:47:29 -05:00
Daenyth 0c1b6dd9c3 Merge remote-tracking branch 'upstream/master' into show-unjoinable-checkbox 2011-12-20 21:48:30 -05:00
Daenyth 6b7da3223a Fix NPE in GameSelector::GameSelector when called from UserList::gamesOfUserReceived 2011-12-07 23:37:04 -05:00
Daenyth fdded2e8c2 More Gàighlig translations 2011-12-07 20:31:43 -05:00
Daenyth c140327c1b More Gàidhlig translations 2011-12-07 19:35:00 -05:00
Daenyth ab24ff44e5 Add partial Scottish Gaelic (gd) translation 2011-12-07 01:40:08 -05:00
Daenyth 86ae8a47a8 Rename 'unjoinable' games to 'unavailable' 2011-12-04 12:25:51 -05:00
Daenyth edd429d874 Filter registered-only games as unavailable when user isn't regged 2011-12-04 12:16:19 -05:00
Daenyth eebc615c1c Change "Show full" "Show running" checkboxes to a single box 
IMO these should not have been split
 2011-12-03 23:13:27 -05:00
Daenyth a7f3ce4050 Add code support for planeswalker loyalty. 
Added to CardInfo object and to the oracle importer. Next step is the
card info widget.
 2011-12-03 17:15:33 -05:00