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

1360 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Morschhäuser
a22a703fe8 Merge branch 'win32' of https://github.com/VanNostrand/Cockatrice into win32 2014-06-18 13:44:37 +02:00
Mark Morschhäuser
0497239cef Added MSVC compiler flags to cmake file. 2014-06-18 13:42:14 +02: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
Gavin Bisesi
d0f3ae6c80 Merge pull request #87 from Daenyth/offline-buddy 
Add the ability to friend/ignore an offline user
 2014-06-17 15:17:53 -04:00
Daenyth
b749ddbc45 Add the ability to friend/ignore an offline user 2014-06-15 14:59:54 -04:00
Gavin Bisesi
74163dba5d Merge pull request #86 from VanNostrand/doc 
Usermanual update
 2014-06-15 08:11:02 -04:00
Mark Morschhäuser
f042b80e0f Updated Usermanual.pdf 2014-06-15 10:43:04 +02:00
Mark Morschhäuser
06f25ff546 Removed pthread information due to fixes in the buildsystem. 2014-06-15 10:41:23 +02:00
Mark Morschhäuser
901b0d51d5 Slightly changed two captions. 2014-06-15 10:40:12 +02:00
Daenyth
6913f2bb4e Merge branch 'master' into musty 
Conflicts:
	common/server_cardzone.cpp
 2014-06-14 19:06:49 -04:00
Gavin Bisesi
f7e5a2491f Merge pull request #83 from ctrlaltca/cmake-overhaul 
Cmake overhaul
 2014-06-14 09:19:54 -04:00
Fabio Bas
a35b62509a Handle correctly user-defined CMAKE_BUILD_TYPE 2014-06-14 10:35:18 +02:00
Fabio Bas
a4fbf8b677 Force linking with pthread under unix 
Protobuf depends on pthread under unix, but cmake’s FindProtobuf
doesn’t add -lpthread to link flags
 2014-06-13 19:09:33 +02: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
660ff349ab Add a proper, top-level project name 2014-06-12 23:32:12 +02:00
Fabio Bas
ddec7e6561 Create CMake options for components 2014-06-12 23:31:30 +02:00
Fabio Bas
eca318c34d Make install paths relative to prepare for CPack 2014-06-12 23:29:42 +02:00
Fabio Bas
dfdfe60202 Properly install sounds and zonebg files 2014-06-11 18:20:48 +02:00
Fabio Bas
84fe5f464c Removed unnecessary comments in previous commit 2014-06-11 18:20:34 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
ed0311d59e Added comments for comment's CMakeLists.txt 2014-06-11 01:26:54 +02:00
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
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