Commit Graph
1310 Commits
Author SHA1 Message Date
Fabio Bas d58615df1a Fix import of P/T; misc optimizations 2014-06-14 11:52:55 +02:00
Fabio Bas 6f8b2baad8 Corrections to sets.xml for mtgjson.com
* Used http://www.woogerworks.com/files/sets.xml as a base
 * update version
 * use mtgjson.com as source
 * adapted some sets name (es: 6E => 6ED)
Caveats:
 * Not all previous sets are present (e.g.: WOTC, WMCQ, WRL); they were
not present in woogerworks’s sets.xml anyway
2014-06-14 11:34:52 +02:00
Fabio Bas dbac97ee89 OracleImporter: use json to parse cards in sets
Problem: Split card are imported as 2 different cards; need to find
some way to join them
2014-06-14 11:34:06 +02:00
Fabio Bas 94419b1e38 Oracle: build with qtjson 2014-06-14 11:29:00 +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
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
Fabio Bas 4fc6831784 Avoid using gcc-specific flags on not-gnu compilers 2014-06-10 11:42:41 +02:00
Mark Morschhäuser ccab97ca7d RNG: added additional checks (which forced an interface redesign), updated comments 2014-06-09 13:31:21 +02:00
Mark Morschhäuser 197dd0f3c8 Remove useless bound checks. 2014-05-30 11:48:07 +02:00
Mark Morschhäuser bf6ec478cb Dealt with SFMT compile warnings. 2014-05-18 11:10:29 +02:00
Mark Morschhäuser 69201460e6 Included climits for UINT_MAX non-aware compilers. 2014-05-18 10:54:41 +02: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
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 f964dcc656 Added additional bound checks. 2014-03-20 15:37:21 +01:00
Mark Morschhäuser fbf54b62bc Test if macro already exists to shutup warning. 2014-03-18 20:41:39 +01:00
Matt Kelly 082ab73152 Add Tab shortcut for next phase 2014-03-13 01:08:49 -04:00
Mark Morschhäuser 4eb845d438 Throw exception if RNG is used with invalid bounds. 2014-03-11 09:41:37 +01:00
Mark Morschhäuser 9a20e5e2e2 Commented a pitfall in case of RNG replacement. 2014-03-11 08:18:54 +01:00
Mark Morschhäuser 800f7e6373 Use distribution function with rejection sampling. 2014-03-10 14:13:46 +01:00
Mark Morschhäuser 424513eb90 Forgot to add lower bound in RNG generation. 2014-03-08 17:45:59 +01:00
Mark Morschhäuser a15eb6f29f Updated SFMT RNG code, removed Qt RNG 2014-03-08 17:08:40 +01: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
Matt Kelly b93317cc17 OS X still works with pthread fix - added explanation 2014-02-14 14:14:10 -05:00
Matt Kelly e366bd7a71 Fixed for Linux - pushing to test on OS X 2014-02-14 13:58:54 -05:00
Matt Kelly 7269d0a1b7 Merge branch 'userman-linux-fix' of https://github.com/mattkelly/Cockatrice into userman-linux-fix 2014-02-14 13:38:34 -05:00
Matt Kelly cc08893c12 Fix another typo in Usermanual 2014-02-14 13:38:06 -05:00
Matt Kelly 5e2d3a2f3e Additional typo and formatting fixes
For example, fixed the card type table which wasn't showing as a table.
2014-02-13 12:59:04 -05:00
Matt Kelly e003114ce3 Fix Linux and BSD section formatting 2014-02-13 11:56:36 -05:00
Matt Kelly 1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05:00
Gavin Bisesi cf26ecb8a1 Merge pull request #51 from mattkelly/master
Resolve all compiler warnings
2014-02-11 11:00:34 -05:00
Matt Kelly a171df744d Convert to 4-space indents 2014-02-11 10:47:51 -05:00
Matt Kelly ac8c967d10 Remove compiler warnings from TODO 2014-02-11 01:53:04 -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
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
Mark Morschhäuser 91138b7e84 Improved Linux/BSD section in the usermanual. 2014-01-24 14:00:29 +01:00