sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,641 Commits 9 Branches 1 Tag
fae5932dfc1f0cd297a4d4659d38a957e0fa8ee3
Commit Graph
127 Commits
Author SHA1 Message Date
lotodore fae5932dfc Updating asio to latest revision. 2013-12-17 15:41:28 +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
Evgeni Golov c63180a7af fix "recieve" typo in various places 2013-10-13 18:28:55 +02:00
lotodore 0368b57432 Updating websocket++ to latest github release (0.3 alpha4). 2013-10-11 23:54:30 +02:00
lotodore bc7f34a2a6 Move spectators to lobby before closing a game. 2013-10-05 12:49:21 +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 a304903883 Send dealer player id with each hand start message. 2013-09-24 23:40:10 +02:00
lotodore 1f0bf411b4 Remove third party asn.1 code, as it is no longer required. 2013-08-29 22:21:54 +02:00
lotodore 9686257e41 Switching from asn.1 to protobuf as chat cleaner protocol. 2013-08-29 22:18:44 +02:00
doitux 20840a2af0 qt5 refactoring ... 2013-08-28 10:49:03 +02:00
lotodore ef489dae8a Work on spectator mode - joining as spectator now possible (on server side). 2013-06-29 16:23:10 +02:00
lotodore 00543b7560 More work on spectator mode. 2013-06-16 10:43:13 +02:00
lotodore f739c20cc5 Updating to newer release of protobuf. 2013-06-08 19:36:04 +02:00
lotodore 904069e02e Adding protocol support for spectator mode. 2013-04-01 23:37:28 +02:00
lotodore 2aba7cf7ed Add message callbacks to client admin functions. 2013-02-26 23:15:33 +01:00
lotodore f7777b535d Improving in-game admin functions, implementing reply packets to report results. 2013-02-25 23:02:20 +01:00
lotodore d8dcf78ab4 Protocol changes for admin functions. Fixing generic DB implementation. 2013-02-24 18:24:38 +01:00
Evgeni Golov 1bbe608f50 rename major/minor to majorVersion/minorVersion 
PokerTH fails to build on Debian GNU/kFreeBSD and GNU/Hurd with:
 In file included from src/third_party/protobuf/pokerth.pb.cc:4:0:
 src/third_party/protobuf/pokerth.pb.h:936:37: error: expected unqualified-id before 'int'
 src/third_party/protobuf/pokerth.pb.h:936:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:936:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:943:37: error: expected unqualified-id before 'int'
 src/third_party/protobuf/pokerth.pb.h:943:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:943:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:9618:60: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.h:9640:60: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc: In member function 'virtual void AnnounceMessage_Version::SerializeWithCachedSizes(google::protobuf::io::CodedOutputStream*) const':
 src/third_party/protobuf/pokerth.pb.cc:1581:72: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1581:72: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc:1586:72: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1586:72: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc: In member function 'virtual int AnnounceMessage_Version::ByteSize() const':
 src/third_party/protobuf/pokerth.pb.cc:1599:17: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1599:17: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc:1606:17: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1606:17: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc: In member function 'void AnnounceMessage_Version::MergeFrom(const AnnounceMessage_Version&)':
 src/third_party/protobuf/pokerth.pb.cc:1625:22: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1625:22: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc:1628:22: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1628:22: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc: At global scope:
 src/third_party/protobuf/pokerth.pb.cc:14319:6: warning: unused parameter 'output' [-Wunused-parameter]
 src/third_party/protobuf/pokerth.pb.cc:18344:6: warning: unused parameter 'output' [-Wunused-parameter]
 make[2]: *** [obj/pokerth.pb.o] Error 1

Renaming the vars to majorVersion/minorVersion fixes this issue.

The problem on kFreeBSD is, that
 /usr/include/sys/kern/types.h
has
 #define major(x)        ((int)(((u_int)(x) >> 8)&0xff)) /* major number */
 #define minor(x)        ((int)((x)&0xffff00ff))         /* minor number */
and this is included somewhere when you include stdlib.h, which protobuf's
headers do.

