Gavin Bisesi
|
52827573b0
|
Merge pull request #204 from ctrlaltca/master_issue_203
Fixes #203
|
2014-07-09 16:31:48 -04:00 |
|
Gavin Bisesi
|
ca5d719d7d
|
Merge pull request #200 from arxanas/4x-cardname
Fix #184: Deck loader reads 4x cardname correctly.
|
2014-07-09 11:50:33 -04:00 |
|
Fabio Bas
|
a6f299b247
|
fix #203
|
2014-07-09 17:42:35 +02:00 |
|
arxanas
|
04e80304ef
|
Fix #184: Deck loader reads 4x cardname correctly.
|
2014-07-08 22:56:18 -04:00 |
|
arxanas
|
4e8ba699d2
|
Tabs to spaces.
|
2014-07-08 22:53:02 -04:00 |
|
Gavin Bisesi
|
73e5e12c24
|
Merge pull request #199 from arxanas/remember-game-filter-preferences
Fix #137: Game filter preferences are saved.
|
2014-07-08 12:49:45 -04:00 |
|
arxanas
|
1217689ed6
|
Hash the game type.
|
2014-07-07 19:04:01 -04:00 |
|
arxanas
|
8141901679
|
Fix #137: Game filter preferences are saved.
|
2014-07-07 17:41:16 -04:00 |
|
Gavin Bisesi
|
7f77082466
|
Merge pull request #151 from ctrlaltca/master_input_focus
Focus the Input line in chat when convenient (fixes #113)
|
2014-07-03 10:34:21 -04:00 |
|
Fabio Bas
|
6f18e3692d
|
Chat room: ensure the line input has focus when the window gets created
|
2014-07-03 15:57:40 +02:00 |
|
Gavin Bisesi
|
e198f775dc
|
Merge pull request #168 from woogerboy21/servatrice-shellmaint-scripts
DB Maint Scripts
|
2014-07-02 17:56:32 -04:00 |
|
woogerboy21
|
9ba74fee5c
|
Example Update
Renamed mysql configuration file to include example extension and set
git to ignore mysql.cnf per request.
|
2014-07-02 13:23:50 -04:00 |
|
woogerboy21
|
b27873667b
|
Optimization
Updates for performance improvements per request
|
2014-07-02 11:11:17 -04:00 |
|
woogerboy21
|
2b55170110
|
DB Maint Scripts
External shell script to help maintain the cockatrice database tables.
|
2014-07-01 13:11:52 -04:00 |
|
Gavin Bisesi
|
fb4a7b3274
|
Give more friendly login error message
|
2014-07-01 12:04:33 -04:00 |
|
Gavin Bisesi
|
e955732ba8
|
Merge pull request #163 from arxanas/vanguard-card-names
Fix #155: Vanguard card names no longer conflict with regular card names.
|
2014-07-01 07:04:01 -04:00 |
|
arxanas
|
f730dca14c
|
Fix #155: Vanguard card names no longer conflict with regular card names.
|
2014-07-01 02:29:25 -04:00 |
|
Daenyth
|
4d6f46b06e
|
Change client ping send interval to 9 sec
|
2014-06-29 14:46:06 -04:00 |
|
Fabio Bas
|
d86fa410df
|
Chat room: ensure focus on the input line
|
2014-06-29 19:32:03 +02:00 |
|
Fabio Bas
|
27bd00bec8
|
Direct chat: ensure focus is on the input line; fixes #113
|
2014-06-29 19:29:45 +02:00 |
|
Daenyth
|
ec3690fd29
|
Fix typo in gcc opts
|
2014-06-28 11:04:12 -04:00 |
|
Daenyth
|
8d31fe6cbc
|
Clean up deck load chat message
|
2014-06-28 09:04:45 -04:00 |
|
Daenyth
|
4c2a553f03
|
Have servatrice inform players of sideboard size
Ref #142
|
2014-06-28 00:36:43 -04:00 |
|
Daenyth
|
c0bd7db658
|
Install libgcrypt on osx travis
|
2014-06-27 22:57:24 -04:00 |
|
Daenyth
|
38aa1f60ed
|
Don't pass warn/err flags for release mode build.
It's making travis complicated
|
2014-06-27 22:50:21 -04:00 |
|
Daenyth
|
6d3fe428e7
|
Fix some warnings
Ref #127
|
2014-06-27 22:19:23 -04:00 |
|
Daenyth
|
d3b4ef38a0
|
Compile servatrice on travis
|
2014-06-27 20:42:19 -04:00 |
|
Daenyth
|
6da64315d2
|
Merge branch 'pr138'
|
2014-06-27 20:00:46 -04:00 |
|
Daenyth
|
1d02e0d5ec
|
Clarify comment about typedef for OSX compiling
|
2014-06-27 20:00:29 -04:00 |
|
Gavin Bisesi
|
e258f8625a
|
Merge pull request #121 from woogerboy21/serverlog-filtering
Server log filtering
|
2014-06-27 19:02:30 -04:00 |
|
woogerboy21
|
f685bd2abe
|
formatting
4 space indent + code flow rewrite for easier readability.
|
2014-06-27 18:18:03 -04:00 |
|
arxanas
|
080fd326ed
|
Fixed #131: Compiles on OS X now.
|
2014-06-26 16:57:47 -04:00 |
|
woogerboy21
|
b83fe95b05
|
removed extra un-needed empty line.
removed extra un-needed empty line.
|
2014-06-26 14:46:22 -04:00 |
|
woogerboy21
|
365de1fdd0
|
added multiple filter capabilities
changed the single qstring log filtering to qstringlist to allow multiple filtering capabilities
|
2014-06-26 14:38:57 -04:00 |
|
woogerboy21
|
977cf7340a
|
settings update/addition
updated settings name (loglevel) to a more descriptive name (writelog)
added logfilters setting to allow user defined filters.
|
2014-06-26 00:40:21 -04:00 |
|
woogerboy21
|
91a96643f0
|
updated filtering code
rewrote filtering code to allow for user input
code only filters on single string at the moment (still needs updated).
|
2014-06-26 00:38:43 -04:00 |
|
Daenyth
|
fb7de2ad1d
|
Merge branch 'windows-nsis-fix'
|
2014-06-25 20:26:56 -04:00 |
|
Daenyth
|
144bb7fa89
|
Merge remote-tracking branch 'origin/invalid-windows-paths'
|
2014-06-25 20:26:46 -04: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 |
|
Gavin Bisesi
|
bda01b2044
|
Install dependencies for travis more generally
|
2014-06-25 11:48:48 -04:00 |
|
Gavin Bisesi
|
2d400e55c7
|
Add OSX build flag to travis yml
|
2014-06-25 11:33:40 -04:00 |
|
Gavin Bisesi
|
0e7a5e582c
|
Merge pull request #129 from VanNostrand/doc
Recompiled usermanual.
|
2014-06-25 10:12:12 -04:00 |
|
Mark Morschhäuser
|
312acb3402
|
Recompiled usermanual.
|
2014-06-25 09:16:00 +02:00 |
|
Daenyth
|
aee86ce45a
|
Mark QGraphicsItem for AbstractGraphicsItem
|
2014-06-25 01:53:19 -04:00 |
|
Daenyth
|
1c9540befa
|
Set cmake module path to local for findqtmobility
|
2014-06-25 01:48:30 -04:00 |
|
Daenyth
|
0eb00fe39c
|
Add build-essential to travis cfg
This can't be causing the failure can it? It can't find QtMultimedia..
|
2014-06-25 01:31:43 -04:00 |
|
Daenyth
|
5ea59908a8
|
Cache apt for travis
|
2014-06-25 01:29:06 -04:00 |
|
Daenyth
|
8a331e30c6
|
Don't install qtmultimedia - not needed
|
2014-06-25 01:24:14 -04:00 |
|
Daenyth
|
44445704e7
|
Install qt-multimedia-dev for travis
|
2014-06-25 01:21:24 -04:00 |
|
Daenyth
|
ba1fc86f29
|
Install qt dep for travis
|
2014-06-25 01:18:52 -04:00 |
|