Commit Graph
3022 Commits
Author SHA1 Message Date
doitux 4739be12f8 some more gui tweaks for android 2013-12-22 11:23:59 +01:00
doitux c3a5475a1b some gui tweaks concerning android package 2013-12-22 11:21:40 +01:00
lotodore 6042d68454 Running astyle. 2013-12-19 14:27:24 +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
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 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 e40dc258a0 maybe final windows test for #202 2013-12-11 10:22:15 +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 702d2921d2 Fix Android packages for 1.1 final #243 2013-12-06 13:53:24 +01:00
doitux a7ef60b750 bugfix for #242 Menu on gametable is not clickable sometimes 2013-12-04 23:14:34 +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 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 914974567d new icon for #217 2013-11-12 16:54:08 +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
Evgeni Golov c63180a7af fix "recieve" typo in various places 2013-10-13 18:28:55 +02:00
lotodore 2d1aca523f Incrementing beta-revision to prepare 1.1 beta2. 2013-10-12 11:14:13 +02:00
doitux dfea01882b bugfix for #203 local game menu bug 2013-10-12 00:41:46 +02:00
lotodore 0dcc43812d Merge branch 'master' of github.com:/pokerth/pokerth 2013-10-11 23:54:56 +02:00
lotodore 0368b57432 Updating websocket++ to latest github release (0.3 alpha4). 2013-10-11 23:54:30 +02:00
doitux 235b41acae remove unused mymenubar class 2013-10-10 00:24:08 +02:00
doitux 7ffd85b1c1 bugfix for "Idle players are not show correctly if they join YOUR game" #198 2013-10-09 23:45:57 +02:00
lotodore 2d6db51465 Origin check tolerates http:// and http://www. 2013-10-07 22:43:03 +02:00
lotodore f0f3d2eb04 Running astyle. 2013-10-06 16:30:09 +02:00
lotodore c8939fdbdf Preparing Release 1.1 beta1 2013-10-06 16:21:35 +02:00
doitux 7c17cfd751 Merge remote-tracking branch 'origin/master' 2013-10-05 19:35:06 +02:00
doitux b5e8a9ac99 add third party libs licence infos into about 2013-10-05 19:34:49 +02:00
lotodore a6f3536290 Enable validation according to WebSocket resource and origin. 2013-10-05 16:42:05 +02:00
lotodore 2c5dcc2ba0 Properly send game closed message to spectators. 2013-10-05 13:30:19 +02:00
lotodore 917f49c8bf Fixing missing if-block. 2013-10-05 13:10:40 +02:00
lotodore 38de2754e3 Merge branch 'master' of github.com:/pokerth/pokerth 2013-10-05 12:49:41 +02:00
lotodore bc7f34a2a6 Move spectators to lobby before closing a game. 2013-10-05 12:49:21 +02:00