aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1561 commits 1 branch 0 tags 51 MiB
Commit graph

1014 commits

Author SHA1 Message Date
Fabio Bas
b44365b73c This finally fixes both make install and make package 2014-06-22 23:41:15 +02:00
Fabio Bas
6d1de0c617 Partially revert previous commits; ensure the bundle is fixed up correctly 2014-06-22 23:41:15 +02:00
Fabio Bas
41c7ce8022 Fix qt.conf file creation for "make package" 2014-06-22 23:41:15 +02:00
Fabio Bas
99f3519da5 Workaround permission problem in ixup_bundle 
Without this change, make install and make package would require “sudo”
under osx
 2014-06-22 23:41:15 +02: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
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
Fabio Bas
d7a962c055 CMake: support fir linking against qt5 2014-06-21 14:12:55 +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
Mark Morschhäuser
6fa94dd475 Qt5: toAscii() and fromAscii() Methods are deprecated 2014-06-20 16:55:26 +02:00
Mark Morschhäuser
a903c231f2 Qt5: QDesktopServices::storageLocation deprecated 2014-06-20 16:54:46 +02:00
Mark Morschhäuser
648a6a3884 Qt5: QUrl addQueryItem moved to QUrlQuery 2014-06-20 16:53: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
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
Mark Morschhäuser
8708c96695 Merge remote-tracking branch 'origin/master' into win32 
Conflicts:
	cockatrice/CMakeLists.txt
	oracle/CMakeLists.txt
 2014-06-18 12:09:32 +02: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
Fabio Bas
f3a57d5506 Import data from mtgjson's allsets.xml 
* add multiverse id to cards.xml
* remove pictures urls from cards.xml
TBD:
* fix/clean oracle’s gui
* add support in cockatrice
 2014-06-16 00:27:33 +02:00
Daenyth
b749ddbc45 Add the ability to friend/ignore an offline user 2014-06-15 14:59:54 -04:00
Fabio Bas
dd768ba7bd OSX: Move translations inside app bundle 
Additional: remove duplicate if(linux) and merge rules together
 2014-06-12 23:42:20 +02:00
Fabio Bas
eca318c34d Make install paths relative to prepare for CPack 2014-06-12 23:29:42 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
62f756e698 Remove pthread detection and linking: it's unused 2014-06-11 01:20:19 +02:00
Fabio Bas
0dd6567583 cockatrice's CMakeLists.txt: major overhaul 
* Remove cockatrice_HEADERS (obsoleted by automoc)
* Remove compilation flags definition and Qt4 finding calls
* Make use of CMAKE_INSTALL_PREFIX
* use INSTALL(TARGETS) in place of INSTALL(PROGRAM)
* Osx: create a proper application bundle
* Added comments
 2014-06-10 23:32:52 +02:00
Fabio Bas
84503483eb Added missing ifdefs around keysignals.h 2014-06-10 23:25:59 +02:00
Fabio Bas
39e2bf06f5 Merge branch 'master' into cmake-overhaul 2014-06-10 23:11:31 +02:00
Fabio Bas
20b9a538fa Split PendingCommand 's implementation to its own cpp to permit automoc 2014-06-10 22:33:21 +02: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
ctrlaltca
e2d17e983f Restored whitespaces in CMakeLists.txt 2014-06-10 20:05:24 +02: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
Fabio Bas
4fc6831784 Avoid using gcc-specific flags on not-gnu compilers 2014-06-10 11:42:41 +02:00
sylvanbasilisk
841847cda4 update to hotkey settings in deck editor tab 
removed LEFT/RIGHT increment/decrement while
the card database/quicksearch edit have focus.
LEFT/RIGHT increment/decrement remains while the
deck view has focus.

also, now the card database delegates focus the
quicksearch editor so that any characters typed
while the card database has focus will narrow
the search down using the quicksearch filter.

