Commit Graph
3651 Commits
Author SHA1 Message Date
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
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
Adrián Chaves Fernández (Gallaecio) 06786bec57 Updated the Galician (gl) translation 2013-12-06 17:31:36 +01:00
doitux 702d2921d2 Fix Android packages for 1.1 final #243 2013-12-06 13:53:24 +01:00
doitux 5b1354bdfa translation file update to avoid conflicts in github pull requests 2013-12-05 09:50:06 +01:00
doitux a7ef60b750 bugfix for #242 Menu on gametable is not clickable sometimes 2013-12-04 23:14:34 +01:00
doitux c204383adc next step for translation files 2013-12-04 23:13:55 +01:00
doitux 0af9c0d125 updated translation files 2013-12-04 23:13:27 +01:00
lotodore 0127099555 Merge branch 'master' of github.com:/pokerth/pokerth 2013-12-01 14:09:09 +01:00
lotodore 02c259a979 Preparing 1.1 beta4. 2013-12-01 14:08:33 +01:00
doitux 55ad77a7a8 BUGFIX: wrong sound while joining a v1.1 game (#230) 2013-11-24 21:27:08 +01:00
doitux f310b76bca gd translation update tested with 1.1 beta3 (#231) 2013-11-24 20:45:57 +01:00
doitux 60d9cc4501 Update for france translation files 2013-11-19 19:29:03 +01:00
doitux ea4a5e28e2 Update translation release files. The fresh translations are included for testing in beta4 2013-11-19 11:00:32 +01:00
doitux e13a1987eb Update translation sources for next beta4 release. Translated files already included 2013-11-19 10:59:16 +01:00
doitux 827ce4fee1 bugfix for #221 (Beep when message from ignored player) 2013-11-16 15:36:05 +01:00
doitux 044553fddb Add the number of spectators next to the spectator icon #206 2013-11-12 23:23:51 +01:00
doitux 7b3ec43bd1 Merge remote-tracking branch 'origin/master' 2013-11-12 16:57:48 +01:00
doitux 914974567d new icon for #217 2013-11-12 16:54:08 +01:00
doitux e6f9427dfa Merge pull request #218 from evgeni/master
look for libs in $$system(qmake -query QT_INSTALL_LIBS)
2013-11-10 10:55:17 -08:00
Evgeni Golov 6c5b79709f look for libs in $$system(qmake -query QT_INSTALL_LIBS) 2013-11-10 16:19:20 +01:00
lotodore 62ee15a4c8 Preparing 1.1 beta3. 2013-11-02 19:38:45 +01:00
lotodore 2c6a98e998 Consider new "allow spectators" game flag in server (#215) 2013-11-02 18:13:18 +01:00
lotodore 6992c732af Preparing "allow spectators" flag in network protocol (#215). 2013-10-27 00:41:13 +02:00
doitux 11a45cd6d6 fix a typo 2013-10-24 09:35:00 +02:00
doitux 45985d9175 Merge remote-tracking branch 'origin/master' 2013-10-24 09:13:10 +02:00
doitux 4647ceb452 gui preparation for allow spectators flag #215 2013-10-24 09:12:51 +02:00
lotodore aea8a6c2e9 Allow spectators to join invite-only games (for now) #214 2013-10-20 19:06:53 +02:00
lotodore fdccd7c85b Merge pull request #209 from evgeni/master
fix "recieve" typo in various places
2013-10-15 13:37:11 -07:00