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

1732 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Lowe
5b50aa0f0a Servatrice logo 
+ added resources needed for servatrice logo
~ updated CMakeLists.txt to include the new resources
 2014-10-06 21:04:37 +02:00
Gavin Bisesi
006451f402 Merge pull request #238 from arxanas/no-overwrite-tokens-xml 
Fix #231: tokens.xml no longer overwritten by cards.xml.
 2014-10-06 11:34:58 -04: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
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
Jan Martin
6f97e59c03 Change default scry to 1. 2014-09-19 21:41:57 +10:00
Fabio Bas
98e5211ad5 Fix oracle under windows 2014-09-15 16:15:27 +02:00
Peng Liu
3cd6cc9195 Added the location Oracle attempted to save cards.xml to the failure message. 2014-09-15 06:32:46 -04:00
Yuki Izumi
fefb6fc612 Add sideboard helpers. 2014-09-11 12:56:27 +10:00
Antony Woods
f1b012c83d Adding modified translation files 2014-09-09 17:30:37 +01:00
Antony Woods
dbe46084ac Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect 2014-09-09 17:22:55 +01:00
Gavin Bisesi
2aeecc6063 Add note about tech support 2014-09-09 12:04:06 -04:00
Gavin Bisesi
fce1d6ac3f Change Qt4 to Qt4+5 in readme 2014-09-08 14:46:27 -04:00
Gavin Bisesi
64791b45f6 Add note on updating translations. 2014-09-08 14:46:01 -04:00
Gavin Bisesi
3c7abecac6 Merge pull request #292 from ctrlaltca/cmake_translations 
Add a UPDATE_TRANSLATIONS option
 2014-09-08 09:38:55 -04:00
Fabio Bas
d6b97976f9 Refreshed all translation files 2014-09-06 10:40:23 +02:00
Fabio Bas
a0b35ee60b Cockatrice - CMake: Include all existing translation files using a glob 2014-09-06 10:38:59 +02:00
Fabio Bas
e5eda9f172 Add a UPDATE_TRANSLATIONS options that actually updates translations! 2014-09-04 16:15:01 +02:00
Gavin Bisesi
8c072224c8 Move travis ci badge to Building section 2014-09-03 17:53:32 -04:00
Gavin Bisesi
d93cb0a637 Add link to Gitter chat 2014-09-03 17:52:31 -04:00
Antony Woods
ab83d6185a 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-08-29 16:53:30 +01:00
Antony Woods
b381298981 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-08-27 21:25:11 +01:00
Gavin Bisesi
6f319c8b63 Merge pull request #286 from jturner/fix-build 
Remove invalid character
 2014-08-19 20:31:41 -04:00
James Turner
f06d2123fc Remove invalid character 2014-08-19 17:39:05 -04:00
Gavin Bisesi
59b8d7044a Merge pull request #285 from pliu037/fix-oracle-save 
Fixed Oracle save bug
 2014-08-15 09:24:22 -04:00
Peng Liu
9a934f3a43 Fixed a bug that caused Oracle to be stuck in an infinite loop if the default path checkbox was checked but failed to write. 2014-08-15 01:09:21 -04:00