arxanas
b1bfda9f4e
Merge remote-tracking branch 'upstream/master' into deck-parser-ampersand
...
Conflicts:
common/decklist.cpp
2014-07-19 18:12:49 -04:00
arxanas
0eb97c91b3
Fix #183 : Deck parser doesn't too eagerly replace ampersands.
2014-07-19 14:47:19 -04:00
arxanas
88e6d0d3eb
Tabs to spaces.
2014-07-19 14:28:46 -04:00
Gavin Bisesi
843eba817b
Merge pull request #194 from ctrlaltca/master_regression_180_tab
...
Room and Message tabs: focus input line when convenient; Fix #180
2014-07-13 09:16:06 -04:00
Gavin Bisesi
1137179b88
Add WITH_QT4 note to README
2014-07-13 09:08:32 -04:00
Gavin Bisesi
b15d8e076c
Merge pull request #209 from ctrlaltca/cpack_win_fixes
...
Cpack fixes for windows (fixes #207 )
2014-07-13 08:07:34 -04:00
Fabio Bas
23b0a6c0df
Windows + CPack: fix packaging
...
Package the correct cpack’s temporary directory
2014-07-12 01:38:00 +02:00
Fabio Bas
c07b53999d
Fix: ensure git is always run from the project directory
...
When trying to obtain the version hash
2014-07-12 00:11:48 +02:00
Fabio Bas
534b223545
Merge remote-tracking branch 'upstream/master' into master_regression_180_tab
2014-07-10 19:50:38 +02:00
Gavin Bisesi
f83d58309b
Merge pull request #126 from ctrlaltca/cmake_qt5
...
Qt5 support
2014-07-10 13:13:51 -04:00
Gavin Bisesi
86fa8f304d
Change client send-ping timer back to 1sec
...
9sec was causing too many timeout issues.
Timeout from both client and server perspective needs to be revisited
2014-07-09 19:06:31 -04:00
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
ea8c55b2c9
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-07-09 17:44:21 +02: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
Fabio Bas
d894c53265
Servatrice: fix handling of incoming connections on qt5
2014-07-08 22:05:06 +02: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
Fabio Bas
04ad73fcdc
Workaround for qt5 version compiled with -reduce-relocations
2014-07-06 23:25:44 +02:00
Fabio Bas
aead0843af
Room and Message tabs: focus input line when convenient; Fix #180
...
As suggest by Daenyth in #185
2014-07-06 14:28:48 +02:00
Fabio Bas
e9895d643f
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-07-03 16:40:04 +02: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
Fabio Bas
523483bccc
Add a WITH_QT4 cmake option to force the use of Qt4
2014-06-30 22:10:29 +02: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
Fabio Bas
052996b7a1
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-06-29 17:13:12 +02:00
Fabio Bas
c0981a1743
Prettier package name
2014-06-28 19:53:15 +02:00
Fabio Bas
3509df76b7
Remove old version parsing from nsis script
2014-06-28 19:48:51 +02:00
Fabio Bas
fc5a193e0d
NSIS: remove additional files on uninstall
2014-06-28 19:39:47 +02:00
Fabio Bas
fc24ffdec2
Cmake reorganization
...
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
2014-06-28 19:39:26 +02:00
Fabio Bas
e997b1d2bc
Windows: drop the old nsis script
...
cpack generates it on the fly from a template
2014-06-28 18:44:38 +02:00
Fabio Bas
803fd7c95d
Windows: Generate an nsis package on the fly with "make package"
2014-06-28 18:44:38 +02:00
Daenyth
ec3690fd29
Fix typo in gcc opts
2014-06-28 11:04:12 -04:00
ctrlaltca
29a7415f95
Merge pull request #3 from Daenyth/cmake_qt5
...
Fix merge conflicts with master in cmake_qt5
2014-06-28 15:27:51 +02:00
Daenyth
09d6d26fb2
Merge branch 'master' into cmake_qt5
...
Conflicts:
cockatrice/src/main.cpp
2014-06-28 09:13:10 -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
