jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-09 17:44:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
1426 commits 47 branches 176 tags 122 MiB
Commit graph

1426 commits

This branch
This branch
All branches
Author SHA1 Message Date
woogerboy21
a6bd08815c Statement Correction 
Derp...
 2014-07-01 00:36:34 -04:00
woogerboy21
ad7b1602af Response Clarification 
Renamed response name for clearer recognition.
 2014-06-30 23:49:26 -04:00
woogerboy21
87ebc66117 Declare Correction 
Added missing declarations.
 2014-06-30 23:12:02 -04:00
woogerboy21
b4c40b7714 Update server.h 2014-06-30 22:45:10 -04:00
woogerboy21
3c216ac9cd Registered Only Server 
Allow for registration only server.
 2014-06-30 16:26:57 -04:00
woogerboy21
69a8fa0bb1 formatting 
4 space indent + flow change for easier readability
 2014-06-27 18:17:19 -04:00
woogerboy21
c30c23f8c5 removed extra un-needed empty line. 
removed extra un-needed empty line.
 2014-06-26 14:45:56 -04:00
woogerboy21
0f710fd480 added multiple filter capabilities 
changed the single qstring search for log filtering to qstringlist to allow for multiple filters
 2014-06-26 14:37:45 -04:00
woogerboy21
1ef419a875 revised filtering code 
revised filtering code.
still needs more work to get filter checks to compare more than single string.
 2014-06-26 00:35:39 -04:00
woogerboy21
5cdb4b5136 updated for revised server log filtering 
updated loglevel setting name to reflect more accurate setting name (writelog)
also added logfilter setting to allow user defined filters.
(still needs code update to handle more than single string filter)
 2014-06-26 00:30:38 -04:00
woogerboy21
39e0c5a887 variable cleanup 
removed unused variables
changed switch statement to now log more verbose as loglevel number increments
captured undefined loglevel to default to most verbose logging
 2014-06-23 09:16:40 -04:00
woogerboy21
234a68dfd0 improved code structure 
improved code structure for clarity
 2014-06-23 03:38:26 -04:00
woogerboy21
c5fae5682a updated for clarity 
updated filtering code for clarity (based on recommendations)
 2014-06-23 01:39:13 -04:00
woogerboy21
f8b2e81283 revised log filter code 
revised log filtering code
 2014-06-23 01:20:45 -04:00
woogerboy21
236e0a4197 added loglevel variable 
added log filtering variable
 2014-06-23 00:09:21 -04:00
woogerboy21
5592346979 added server log filtering 
added log filtering based on configuration file setting
0 = log everything
1 = log nothing
2 = chat logging only
 2014-06-23 00:07:12 -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
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
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
Gavin Bisesi
ab3b3f3bae Merge pull request #106 from VanNostrand/doc 
Added Mac OS X build instructions.
 2014-06-22 07:53:58 -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
Mark Morschhäuser
3a82669b61 Added Mac OS X build instructions. 2014-06-21 19:24:13 +02:00
Daenyth
38b83acae0 Fix #105 - remove emdash from card type when getting main type 2014-06-21 12:42:46 -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
Fabio Bas
0ec5842c3f Add an unexposed config value for the AllSets.json file url 
It will be saved only if:
* it’s different than the default (the user used a custom url);
* the download actually worked
 2014-06-21 12:10:04 +02:00
Fabio Bas
17f7fe7ad9 Don't lock the UI if the loaded file was not readable 2014-06-21 11:41:31 +02:00
Fabio Bas
1edc34f086 Add an option to force selection of save path 
By default oracle saves cards.xml to the correct path, where cockatrice
will be able to pick it up;
if oracle is not able to determine the path or the user unchecks the
option, oracle will ask for a save path
 2014-06-21 11:37:46 +02:00
Fabio Bas
bb9a79f83b Rename the finish/done button as "Save" 2014-06-21 11:25:24 +02:00
Fabio Bas
c6078c384c Strip { } around mana cost 2014-06-21 11:18:41 +02:00
Fabio Bas
075c743a17 Sets: case insensitive sorting 2014-06-21 11:11:49 +02:00
Fabio Bas
53de2db89c Clean up code leftovers 2014-06-21 11:04:52 +02:00
Fabio Bas
8d283a5a98 Merge branch 'Daenyth-mtgjson-importer' into mtgjson-importer 2014-06-21 10:57:24 +02:00
Fabio Bas
3ff19b4968 Merge branch 'mtgjson-importer' of https://github.com/Daenyth/Cockatrice into Daenyth-mtgjson-importer 2014-06-21 10:56:59 +02:00
Fabio Bas
26f1db5dda Merge remote-tracking branch 'upstream/master' into mtgjson-importer 2014-06-21 10:50:23 +02: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
Gavin Bisesi
032c41f3d5 Merge pull request #93 from VanNostrand/doc 
Updated Windows build howto.
 2014-06-20 07:53:12 -04:00
Mark Morschhäuser
3863a05f49 Updated Windows build howto. 2014-06-20 09:59:45 +02:00
Gavin Bisesi
da4c25597e Merge pull request #61 from VanNostrand/win32 
Windows MSVC support
 2014-06-19 22:56:18 -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
Fabio Bas
40f9536224 Rewrite oracle as a wizard 2014-06-19 16:49:38 +02:00
Mark Morschhäuser
a22a703fe8 Merge branch 'win32' of https://github.com/VanNostrand/Cockatrice into win32 2014-06-18 13:44:37 +02:00
Mark Morschhäuser
0497239cef Added MSVC compiler flags to cmake file. 2014-06-18 13:42:14 +02:00
Mark Morschhäuser
391e480d7a Restored MSVC linkflags after cmake update. 2014-06-18 12:11:58 +02:00
Mark Morschhäuser
929bcb55da Fixed bug in filtertree.cpp 2014-06-18 12:10:15 +02:00