`control`+`alt`+`-`/`=` now increment/decrement
the mainboard and `control`+`alt`+`[`/`]` now
increment/decrement the sideboard (alt could not
be used alone as OSX inserts special characters
using alt.
 2014-04-24 20:17:21 +00:00
sylvanbasilisk
040d9d15a3 bug fix: move isEnabled test out of acceptCardAttr 
in the case of AND'ed filter terms, returning true
from acceptCardAttr will be equivalent to ignoring the
disabled term, but in the case of OR'ed terms,
returning true will incorrectly cause all cards
to be accepted.

the fix is to test for whether the term is enabled
before calling acceptCardAttr and continue if
disabled.
 2014-04-24 19:49:50 +00:00
sylvanbasilisk
cd4d04be3e change tabs into 4 spaces in new files 2014-03-25 02:29:45 +00:00
sylvanbasilisk
0770626270 Merge branch 'master' into editor-redesign 
Conflicts:
	cockatrice/src/carddatabasemodel.cpp
	cockatrice/src/carddatabasemodel.h
	cockatrice/src/decklistmodel.cpp
	cockatrice/src/decklistmodel.h
	cockatrice/src/tab_deck_editor.cpp
	cockatrice/src/tab_deck_editor.h
 2014-03-25 02:10:52 +00:00
sylvanbasilisk
748aac7ee8 whitespace modifications in preparation for merge 2014-03-25 01:13:41 +00:00
sylvanbasilisk
378cc91c17 delete debug printf statements 
this should fix the compilation issue mentioned by mattkelly
 2014-03-25 00:07:58 +00:00
sylvanbasilisk
610f0b6f6f make sure filtertree stuff translates 
The logic types and attribute names were not previously
being translated by the tr(...) function.
 2014-03-24 23:52:30 +00:00
sylvanbasilisk
2b7ea0c983 refactored deck editor UI key shortcuts 
The global shortcuts were removed in favor of key events
which are only triggered when a widget has focus. This is
necessary to allow different widgets to react differently
to the 'enter' key. The current key configuration is:
search edit focused:
  * left/right: decrease/increase card count for selected database card
  * enter: add selected card to deck
  * ctrl-enter: add selected card to deck sideboard
  * ctrl-left/right: decrease/increase card count in sideboard for selected card

database focused: the same as with search edit.

deckview focused:
  * left/right: decrease/increase card count for selected deckview card
  * enter: increase count for selected deckview card
  * delete/backspace: delete selected card from deck
 2014-03-24 21:03:26 +00:00
Mark Morschhäuser
d968f04b02 Improved file handling from commit e33debcb. 2014-03-18 12:10:46 +01:00
Matt Kelly
082ab73152 Add Tab shortcut for next phase 2014-03-13 01:08:49 -04:00
Mark Morschhäuser
e2615a0ff0 Fixed warning C4018 <,> signed/unsigned mismatch 2014-03-12 09:34:25 +01:00
Mark Morschhäuser
7c606af63e Fixed warning regarding virtual function overrides. Using C++ standard. 
See http://msdn.microsoft.com/en-us/library/bb384874(v=vs.90).aspx
 2014-03-12 09:11:01 +01:00
Mark Morschhäuser
a7c957dfca Fixed CMake files for MSVC++ linker. 2014-03-11 17:15:51 +01:00
Mark Morschhäuser
32ad8ed24c Fixed MSVC++ compile error due to sqrt() usage. 2014-03-11 16:57:54 +01:00
Mark Morschhäuser
80da61dcbb Fix MSVC++ compile error caused by missing round() in math.h 2014-03-11 16:10:55 +01:00
Mark Morschhäuser
6e9f81461a Fixed VC++ 'M_PI' : undeclared identifier error. 2014-03-11 15:19:29 +01:00
Mark Morschhäuser
49227ad44c Fixed VC "'*/' found outside of comment" warning. 2014-03-11 15:04:26 +01:00
Mark Morschhäuser
e33debcbff Changed C to Qt file handling. VC warns because fopen may be unsafe. 2014-03-11 15:02:15 +01:00
Buce
401b34d22c Clean up DecklistModel::addCard() 
Split common functionality out of the if-else block.
 2014-02-28 15:45:29 -06:00
Buce
875df01424 Fix GUI glitches when adding cards to a deck 
Since we no longer sort on just card names, we need to emit updates
for the parent of the card we add.
 2014-02-28 15:44:46 -06:00
Buce
b32374b453 Sort correctly when adding cards 2014-02-28 15:43:43 -06:00
Buce
6a5f2d2476 Allow sorting on different columns 2014-02-28 15:41:29 -06:00
Matt Kelly
1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05:00
Matt Kelly
a171df744d Convert to 4-space indents 2014-02-11 10:47:51 -05:00
Matt Kelly
96ec49936e Resolve all compiler warnings 2014-02-11 01:52:06 -05:00
sylvanbasilisk
f6e9676c75 revert cardinfowidget to its original content 
reverted cardinfowidget to its original form at commit
95c6058dc3 before i messed with
it. i didnt intend to make changes to it.
 2014-01-29 07:15:44 +00:00
sylvanbasilisk
f77054f20d refactor cardframe as a parent of a text card frame and a picture card frame 
cardframe is now a stacked widget that prefers to show the card picture
only so that the screen can be more space efficient and the card pixel
map can be displayed as a larger size. however if the card pixel map
can not be loaded for some reason, the cardframe class will automatically
switch to the text version of the card.

a menu item was added under the database menu to allow for users to
prefer card text only.
 2014-01-29 00:19:34 +00:00
sylvanbasilisk
5d223b5917 clear the filter term text edit box appropriately 
clear the text box when the '+' button is pressed or
when the filter attribute is changed.

also changed the frame style to match the card frame style.
 2014-01-28 23:51:18 +00:00
sylvanbasilisk
c786e180c3 reverted back to original deck editor layout but including filtertree 
the original layout is actually more space efficient if using CardFrame
instead of CardInfoWidget and reducing the size of the deck editor
toolbar.

this commit also removes the old search feature by removing the search
button and the clear search button. the clear search menu item is left
in place, however it now clears the filtertree.

finally, the stretch factor for the right frame in the main layout was
reduced to zero so that the card database gets priority for extra space.
this makes more sense because the deck editor does not actually need
very much horizontal space.
 2014-01-26 23:20:35 +00:00
sylvanbasilisk
16d30fb9e1 miscellaneous code cleanup 
renamed filter list modules to filter tree to more accurately reflect
the nature of the data structure.
 2014-01-22 20:52:52 +00:00
sylvanbasilisk
083005b8a9 implemented filter list enable/disable functionality 
also refactored much of the filter list code to be much
cleaner and modular.
 2014-01-22 08:32:00 +00:00
sylvanbasilisk
3202243ed0 connect filter list functionality to the CardDatabaseDisplayModel class 
enable/disable check boxes still not functional
 2014-01-21 23:37:22 +00:00
arxanas
629668d7c0 Fix #34 
This is @mcallahan's patch — see #35. I had to apply this diff by hand,
because both `git` and `patch` refused to apply it and I didn't know
how to resolve that. Consequently, there might be an error.
 2014-01-17 20:30:06 -05:00
sylvanbasilisk
863e437d4c added filter builder widget and filter tree 
filter builder takes filter options from user, then adds
completed filters to the filter tree. the filter tree does
not currently do anything. in the future it will filter the
cards in the database view.
 2014-01-17 10:06:45 +00:00
jfreake
67c4d089be Deck Load Mods and Movable Tabs 
Changes:
Deck Load - Default to all types *.*
Decklist - Strip "|edition" from .dec formats that include a pipe and
the edition after the card name
Tab_Supervisor - Make tabs movable (able to rearrange tabs)
 2014-01-08 11:54:02 -04:00
sylvanbasilisk
0b2231639f initial experiment with editor layout 2014-01-05 09:47:50 +00:00
arxanas
b1af4237e7 Added setting to enable/disable notifications 
When something happens, the taskbar icon lights up/the dock icon
bounces. This can be annoying, so here is a setting to disable that.
 2013-12-06 21:04:00 -05: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
db43a0609b Merge branch 'master' of github.com:Daenyth/Cockatrice 2013-07-11 13:51:18 -04:00
Frederik Holden
c0fdbb2cca Fix two bugs in the price tag feature 
"The price tag feature currently has two bugs.
1. The final price that a card ends up with is the one in the last set
alphabetically, instead of the one from the set with the lowest price.
2. Black Lotus Project sometimes gets in prices for cards from Masters
Edition, for some reason. This set only exists in Magic the Gathering:
Online, i.e., not physically, and should not be considered. This might
be considered a BLP bug and not a Cockatrice bug.

This patch fixes those two bugs. I also changed the price value to be
based on BLP's "price" value instead of the "average" value. Seems more
logical."

Signed-off-by: Daenyth <Daenyth+git@gmail.com>
 2013-07-11 13:50:31 -04:00
Daenyth
6d69fe728a Merge pull request #19 from VanNostrand/documentation 
Documentation-Branch v2
 2013-05-15 13:13:35 -07:00
Mark Morschhäuser
562de0553f Fixed compile warnings due to missing \n at EOF. 2013-05-15 21:31:47 +02:00
Daenyth
8ba6424e0d Merge pull request #17 from VanNostrand/compilewarnings 
Compilewarnings
 2013-05-11 11:34:27 -07:00
Mark Morschhäuser
0022425687 Fixed implicit conversions from double to int warnings regarding 
QPainter.drawRect()
 2013-05-11 17:41:11 +02:00
Daenyth
a5ee926862 Merge pull request #14 from VanNostrand/smallfix 
Changed default server to woogerworks
 2013-05-08 15:53:00 -07:00
Mark Morschhäuser
f801f4f64d Changed default server to woogerworks 2013-05-08 23:56:09 +02:00
skoh-fley
03852f0409 To-be permanents on the stack now enter the battlefield when double-clicked 2013-04-17 08:23:31 -07:00
skoh-fley
2727781c0e Added a UI option to always play nonlands onto the stack 
Previously this behavior only occured for instants and sorceries

Woops, missed a file

Missed some parentheses
 2013-04-17 08:23:12 -07:00
skoh-fley
69e6c9ac69 Fixed a cursor bugo 
Click-holding on a card then immediately releasing now properly changes the
cursor from a closed hand back to an open hand
 2013-04-16 18:12:48 -07:00
Mark Morschhäuser
1bf4f74a50 Fixed duplicate case compile error 2013-04-02 12:04:37 +02:00
Daenyth
347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
Max-Wilhelm Bruker
ce642e3000 don't use Server_Room::getInfo when updating 2013-02-15 19:31:37 +01:00
Max-Wilhelm Bruker
bd9221f1a5 Merge pull request #123 from bafipawi/fixMacCompile 
Fixed cmake error on mac install
 2013-02-10 11:54:04 -08:00
Chris Hansen
422f73d4cd Fixed cmake error on mac install 2013-02-08 20:18:19 -08:00
Chris Hansen
b909047a43 Added some paranthases to supress compiler warnings 2013-02-07 12:49:09 -08:00
Max-Wilhelm Bruker
f10543924d factored out duplicated code in [card] tag parsing 2013-01-19 17:29:15 +01:00
Max-Wilhelm Bruker
a4ae1bcd39 Merge pull request #64 from Daenyth/issue-64 
Allow `[[Cardname]]` as a synonym for `[card]cardname[/card]`
 2013-01-19 08:20:30 -08:00
Max-Wilhelm Bruker
7736f7b5f8 fixed #101: added option to filter password protected games 2013-01-19 17:16:04 +01:00
Max-Wilhelm Bruker
89ae29aaf0 added Georgia to countries 2013-01-19 16:14:47 +01:00
Max-Wilhelm Bruker
bc595bbab2 added missing confirmation dialogue for remote folder deletion 2013-01-10 00:16:52 +01:00
Dylan Wreggelsworth
ef768dbe44 Added new app icons, SVG icon not replaced however... 2012-11-13 19:45:04 -08:00
Max-Wilhelm Bruker
de87bc6546 compile fixes by hasufell 2012-10-28 21:43:41 +01:00
Max-Wilhelm Bruker
e7fc3b59a7 changed ShutdownDialog to use QDialogButtonBox 2012-10-14 11:19:04 +02:00
Daenyth
b767b72230 Fix #64: Allow [[cardname]] shortcut for card:// 2012-07-25 00:38:26 -04:00