Commit graph

1786 commits

Author SHA1 Message Date
Gavin Bisesi
67db347d12 Merge pull request #366 from poixen/removeoldimages
Resource cleanup
2014-11-05 15:31:17 -05:00
Gavin Bisesi
a051133af9 Merge pull request #397 from woogerboy21/patch-1
Correct gametype primary key
2014-11-03 10:22:24 -05:00
Gavin Bisesi
1d7850fff8 Merge pull request #406 from ctrlaltca/fix_405
Fix for #405
2014-10-29 09:53:21 -04:00
Fabio Bas
9cfb09cd5b Possible fix for #405 2014-10-28 16:30:49 +01:00
woogerboy21
950fc01363 Correct gametype primary key
Updated rooms_gametype to reflect proper column as primary key.
2014-10-24 21:02:45 -04:00
Gavin Bisesi
07cccda17b Merge pull request #377 from poixen/newhandsvg
Updated hand.svg
2014-10-20 10:28:58 -04:00
Gavin Bisesi
d264191ee6 Merge pull request #381 from poixen/abstractcarddragitemcleanup
Removed inline logic
2014-10-17 15:07:04 -04:00
Matt Lowe
80fd0fbcf3 Removed inline logic
Removed inline logic to static variable, slight performance increase.
2014-10-17 00:17:44 +02:00
Gavin Bisesi
2a15b9c95a Merge pull request #376 from ctrlaltca/oh_my_sounds
Fix sounds under windows and osx (fix #356)
2014-10-16 11:32:30 -04:00
Matt Lowe
03f79887c4 Updated Hand image
Looking at the client I saw the cockatrice was still on the card back. I
have now removed it.
2014-10-14 22:43:14 +02:00
Fabio Bas
e0d76b60d0 Change button label and made it translatable 2014-10-14 22:02:42 +02:00
Fabio Bas
82a3deec30 Add a button in the sounds settings to play a test sound 2014-10-14 21:13:16 +02:00
Fabio Bas
9ef4d79c33 Install the audio/* plugins under windows and osx 2014-10-14 21:13:04 +02:00
Gavin Bisesi
8dbb2d8e6f Merge pull request #364 from ctrlaltca/win32_openssl_cmake
Deploy openssl libraries under win32
2014-10-14 14:03:32 -04:00
Gavin Bisesi
592bb7c8f1 Merge pull request #368 from ctrlaltca/servatrice_linux_menu_entry
Servatrice linux menu entry
2014-10-14 11:58:50 -04:00
Gavin Bisesi
ae7cdc1c23 Merge pull request #375 from Daenyth/revert-260-master
Revert "Find cards by prefix"
2014-10-14 11:57:41 -04:00
Gavin Bisesi
a26d4078cc Revert "Find cards by prefix" 2014-10-14 11:28:30 -04:00
Fabio Bas
754b97f212 Servatrice: open in a terminal window when started from the menu 2014-10-11 13:38:07 +02:00
Fabio Bas
c0abb347ac Servatrice: Install icons and desktop file under linux 2014-10-11 13:37:52 +02:00
Matt Lowe
299283aa2e Resource cleanup
Removed some unused resource files.
2014-10-10 23:00:05 +02:00
Fabio Bas
ea622a7302 NSIS: uninstall openssl libraries 2014-10-10 17:22:39 +02:00
Fabio Bas
dfb8be79cf Fix installation of libeay32.dll, ssleay32.dll while compiling the PACKAGE target 2014-10-10 17:22:29 +02:00
Fabio Bas
ef7fc01f08 Fix typos 2014-10-10 14:26:52 +02:00
Gavin Bisesi
ca60a469eb Merge pull request #363 from woogerboy21/win_servatrice_icon
Servatrice Icon For Windows
2014-10-10 08:25:51 -04:00
Fabio Bas
90e90b59a3 Reverted WITH_SERVER to OFF 2014-10-10 14:23:31 +02:00
Fabio Bas
6f25e09132 Deploy openssl libraries under win32
They are needed to fetch prices from deckbrew and possibly, in the
future, for ssl server connections
2014-10-10 14:12:30 +02:00
woogerboy21
692910f9f3 Servatrice Icon For Windows
Servatrice icon now gets created in windows start menu.
2014-10-09 15:25:06 -04:00
Gavin Bisesi
6810ae46d6 Merge pull request #260 from Mawu3n4/master
Find cards by prefix
2014-10-09 11:29:02 -04:00
Gavin Bisesi
4070ba8e26 Merge pull request #352 from poixen/image-refresh
Image refresh
2014-10-09 11:27:47 -04:00
Gavin Bisesi
0f5f82d492 Merge pull request #358 from poixen/serverlogo2
Servatrice logo
2014-10-09 11:27:15 -04:00
Matt Lowe
359714214d Added .desktop file 2014-10-08 18:46:31 +02: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
Matt Lowe
90c2101a43 Removed png file 2014-10-07 16:50:19 +02:00
Matt Lowe
4866e94c86 Renamed resources
+ renamed the resources to servatrice.*
2014-10-07 16:49:40 +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
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
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
0261862b1b Fix configuration loading 2014-10-04 10:33:55 +02:00
Matt Lowe
e240e47d2f Fixed svg for icon
For some reason there was an issue with making the creature image white,
i found a workaround. Icon should now display correctly.
2014-10-03 19:02:40 +02:00
Matt Lowe
7cdd2a26f6 Icon changes
+ added updated mac icon that was missing
~ resized cockatrice.png
2014-10-03 19:02:27 +02:00
Matt Lowe
294edb3295 Logo and card back refresh
~ Updated the back of the card, cleaner lines, slightly more modern.
~ Updated game icon/logo
2014-10-03 19:02:12 +02:00