woogerboy21
94942e1a92
Commit to resolve requests made by @Daenyth discussed after the commit.
...
See https://github.com/Cockatrice/Cockatrice/pull/1340 for details.
2015-08-08 08:52:19 -04:00
woogerboy21
62dc3a7ca3
Merge pull request #1342 from marcofernandezheras/CardInfoLayout
...
Deck Editor layout
2015-08-08 08:28:12 -04:00
marco
e9e75961f4
Redesigning deck editor to work with docks
...
Moved setting files & Added code for a future portable build
2015-08-07 23:44:40 +02:00
woogerboy21
ba90d84a13
Merge pull request #1340 from woogerboy21/clientid
...
Client ID Generation
2015-08-06 14:17:06 -04:00
poixen
5a541d6248
Merge pull request #1341 from tooomm/patch-2
...
removed space
2015-08-06 11:34:04 +02:00
tooomm
94d4ff8c1b
removed space
2015-08-06 10:11:00 +02:00
woogerboy21
52db13a1ca
Initial release of client ID generation.
2015-08-05 10:15:49 -04:00
Zach
44d757f691
Merge pull request #1328 from marcofernandezheras/FixBug#1296
...
Ctrl + Double Click: Add card to SB
2015-08-03 22:47:32 -04:00
marco
0d10d6f85d
Fixes issue #1296
2015-08-04 00:17:44 +02:00
woogerboy21
13011180f7
Merge pull request #1313 from woogerboy21/update_pingtime
...
Update Client & Server ping time
2015-08-03 12:31:20 -04:00
Zach
dfb7847dab
Update README.md
2015-08-01 21:45:14 -04:00
Zach
c28da9f066
Merge pull request #1321 from ZeldaZach/readme
...
README fix
2015-08-01 21:35:41 -04:00
Zach H
ee6020ab8c
url fix
2015-08-01 21:35:21 -04:00
ctrlaltca
4b5fb30248
Merge pull request #1318 from ctrlaltca/fix_linking_faq_url
...
Fix "Linking FAQ" url
2015-08-01 11:18:16 +02:00
ctrlaltca
622e018cd4
Merge pull request #1320 from ctrlaltca/translations
...
Updated translations
2015-08-01 11:18:04 +02:00
Fabio Bas
7e7c0ef4d2
Updated translations
2015-08-01 10:55:06 +02:00
Fabio Bas
6dfd2e65f6
Fix "Linking FAQ" url
2015-08-01 08:07:47 +02:00
ctrlaltca
8d2cd29a3f
Merge pull request #1308 from ZeldaZach/fix_1301
...
Allow URL redirects for card images
2015-08-01 07:59:58 +02:00
Zach
da48b71442
Merge pull request #1310 from ctrlaltca/emails
...
Servatrice: do not disclose user emails to clients
2015-07-31 10:57:52 -04:00
woogerboy21
eb9ca58fd0
Updated pingClockTimeout to account for adjustments in client keep alive settings value.
...
Changed the default value for the client keep alive variable back to 1 (since that is what the setting is if the value is not found in the configuration ini file).
2015-07-30 16:38:02 -04:00
woogerboy21
8c7301b19f
Updated server and client ping to 5 seconds. Also changed hard set 1 second value on the ping timers to read values from the settings cache.
2015-07-29 23:44:00 -04:00
Fabio Bas
8d325b9e19
Servatrice: do not disclose user emails to clients
2015-07-28 22:20:40 +02:00
Zach H
8a86165890
allow URL redirects
2015-07-28 02:41:08 -04:00
Zach
183fbd2805
Merge pull request #1305 from poixen/appname
...
Changed app title when logged in
2015-07-27 19:51:24 -04:00
Matt Lowe
46f28f92b6
Changed app title when logged in
...
As seen in this image, you cant see where you are logged in.
How it looks now:
2015-07-27 16:19:19 +02:00
Zach
c0bb640a37
Merge pull request #1295 from ctrlaltca/servatrice_email_v2
...
Refactor servatrice email send
2015-07-26 21:13:58 -07:00
Zach
9aa161575d
Merge pull request #1303 from ZeldaZach/fix_1069
...
fix 1032 merge conflicts
2015-07-26 21:12:50 -07:00
Zach H
475c54bfe1
fix 1032 merge conflicts
2015-07-27 00:01:05 -04:00
Zach
e318b70329
Merge pull request #1286 from ctrlaltca/disabled_sets
...
Prefer enabled sets when loading images
2015-07-26 12:10:00 -07:00
Zach
bd92f18e9d
Merge pull request #1293 from ctrlaltca/fix_1289
...
Force black text color on deck list
2015-07-26 12:05:52 -07:00
Fabio Bas
a001238b74
Force cache clear on sets database save.
2015-07-26 11:46:09 +02:00
Zach
ac4c745521
Merge pull request #1294 from mildmongrel/tablezone_refactor_001
...
tablezone refactor and cleanup
2015-07-25 22:45:06 -07:00
Zach
387137fbc7
Merge pull request #1292 from ctrlaltca/fix_compile_debug
...
fix compilation with gcc in paranoic mode
2015-07-25 22:37:18 -07:00
Zach
f3ee1eac12
Merge pull request #1287 from ctrlaltca/servatrice_db_version
...
Fix misleading error message in servatrice; fix #1275
2015-07-25 22:36:01 -07:00
Zach
f1b7a422ee
Merge pull request #1284 from ctrlaltca/fix_1283
...
Fix calculation of ban expiration
2015-07-25 22:19:58 -07:00
Zach
c675cf4010
Merge pull request #1272 from Fizztastic/fix_577
...
Joining a full game joins you as spectator
2015-07-25 22:16:00 -07:00
Fabio Bas
9c38b08407
Again on the same problem
2015-07-25 19:51:32 +02:00
Fabio Bas
c714932e25
Fix compilation under OSX with homebrew's qt5.5
2015-07-25 19:28:30 +02:00
Fabio Bas
1ffc9b4561
Refactor servatrice email send
2015-07-25 18:48:34 +02:00
mildmongrel
ba50025e80
tablezone refactor and cleanup
2015-07-24 16:15:08 -07:00
Fabio Bas
800a17e483
Force black text color on deck list; fix #1289
2015-07-24 19:35:31 +02:00
Fabio Bas
119871d114
fix compilation with gcc in paranoic mode
...
deckview.cpp:244:6: warning: no previous declaration for 'bool
sortCardsByName(DeckViewCard*, DeckViewCard*)' [-Wmissing-declarations]
2015-07-24 19:29:06 +02:00
ctrlaltca
903292ad3b
Merge pull request #1288 from ctrlaltca/travis_qt5_homebrew
...
Hack to make travis always detect the installed qt5 version
2015-07-22 21:30:15 +02:00
Fabio Bas
713fa92c65
Hack to make travis always detect the installed qt5 version
2015-07-22 18:04:56 +02:00
Fabio Bas
946410de2b
Fix misleading error message in servatrice; fix #1275
2015-07-22 17:51:30 +02:00
Fabio Bas
90655ff631
Prefer enabled sets when loading images; fix #1235
2015-07-22 17:35:44 +02:00
Fabio Bas
7f358d289e
Fix calculation of ban expiration; fix #1283
2015-07-21 22:32:31 +02:00
Jeff
3f22024281
Joining a full game joins you as spectator
2015-07-18 01:33:15 -04:00
ctrlaltca
0d5e169648
Merge pull request #1270 from ctrlaltca/fix_1269
...
Fix change flag in edit account; Fix #1269
2015-07-16 18:01:40 +02:00
Fabio Bas
c9e1585322
Fix change flag in edit account; Fix #1269
2015-07-16 17:59:28 +02:00
