Matt Lowe
|
9f46f02ebd
|
Merge remote-tracking branch 'upstream/master'
|
2014-10-05 21:06:42 +02:00 |
|
Fabio Bas
|
88235afb21
|
use qWarning instead of std::err
|
2014-10-04 11:27:50 +02:00 |
|
Fabio Bas
|
7c935519eb
|
use 4 spaces instead of tabs
|
2014-10-04 11:27:50 +02:00 |
|
Fabio Bas
|
952f25054c
|
servatrice: as a third choice, check for a config in /etc/servatrice/
|
2014-10-04 11:27:50 +02:00 |
|
Fabio Bas
|
0caf7bb193
|
win32: Avoid wiping server.log on upgrade
|
2014-10-04 11:27:49 +02:00 |
|
Fabio Bas
|
04f173f934
|
Servatrice: Add a default option for every config value
add an empty room swell, if none had been defined in the config (or we
are running with no config at all)
|
2014-10-04 11:27:49 +02:00 |
|
Fabio Bas
|
267e6cd039
|
Fix logfile option in servatrice.ini
servatrice was using hardcocded filename “server.log” even if a custom
value was specified
|
2014-10-04 11:27:49 +02:00 |
|
Fabio Bas
|
65252dda14
|
win32 NSIS installer: uninstall servatrice*
just avoid deleting servatrice.ini, if the user manually made one from
the servatrice.ini.example
|
2014-10-04 11:27:48 +02:00 |
|
Fabio Bas
|
57c1aba760
|
Servatrice: group all the use of QSettings in a single file
and add a method to guess the path of servatrice.ini
|
2014-10-04 11:27:48 +02:00 |
|
Antony Woods
|
2292997e04
|
Changed 'value' to 'setValue' on line 275
|
2014-10-04 11:27:48 +02:00 |
|
Fabio Bas
|
77bbe6b664
|
Servatrice: install example ini and sql schema file
WIN: in the binary directory
OSX: in the app bundle’s Resources subdirectory
LINUX: in $PREFIX/share/servatrice
|
2014-10-04 11:27:47 +02:00 |
|
Gavin Bisesi
|
7b4dabac78
|
Note that libgcrypt is needed only for qt4
|
2014-10-04 11:27:47 +02:00 |
|
Fabio Bas
|
909657b3ca
|
Drop libgcrypt dependency for qt5
|
2014-10-04 11:27:47 +02:00 |
|
Fabio Bas
|
a26ebee8e3
|
Fix oracle under windows
|
2014-10-04 11:27:46 +02:00 |
|
Peng Liu
|
0d0fe73369
|
Added the location Oracle attempted to save cards.xml to the failure message.
|
2014-10-04 11:27:46 +02:00 |
|
Yuki Izumi
|
41a6af8ee4
|
Add sideboard helpers.
|
2014-10-04 11:27:45 +02:00 |
|
Antony Woods
|
7104382e51
|
Adding modified translation files
|
2014-10-04 11:27:45 +02:00 |
|
Antony Woods
|
b8ea6e09ce
|
Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog
|
2014-10-04 11:27:44 +02:00 |
|
Antony Woods
|
cc5fb333f7
|
Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point.
|
2014-10-04 11:27:44 +02:00 |
|
Peng Liu
|
e6b007b36e
|
Removed unused variable, bool stripped, from classes and functions.
|
2014-10-04 11:27:44 +02:00 |
|
Fabio Bas
|
cd64af7803
|
Fix crash #202
|
2014-10-04 11:27:43 +02:00 |
|
Peng Liu
|
1f35e2d140
|
Cockatrice can now load images both with and without .full. Will need to clean-up bool stripped (used to determine .full suffix inclusion).
|
2014-10-04 11:27:43 +02:00 |
|
Gavin Bisesi
|
73c963e9c4
|
Merge pull request #346 from ctrlaltca/servatrice_win32
Servatrice win32 fixes
|
2014-10-03 10:56:13 -04:00 |
|
Fabio Bas
|
871f5f7c94
|
use qWarning instead of std::err
|
2014-10-02 23:45:42 +02:00 |
|
Fabio Bas
|
8d8ccaad7f
|
use 4 spaces instead of tabs
|
2014-10-02 23:42:51 +02:00 |
|
Fabio Bas
|
37eaeaae13
|
servatrice: as a third choice, check for a config in /etc/servatrice/
|
2014-10-02 23:41:24 +02:00 |
|
Fabio Bas
|
85a4a94ba3
|
win32: Avoid wiping server.log on upgrade
|
2014-10-02 23:26:25 +02:00 |
|
Fabio Bas
|
b348068369
|
Servatrice: Add a default option for every config value
add an empty room swell, if none had been defined in the config (or we
are running with no config at all)
|
2014-10-02 23:11:49 +02:00 |
|
Fabio Bas
|
4b38187d20
|
Fix logfile option in servatrice.ini
servatrice was using hardcocded filename “server.log” even if a custom
value was specified
|
2014-10-02 23:00:17 +02:00 |
|
Fabio Bas
|
8b32e51cab
|
win32 NSIS installer: uninstall servatrice*
just avoid deleting servatrice.ini, if the user manually made one from
the servatrice.ini.example
|
2014-10-02 22:46:46 +02:00 |
|
Fabio Bas
|
a1b6600fe1
|
Servatrice: group all the use of QSettings in a single file
and add a method to guess the path of servatrice.ini
|
2014-10-02 22:37:50 +02:00 |
|
Matt Lowe
|
93af823b2e
|
Logo and card back refresh
~ Updated the back of the card, cleaner lines, slightly more modern.
~ Updated game icon/logo
|
2014-10-02 21:01:45 +02:00 |
|
Gavin Bisesi
|
277aba79dc
|
Merge pull request #336 from poixen/master
Tokens use PT levels from cards.xml if available
|
2014-10-02 15:00:17 -04:00 |
|
Gavin Bisesi
|
48817ed283
|
Merge pull request #314 from ctrlaltca/win32_setup_fix
Fix oracle under windows
|
2014-10-02 10:35:22 -04:00 |
|
Gavin Bisesi
|
9e63c7fa35
|
Merge pull request #313 from pliu037/oracle-error-msg
Oracle error message
|
2014-10-02 10:35:05 -04:00 |
|
Gavin Bisesi
|
3c598531ed
|
Merge pull request #342 from acron0/auto-connect-fix
[Issue 340] Changed 'value' to 'setValue' in settingsCache.cpp
|
2014-10-02 10:06:47 -04:00 |
|
Gavin Bisesi
|
263b5a40f5
|
Merge pull request #341 from ctrlaltca/servatrice_install_configs
Servatrice: install example ini and sql schema file
|
2014-10-02 10:06:03 -04:00 |
|
Gavin Bisesi
|
283bac0b80
|
Merge pull request #339 from ctrlaltca/qt5_no_libgcrypt
Drop libgcrypt dependency for qt5
|
2014-10-02 10:05:17 -04:00 |
|
Antony Woods
|
1f58f7d848
|
Changed 'value' to 'setValue' on line 275
|
2014-10-02 08:48:04 +01:00 |
|
Fabio Bas
|
7afdff1b3b
|
Servatrice: install example ini and sql schema file
WIN: in the binary directory
OSX: in the app bundle’s Resources subdirectory
LINUX: in $PREFIX/share/servatrice
|
2014-10-02 08:34:21 +02:00 |
|
Gavin Bisesi
|
55b20343e9
|
Note that libgcrypt is needed only for qt4
|
2014-10-01 16:30:19 -04:00 |
|
Fabio Bas
|
355de8fba4
|
Drop libgcrypt dependency for qt5
|
2014-10-01 20:21:22 +02:00 |
|
Gavin Bisesi
|
b32aeb2211
|
Merge pull request #280 from pliu037/remove-.full-req
Support images without .full suffix
|
2014-10-01 13:50:02 -04:00 |
|
Matt Lowe
|
e3a94ecca3
|
Token PT is now set to DB values if not defined in event.
|
2014-10-01 19:20:42 +02:00 |
|
Gavin Bisesi
|
7eed007f14
|
Merge pull request #281 from ctrlaltca/fix_202
Fix crash #202
|
2014-09-30 20:35:11 -04:00 |
|
Matt Lowe
|
a80ccd882c
|
Tokens use PT levels from cards.xml if available
I added a check to see if the event PT is empty, if it is, we try and
use the PT from the cards.xml. In resp to issue #330.
|
2014-10-01 00:57:07 +02:00 |
|
Gavin Bisesi
|
9752dcf495
|
Merge pull request #332 from ctrlaltca/sideboard-helpers
Sideboard helpers
|
2014-09-30 13:46:43 -04:00 |
|
Fabio Bas
|
eaad8de8d0
|
Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers
|
2014-09-29 18:25:10 +02:00 |
|
Gavin Bisesi
|
b5de708756
|
Merge pull request #289 from acron0/auto-connect
Added 'auto connect' checkbox to connect dialog.
|
2014-09-29 10:24:06 -04:00 |
|
Gavin Bisesi
|
ab7f354e36
|
Merge pull request #318 from catmanjan/master
Change default scry to 1.
|
2014-09-19 10:22:04 -04:00 |
|