Hurd has similar definitions in /usr/include/i386-gnu/sys/sysmacros.h.
 2012-12-28 12:14:54 +01:00
lotodore 5e982e4c8f Switch to lite version of protobuf (for Android compatibility). 2012-11-06 23:31:41 +01:00
lotodore 02016381ef Multiple player info requests can be placed in one packet. 2012-09-24 12:22:13 +02:00
lotodore f0ee0af6ec Some work on protocol buffer details. 2012-09-23 23:19:53 +02:00
lotodore e16d4908bd Removing old ASN.1 stuff. 2012-09-22 15:42:59 +02:00
lotodore 8080fb6139 More work on tests. 2012-09-21 13:00:24 +02:00
lotodore 86c58fc7c8 Switching from ASN.1 (asn1c) to google protocol buffers. Some things are still missing (packet verification, tests, ...), this is very early stuff. 2012-09-18 15:57:58 +02:00
lotodore 617a4e953b Trying to fix build problems with gcc 4.7 on Linux (#132). 2012-05-02 08:41:07 +00:00
lotodore c63deb6010 Build file changes for android. 2012-04-22 09:24:27 +00:00
lotodore 3462a7060e Reverting invalid changes. 2012-03-31 20:17:10 +00:00
lotodore ac0041cb8f Preparing "reportGameName" network message. 2012-03-31 20:14:11 +00:00
lotodore 56335bc8e5 Updated asn1c to latest git version. 2012-01-07 20:47:41 +00:00
lotodore 79fa9df3c9 Consider game id in chat bot. Preparing new chat bot action: Mute player in game. 2012-01-07 09:31:28 +00:00
lotodore f8c1cdf56e Inform players when another player is no longer allowed to rejoin. 2011-12-22 20:10:18 +00:00
lotodore 38d224590a Send state of seats at the beginning of each hand. 2011-12-21 20:56:41 +00:00
lotodore 99616b4eed Send player state with each player action. autofold/disconnect timeout now depends on player action timeout. 2011-12-17 23:34:34 +00:00
lotodore edde9137ae CardsValue is now optionally sent by the server. 2011-11-13 15:31:35 +00:00
lotodore 32d26e3644 Removing AFK-warning message. Preparing integration of a new auto-AFK mode. 2011-11-07 21:07:13 +00:00
lotodore 60b96976b8 Removing unintended asn_system.h-change. 2011-10-26 21:47:25 +00:00
lotodore 0230edaec2 New start event type to mark a certain game start as "rejoin" (in order to show a special dialog). 2011-10-26 21:45:39 +00:00
lotodore aee0adbffe More protocol changes for rejoin. Re-adding server password to protocol. 2011-10-03 08:03:58 +00:00
lotodore b5a30d7def Adding missing protocol files. 2011-07-17 14:47:01 +00:00
lotodore d2720467b2 Last session id is only sent optionally, it can be omitted if not available. 2011-07-17 14:32:28 +00:00
lotodore d8ccf015d3 Protocol updates for more flexibility and better testing. 2011-07-17 14:12:10 +00:00
lotodore e109c0037d Preparing network protocol for rejoin. 2011-07-16 14:52:45 +00:00
lotodore c47e74d427 Removing libircclient from third_party. 2011-03-11 02:06:29 +00:00
lotodore e5b9b29564 Adding chat reject message if chat is tried to be sent in an invalid state. Otherwise testing won't work. 2011-02-17 23:57:58 +00:00
lotodore c4b8e567ed Implementing private messages in lobby chat, ticket #12. Some cosmetic improvements are still missing. 2011-02-11 23:02:29 +00:00
lotodore 6a2e993ac3 This was actually a duplicate - the file COPYING_asn1c already contains the license. 2011-02-11 09:29:28 +00:00
lotodore 562c7a3ee8 Explicitly adding boost software license 1.0 - source is http://www.boost.org/LICENSE_1_0.txt 2011-02-11 09:27:41 +00:00
lotodore 6563c3dd10 Explicitly adding asn1c "Copying" file to clarify which BSD license is used. Source for this file is https://github.com/vlm/asn1c which is exactly the asn1c version used. 2011-02-11 09:23:52 +00:00