Commit Graph
100 Commits
Author SHA1 Message Date
lotodore c406ee147b Merge pull request #303 from PJ-Finlay/updated-INSTALL
Fixed link and typo in INSTALL file
2016-02-21 00:11:46 +01:00
lotodore b309e9e43a Merge pull request #299 from jwakely/boost-fstream-ambiguity
Qualify std::ifstream and std::ofstream
2015-11-29 16:38:29 +01:00
lotodore 1d34288a91 Use owner_less for ordering of connection_hdl (see https://github.com/zaphoyd/websocketpp/issues/457) 2015-08-18 20:49:06 +02:00
lotodore 1034d4adf5 Correcting name of unit test file. 2015-02-01 23:08:19 +01:00
lotodore f04dac83c6 Adding websocket test to default unit tests. 2015-02-01 20:22:14 +01:00
lotodore a57c344b11 Adding unit test for WebSocket communication and fixing a bug found by the unit test. 2015-01-31 22:51:03 +01:00
lotodore 988d05e236 Removing deprecated go libs (was just a prototype). 2015-01-31 22:49:41 +01:00
lotodore 2252c180c0 Adding Java WebSocket lib for unit tests. 2015-01-31 22:48:58 +01:00
lotodore a2109df5e9 Updating websocketpp again to release 0.5.0 (because Windows build fails currently). 2015-01-24 12:30:04 +01:00
lotodore cc5998e863 Fixing compiler warnings. 2015-01-24 10:11:51 +01:00
lotodore 374048c5cd Updating websocketpp to latest git. 2015-01-24 10:10:04 +01:00
lotodore 83bbc660e1 Fixing remaining java tests. 2015-01-18 23:27:36 +01:00
lotodore 19bf312694 Fixing additional java tests. 2015-01-18 12:07:39 +01:00
lotodore 046a2fbdc3 More work on java tests. 2015-01-18 01:34:38 +01:00
lotodore eedd86e150 Fixing java tests and bugs found by tests. 2015-01-17 17:58:47 +01:00
lotodore 8a000bdc2b Fixing another cppcheck issue. 2015-01-14 22:07:44 +01:00
lotodore 6dff34a589 Remove asserts and make cppcheck happy. 2015-01-13 22:21:11 +01:00
lotodore 81ce13f3d7 Fixing bug due to issue #282 for Windows build. 2015-01-06 17:02:45 +01:00
lotodore bace7cd987 Workaround for issue #282 (should be backward compatible). 2015-01-06 15:55:29 +01:00
lotodore fa4df857e4 Fixing some of the java test cases. Still incomplete. 2015-01-06 00:37:23 +01:00
lotodore c24e8a3fa9 Fixing problem with subscription request message. 2015-01-03 12:38:33 +01:00
lotodore bd981dd581 Fix "create game" message. 2015-01-02 16:03:19 +01:00
lotodore 1f6c3d8ccf Builds with protocol changes (currently untested). 2014-12-28 01:03:06 +01:00
lotodore fdfba430b2 Builds with protocol changes (currently untested). 2014-12-28 01:01:52 +01:00
lotodore 47093976ca More work on new network protocol. 2014-08-19 18:19:17 +02:00
lotodore 88e5f600aa Merge branch 'new_local_game' of github.com:/pokerth/pokerth into gocode 2014-08-19 18:18:32 +02:00
lotodore 7eaa23b049 Server Umbau zwischenversion. 2014-07-13 13:48:01 +02:00
lotodore 171d05fdaf Merge branch 'new_local_game' of github.com:/pokerth/pokerth into gocode 2014-07-13 13:38:07 +02:00
lotodore f2f0c0a15e Merge branch 'master' of github.com:/pokerth/pokerth into gocode 2014-06-22 13:43:10 +02:00
lotodore 6058345c92 Adding first code for new go-based dedicated server. 2014-05-30 17:07:43 +02:00
lotodore c2fa235e80 Merge branch 'master' of github.com:/pokerth/pokerth 2014-05-10 21:07:15 +02:00
lotodore 36149eddfe Adding different error messages for connection failure with IPv6 (#276). 2014-05-10 21:06:50 +02:00
lotodore 316f2f43c3 Adding libboost-chrono dependency on Mac/Linux. 2014-03-29 20:33:21 +01:00
lotodore 757f12f35b Switching from asio deadline_timer to asio steady_timer in order to fix #55. This requires the (boost or native) chrono lib. 2014-03-29 16:13:53 +01:00
lotodore 3cbb365c61 Don't let a websocket login kick a normal login. 2014-02-15 23:15:27 +01:00
lotodore 13d558e6ef Preparing Release 1.1.1. 2014-01-10 21:48:01 +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
lotodore 8db313d555 Fix for possible division by zero while calculating average ping (#258). 2014-01-07 22:52:08 +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
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
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
lotodore fae5932dfc Updating asio to latest revision. 2013-12-17 15:41:28 +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
lotodore 0d60360fca Update server ping with each game action (#239). 2013-12-08 12:20:51 +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
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
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
lotodore 2d1aca523f Incrementing beta-revision to prepare 1.1 beta2. 2013-10-12 11:14:13 +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
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
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
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
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
lotodore 20eb7b94bd Fixing several compiler warnings. 2013-09-16 23:11:16 +02:00
lotodore c6c044b784 Fixing crash when sending data to a closed websocket connection. 2013-09-16 22:57:12 +02:00
lotodore 496a668a15 Fixing retrieval of remote webclient address for login blocker. 2013-09-16 22:33:52 +02:00
lotodore 07e0d6d798 Fixing typo in build file. 2013-09-15 23:27:27 +02:00
lotodore 84b9b56d6a Fixing gcc problem with EncodeToBuf-function. 2013-09-15 23:11:15 +02:00
lotodore 36eeaee5d7 Adding missing files for websocket implementation. 2013-09-15 23:06:15 +02:00
lotodore e6b165fe59 Merge branch 'master' of github.com:/pokerth/pokerth 2013-09-15 22:55:07 +02:00
lotodore 8e39432754 Adding websocket server code, so that a gateway is no longer required. Still kind of untested. Requires websocketpp. 2013-09-15 22:54:45 +02:00
lotodore eb571a8640 Automatically close games if only spectators are left. 2013-09-02 00:37:02 +02:00
lotodore eae6a6fae7 Trying to fix missing spectator left message when connection is closed. 2013-09-01 23:43:59 +02:00
lotodore e008ef9ad5 Send lobby etc. notifications also to players in state "spectator waiting". 2013-09-01 18:09:15 +02:00
lotodore 298aeaed4c Use Qt 5.1 features in cleaner server only if available. 2013-08-31 23:42:44 +02:00
lotodore fc829553d2 Clarify comment for Mac OS plugins. 2013-08-31 21:44:17 +02:00
lotodore f29efc2892 More Mac OS fixes for Qt5. 2013-08-31 21:37:06 +02:00
lotodore ec3c2eee84 Plugin directory fix for Qt5 Mac OS platforms. 2013-08-31 21:31:12 +02:00
lotodore 388843e146 More Mac OS dependency fixes. 2013-08-31 21:11:09 +02:00
lotodore c404016240 Adding QtPrintSupport dependency on Mac OS. 2013-08-31 21:02:41 +02:00
lotodore e7481af03b Adding Qt5 cocoa platform plugin on Mac. 2013-08-31 20:28:17 +02:00
lotodore 171b6beb5d Modify reference to QtWidgets from QtGui on Mac OS. 2013-08-31 20:16:33 +02:00
lotodore 6eabfc3e9c Adding QtWidgets dependency for Mac OS. 2013-08-31 20:10:00 +02:00
lotodore 3b03275923 Merge branch 'master' of github.com:/pokerth/pokerth 2013-08-31 19:51:22 +02:00
lotodore 9deeec96c4 Mac OS script changes for Qt5. 2013-08-31 19:50:40 +02:00