Commit Graph
3611 Commits
Author SHA1 Message Date
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
Evgeni Golov c63180a7af fix "recieve" typo in various places 2013-10-13 18:28:55 +02:00
doitux 394d721b15 Merge remote-tracking branch 'origin/master' 2013-10-12 15:48:25 +02:00
doitux 881e76921c changelog for beta2 2013-10-12 15:47:35 +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 d142bc8cdc update mymenubar removed from pokerth_game.pro 2013-10-10 08:47:47 +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 1913947ec4 Updating changelog for 1.1 beta1 2013-10-06 16:58:09 +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
doitux c4209fd5c0 move join and create game buttons back to original positions 2013-10-05 10:25:01 +02:00
doitux 3710f94c1e bugfix refreshSpectatorsDisplay(); threadsafe now 2013-10-05 00:34:54 +02:00
doitux 947c3e4c94 bugfix for android 2013-10-04 22:36:22 +02:00
doitux 1e23bca665 remove join any game button - add spectator link to pokerth-live 2013-10-04 21:32:24 +02:00
lotodore 04abfb658d WebSocket protocol support can now be configured and is only used in the dedicated server. 2013-10-03 00:41:07 +02:00
lotodore d23cc87c93 Adding missing license files. 2013-10-02 23:58:47 +02:00
lotodore 0d5cf28c9a Adding websocketpp 0.3 as third party lib (source: https://github.com/zaphoyd/websocketpp ) 2013-10-02 23:57:21 +02:00
lotodore 1965665524 Removing unused variable. 2013-09-30 23:36:49 +02:00
lotodore c8739ccd47 Adding limitation for the number of spectators per game. 2013-09-30 23:36:32 +02:00
doitux 6a3b13e753 make cppcheck happy again ;) 2013-09-30 22:21:30 +02:00
doitux 972ab5e2ee implement spectator display on the table to check if spectators watching the current game (#196) 2013-09-30 10:23:51 +02:00
doitux 4f8028aa0b Merge remote-tracking branch 'origin/master' 2013-09-29 23:05:38 +02:00
doitux d822130255 add spectator image 2013-09-29 22:24:16 +02:00
lotodore d82c9a510d Add spectator list during the game (when lobby messages are disabled). 2013-09-29 13:15:37 +02:00
lotodore 8baecdf9e0 Send spectator list to joining players. 2013-09-28 18:58:43 +02:00
lotodore a304903883 Send dealer player id with each hand start message. 2013-09-24 23:40:10 +02:00
doitux 14bf950471 revert group/checkbox try 2013-09-22 01:11:07 +02:00
doitux 07336778c5 try a gui bugfix for checkable groupboxes 2013-09-22 00:43:11 +02:00
doitux 7a782a845e QMenubar gui bugfix 2013-09-22 00:06:33 +02:00