 lotodore
|
3cbb365c61
|
Don't let a websocket login kick a normal login.
|
2014-02-15 23:15:27 +01:00 |
|
 doitux
|
4ddc972d73
|
Merge pull request #266 from Gallaecio/gl
Updated the Galician (gl) translation
|
2014-02-01 10:57:40 -08:00 |
|
 Adrián Chaves Fernández (Gallaecio)
|
24b26fd3c7
|
Updated the Galician (gl) translation
|
2014-02-01 19:55:55 +01:00 |
|
|
lotodore
|
13d558e6ef
|
Preparing Release 1.1.1.
|
2014-01-10 21:48:01 +01:00 |
|
|
doitux
|
1fe5480b63
|
Bugfix for #253 (Grafik not proper rebuild after change settings)
|
2014-01-10 00:14:24 +01:00 |
|
|
doitux
|
e16f949ccd
|
Merge remote-tracking branch 'origin/master'
|
2014-01-09 23:20:57 +01:00 |
|
|
doitux
|
281d9aa212
|
make qt4 build easier
|
2014-01-09 23:20:17 +01:00 |
|
|
lotodore
|
d7cd43a79d
|
Merge branch 'master' of github.com:/pokerth/pokerth
|
2014-01-08 22:27:51 +01:00 |
|
|
lotodore
|
0f23bf0105
|
Invoke ping callback only if a new ping value has been added.
|
2014-01-08 22:27:10 +01:00 |
|
|
doitux
|
764c7765bc
|
Merge remote-tracking branch 'origin/master'
|
2014-01-08 09:44:38 +01:00 |
|
|
doitux
|
ecbf1acea6
|
correct ping display also if average ping is 0ms in network games
|
2014-01-08 09:44:20 +01:00 |
|
|
lotodore
|
8db313d555
|
Fix for possible division by zero while calculating average ping (#258).
|
2014-01-07 22:52:08 +01:00 |
|
|
doitux
|
2144791cac
|
hopefully final fix for #242 (Menu on gametable is not clickable sometimes)
|
2014-01-07 16:05:54 +01:00 |
|
|
doitux
|
d77def152d
|
compile fix etc
|
2013-12-22 15:24:31 +01:00 |
|
|
lotodore
|
803dcdc402
|
Updating changelog again.
|
2013-12-22 14:28:54 +01:00 |
|
|
lotodore
|
4762f9f7ca
|
Preparing release 1.1
|
2013-12-22 13:41:53 +01:00 |
|
|
doitux
|
c6b6577cd7
|
Translation release update for 1.1 final
|
2013-12-22 11:26:50 +01:00 |
|
|
doitux
|
4739be12f8
|
some more gui tweaks for android
|
2013-12-22 11:23:59 +01:00 |
|
|
doitux
|
2005c2f9de
|
Merge remote-tracking branch 'origin/master'
|
2013-12-22 11:22:00 +01:00 |
|
|
doitux
|
c3a5475a1b
|
some gui tweaks concerning android package
|
2013-12-22 11:21:40 +01:00 |
|
|
doitux
|
ea5aee5a73
|
Merge pull request #250 from wopfel/master
German translation (DE)
|
2013-12-21 13:57:23 -08:00 |
|
 Bernd Arnold
|
96f6703dcd
|
German translation (DE)
Updated strings for PokerTH 1.1 FINAL
|
2013-12-21 18:02:53 +01:00 |
|
|
lotodore
|
6042d68454
|
Running astyle.
|
2013-12-19 14:27:24 +01:00 |
|
|
lotodore
|
2bc3567485
|
Merge branch 'master' of github.com:/pokerth/pokerth
|
2013-12-19 12:32:09 +01:00 |
|
|
lotodore
|
aa22d39d77
|
Fix for libgcrypt 1.6.0 compile error #247 (supported only on Linux because libgcrypt does not yet support native Windows threads).
|
2013-12-19 12:28:35 +01:00 |
|
|
doitux
|
32e4f45d8f
|
Merge pull request #249 from gunchleoc/master
GD - New strings for 2.1
|
2013-12-19 03:22:45 -08:00 |
|
 GunChleoc
|
d593af65d2
|
gd translation, new strings for 2.1
|
2013-12-19 10:42:00 +00:00 |
|
|
GunChleoc
|
dd468011d2
|
Merge branch 'master' of https://github.com/pokerth/pokerth.git
Conflicts:
ts/pokerth_gd.ts
|
2013-12-19 10:41:29 +00:00 |
|
|
lotodore
|
30d5b2b578
|
Revert "Fix for libgcrypt 1.6.0 compile error #247 (Linux only, probably does not work on Windows)."
This reverts commit a5b863f1fd.
|
2013-12-19 11:24:55 +01:00 |
|
|
lotodore
|
cd3a410357
|
Merge branch 'master' of github.com:/pokerth/pokerth
|
2013-12-19 11:09:22 +01:00 |
|
|
lotodore
|
a5b863f1fd
|
Fix for libgcrypt 1.6.0 compile error #247 (Linux only, probably does not work on Windows).
|
2013-12-19 11:08:16 +01:00 |
|
|
doitux
|
f3a40d8e97
|
Merge pull request #248 from enjolras/master
Updated Spanish translation to 1.1 final
|
2013-12-18 22:23:27 -08:00 |
|
 Miguel Revilla
|
08b8ca7695
|
Updated Spanish translation to 1.1 final
|
2013-12-19 02:29:30 +01:00 |
|
|
doitux
|
2aa0617d18
|
string freeze for 1.1 final - translations welcome ;-)
|
2013-12-18 23:31:51 +01:00 |
|
|
doitux
|
416b37f657
|
fixed strings for network state display config options
|
2013-12-18 23:23:23 +01:00 |
|
|
doitux
|
b7bd04c176
|
Merge remote-tracking branch 'origin/master'
|
2013-12-18 23:21:52 +01:00 |
|
|
doitux
|
678d81bb97
|
final position for network state display
|
2013-12-18 23:21:35 +01:00 |
|
|
lotodore
|
fae5932dfc
|
Updating asio to latest revision.
|
2013-12-17 15:41:28 +01:00 |
|
|
doitux
|
70bf285fc4
|
Implement #56 unignore player from context menu
|
2013-12-12 00:31:42 +01:00 |
|
|
doitux
|
3997a40f09
|
gui part for #239 server ping state display
|
2013-12-11 15:54:29 +01:00 |
|
|
doitux
|
7fb8a8e948
|
Merge remote-tracking branch 'origin/master'
|
2013-12-11 10:22:33 +01:00 |
|
|
doitux
|
e40dc258a0
|
maybe final windows test for #202
|
2013-12-11 10:22:15 +01:00 |
|
|
lotodore
|
5249a355d6
|
Merge branch 'master' of github.com:/pokerth/pokerth
|
2013-12-10 21:30:00 +01:00 |
|
|
lotodore
|
3285c83973
|
Disable rejoin-multi test for now as it fails sometimes for unknown reasons.
|
2013-12-10 21:29:39 +01:00 |
|
|
doitux
|
b79dcf4437
|
update afrikaans translation
|
2013-12-10 10:49:12 +01:00 |
|
|
doitux
|
7d7038f9bf
|
next try for #202
|
2013-12-10 00:04:49 +01:00 |
|
|
doitux
|
d1db789e49
|
Merge remote-tracking branch 'origin/master'
|
2013-12-09 08:28:52 +01:00 |
|
|
doitux
|
8a085d419c
|
Test for fixing #202
|
2013-12-09 08:28:36 +01:00 |
|
|
lotodore
|
0d60360fca
|
Update server ping with each game action (#239).
|
2013-12-08 12:20:51 +01:00 |
|
|
doitux
|
e58545b001
|
Merge pull request #245 from Gallaecio/gl
Updated the Galician (gl) translation
|
2013-12-06 09:50:10 -08:00 |
|