gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-08-01 08:30:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,720 Commits 54 Branches 176 Tags
7cdd2a26f613c19a5d9b249480087ca27abdfc19
Commit Graph
1720 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mark Morschhäuser 0c65fdf3dd Defined a common prefix for the Qt directory 2014-05-11 14:09:54 +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 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 MustelidaeandName 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 MustelidaeandName 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