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

1459 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
da59b51c5e Fixed deletion of startmenu folder on uninstall + code indent 2014-03-12 10:04:31 +01: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
eebdc1b50e Updated NSIS uninstall section. 2014-03-11 17:47:40 +01:00
Mark Morschhäuser
a52d774593 Updated NSIS installer. 2014-03-11 17:41:17 +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
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
Name
0128798c64 4 Space Tabs 2014-03-08 11:35:35 -05:00
Mark Morschhäuser
a15eb6f29f Updated SFMT RNG code, removed Qt RNG 2014-03-08 17:08:40 +01:00
Musty Mustelidae
1d3667f37d Implemented Fisher–Yates shuffle. Assumes RNG function is in form getNumber(min,max), with min and max inclusive (Did not find documentation on function) 2014-03-08 01:23:21 -05:00
Musty Mustelidae
2ad09399f4 Implemented Fisher–Yates shuffle. Assumes RNG function is in form getNumber(min,max), with min and max inclusive (Did not find documentation on function) 2014-03-07 09:09:56 -05: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
Buce
a62ba91a5d Add different compare methods for sorting 
Give DeckList nodes the ability to sort based on name, price, or
number.
 2014-02-28 15:38:23 -06: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
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