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

56 commits

Author SHA1 Message Date
Daenyth
09d6d26fb2 Merge branch 'master' into cmake_qt5 
Conflicts:
	cockatrice/src/main.cpp
 2014-06-28 09:13:10 -04:00
Daenyth
6d3fe428e7 Fix some warnings 
Ref #127
 2014-06-27 22:19:23 -04:00
Fabio Bas
54805fb14e Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-27 15:21:01 +02:00
Gavin Bisesi
fcc62a1e1f Use defined(Q_OS_WIN) in #elif to satisfy MSVC 
It's always windows.
 2014-06-25 17:09:17 -04:00
Fabio Bas
809f390e2f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-25 15:46:50 +02:00
Fabio Bas
6dbdaafb33 Ported cockatrice 2014-06-24 19:13:47 +02:00
Fabio Bas
5c13c06982 Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-24 18:13:26 +02:00
Fabio Bas
66c87a1ee6 OSX: Handle sounds for first time installations 
If the sounds path is unset in the settings and a “sounds” directory
doesn’t exists in the user’s data directory, install the sounds files
and set the settings value accordingly
 2014-06-22 23:42:12 +02:00
Fabio Bas
0b4701c42f OSX: Handle zonebg for first time installations 
If none of the gameboard images is set and and the user’s data
directory doesn’t contain a “zonebg” directory, create the directory,
copy contents from cockatrice’s app bundle and sets the config
accordingly.
 2014-06-22 23:42:12 +02:00
Fabio Bas
55c4c464e4 OSX: get translation path from qt.conf instead of hardcoding it 2014-06-22 23:41:15 +02:00
Fabio Bas
2a5f6181aa Osx: removed plugins path detection and fixed translation path detection 2014-06-22 23:41:15 +02:00
Daenyth
27847e1551 Don't be a jerk when card database isn't usable. 
Better error message and allow the user to still connect

Ref: #102
 2014-06-21 15:53:13 -04:00
Daenyth
38b83acae0 Fix #105 - remove emdash from card type when getting main type 2014-06-21 12:42:46 -04:00
Mark Morschhäuser
a903c231f2 Qt5: QDesktopServices::storageLocation deprecated 2014-06-20 16:54:46 +02:00
Mark Morschhäuser
d968f04b02 Improved file handling from commit e33debcb. 2014-03-18 12:10:46 +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
Matt Kelly
1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05:00
Max-Wilhelm Bruker
c7131e3a1d Windows client: translation path fix 2012-06-27 20:41:42 +02:00
Max-Wilhelm Bruker
3ba3952604 fixed issue #37: add option to manually add token cards to the database 2012-05-17 18:29:35 +02:00
Max-Wilhelm Bruker
875610e1b3 mac fixes 2012-04-27 00:39:34 +02:00
Max-Wilhelm Bruker
089d082cf4 moved translations out of resources file 2012-04-22 18:14:17 +02:00
Max-Wilhelm Bruker
fd5be3d525 added option --debug-output to redirect client output to file 2012-03-25 19:48:50 +02:00
Max-Wilhelm Bruker
eced4e2340 merge 2012-03-25 17:06:48 +02:00
Max-Wilhelm Bruker
1224eae1c0 added button to test custom translation file 2012-03-25 17:02:52 +02:00
Max-Wilhelm Bruker
a1bcd9854f preliminary client-side replay support, works in principle 2012-02-21 00:09:03 +01:00
a b
7faa033855 Mac fixes 2012-01-29 21:17:32 +01:00
Max-Wilhelm Bruker
a64df4a0f5 Use QDesktopServices::StandardLocation for platform independent default paths that don't touch the application's own folder 2012-01-22 14:18:28 +01:00
a b
50e85496fa Mac weirdness workaround 2011-10-12 18:53:02 +02:00
a b
c4bd38dbdc Mac fixes 2011-09-27 22:33:45 +02:00
Max-Wilhelm Bruker
c67bc65762 preliminary sound support 2011-05-21 22:55:08 +02:00
Max-Wilhelm Bruker
e92840c849 moved call to rng constructor to main() 2010-09-23 15:43:39 +02:00
Max-Wilhelm Bruker
23a0080c45 user level display 2010-09-20 18:52:36 +02:00
Max-Wilhelm Bruker
f9446f9822 generalized user information 2010-09-18 21:05:28 +02:00
Max-Wilhelm Bruker
5ee6bdd338 Translation code fix; updated German translation 2010-09-10 19:12:01 +02:00
Max-Wilhelm Bruker
4f13c01e12 mac patches 2010-06-19 18:18:04 +02:00
Max-Wilhelm Bruker
40fc77c646 oracle importer changes 2010-05-08 23:24:35 +02:00
Max-Wilhelm Bruker
03132e2edd app icons for mac and windows 2010-05-08 17:15:40 +02:00
Max-Wilhelm Bruker
26a77d9e40 new zone view code 2010-03-08 15:55:35 +01:00
Max-Wilhelm Bruker
2c9a8c2b57 minor cleanups and optimizations 2010-03-06 22:10:50 +01:00
Max-Wilhelm Bruker
0db3ff6819 updated icon; small bugfix 2010-03-04 17:39:38 +01:00
Max-Wilhelm Bruker
564ae4db84 some cleanups and fixes 2009-12-15 16:48:14 +01:00
Max-Wilhelm Bruker
77f5ec29eb some gui code 2009-11-16 17:18:13 +01:00
Max-Wilhelm Bruker
3d1052f54c path fix 2009-10-22 18:25:07 +02:00
Max-Wilhelm Bruker
0d84de2384 moved carddraw from game to player; qt 4.4 compilation fix; minor behaviour change 2009-08-22 01:26:35 +02:00
Max-Wilhelm Bruker
cc8de80db8 zoneview improvement 2009-08-19 18:55:21 +02:00
marcus
5b679a7ae7 Merge branch 'master' of ssh://blackrabbit23@cockatrice.git.sourceforge.net/gitroot/cockatrice into marcus 2009-08-01 19:10:46 +02:00
Max-Wilhelm Bruker
f33d790822 small changes 2009-08-01 19:10:10 +02:00
marcus
926f1560a6 Icons for Settingsdialog 2009-07-31 02:54:29 +02:00
brukie
dfaa6b1d95 settings dialog 2009-07-28 19:52:15 +02:00
Max-Wilhelm Bruker
9b1adf2dc1 reworked card database 2009-06-20 00:22:50 +02:00