Commit graph

1319 commits

Author SHA1 Message Date
Fabio Bas
4fd8c94df0 Overhaul common's CMakeLists.txt
* Use automoc instead of a manual list of headers
* Remove Qt4 detection
* Created missing .cpp for .h files (for automoc detection)
* Remove pthread linking
* Forcing -lprotobuf is not needed for mingw; msvc only?
2014-06-11 01:24:34 +02:00
Fabio Bas
62f756e698 Remove pthread detection and linking: it's unused 2014-06-11 01:20:19 +02:00
Fabio Bas
5cd363e590 Removed duplicate FindQt4 2014-06-11 01:15:14 +02:00
Fabio Bas
b2ead4ffd2 Ignore multiple build directories (used when cross compiling) 2014-06-11 01:14:43 +02:00
Fabio Bas
4b49458eeb servatrice'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:34:01 +02:00
Fabio Bas
0f02c6b0a2 oracle'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:33:33 +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
4c1687264d main CMakeLists.txt: major overhaul
* define CMAKE_INSTALL_PREFIX
* define compilation flags
* find needed libraries
* enable Qt4’s automoc
* Added comments
2014-06-10 23:29:24 +02:00
Fabio Bas
c9f10554c6 comment in sounds and zonebg's CMakeLists.txt 2014-06-10 23:26:37 +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
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
79c805b835 Create sounds/zonebg CMakeLists.txt 2014-06-10 14:11:16 +02: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