Matthew Lowe
|
b131b3847d
|
Merge ef919dda4d into 3c0a09bf5c
|
2014-10-08 12:55:50 +00:00 |
|
Gavin Bisesi
|
3c0a09bf5c
|
Merge pull request #361 from woogerboy21/servatrice-dbtable-fix
correct _room db table, add _rooms_gametypes table
|
2014-10-08 08:50:00 -04:00 |
|
Gavin Bisesi
|
602fa25321
|
Merge pull request #359 from ctrlaltca/servatrice_reguser_fixes
Servatrice reguser fixes
|
2014-10-08 08:41:13 -04:00 |
|
woogerboy21
|
9cd1a5b33f
|
correct _room db table, add _rooms_gametypes table
Corrected table column in _rooms db table and added _rooms_gametypes
table.
|
2014-10-07 14:49:24 -04:00 |
|
Fabio Bas
|
22af789c9e
|
Servatrice: log to console authentication method on startup
|
2014-10-07 17:04:22 +02:00 |
|
Fabio Bas
|
15555c16fd
|
Fix servatrice's regonly mode
|
2014-10-06 22:56:09 +02:00 |
|
Gavin Bisesi
|
faa66e4d7f
|
Merge pull request #355 from ctrlaltca/servatrice_passwordauth
Servatrice password authentication
|
2014-10-06 15:56:41 -04:00 |
|
Fabio Bas
|
0d35488c21
|
Added schema for _rooms table
|
2014-10-06 21:49:38 +02:00 |
|
Fabio Bas
|
01bd26d228
|
Misc typos fixing
|
2014-10-06 21:44:20 +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 |
|
Matt Lowe
|
ef919dda4d
|
Servatrice logo
+ added resources needed for servatrice logo
~ updated CMakeLists.txt to include the new resources
|
2014-10-05 21:09:14 +02:00 |
|
Matt Lowe
|
9f46f02ebd
|
Merge remote-tracking branch 'upstream/master'
|
2014-10-05 21:06:42 +02:00 |
|
Fabio Bas
|
91dafdb3e8
|
Move server network settings to the bottom and add a disclaimer
|
2014-10-04 18:21:07 +02:00 |
|
Fabio Bas
|
29cf353913
|
Give servatrice example configuration some love
added "password" settings
commented all settings
|
2014-10-04 17:51:27 +02:00 |
|
Fabio Bas
|
0d9eec4b64
|
Servatrice: added authentication type "password"
|
2014-10-04 17:50:01 +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 |
|
Fabio Bas
|
0261862b1b
|
Fix configuration loading
|
2014-10-04 10:33:55 +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 |
|