sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,696 Commits 9 Branches 1 Tag
b6763bcfe846e6bf1399a2f49b015feb4cedfa89
Commit Graph
108 Commits
Author SHA1 Message Date
Kai Philipp 6092b3c306 regenerated ProtoBuf.java to suit protobuf 2.6.1 2016-06-28 19:15:18 +02: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 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 bc7f34a2a6 Move spectators to lobby before closing a game. 2013-10-05 12:49:21 +02:00
lotodore a304903883 Send dealer player id with each hand start message. 2013-09-24 23:40:10 +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 43e1b9eae5 Wait a bit longer for DB actions in ranking game test. 2013-02-28 20:42:50 +01: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 8740c3fb7a Trying to fix "login blocked" test problems. 2013-02-24 21:28:47 +01:00
lotodore d8dcf78ab4 Protocol changes for admin functions. Fixing generic DB implementation. 2013-02-24 18:24:38 +01:00
lotodore d4c1d64eda Trying to fix game info validation. 2013-01-01 00:27:49 +01:00
lotodore 224dd3e6e6 Fixing test cases after pull request #166 (BSD fix). 2012-12-28 21:17:51 +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
doitux fe7f34a504 sdlplayer bugfix 2012-12-20 09:41:39 +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 5ef456e15b Fixing remaining test cases for google protocol buffers. 2012-09-22 12:39:34 +02:00
lotodore 09545d86a7 Still fixing tests. 2012-09-21 23:53:25 +02:00
lotodore 8080fb6139 More work on tests. 2012-09-21 13:00:24 +02:00
lotodore 59ef7ea62a More work on tests. 2012-09-20 23:39:25 +02:00
lotodore c752b17c9f In the process of fixing the Java test cases for google protocol buffers. 2012-09-20 20:55:21 +02:00
lotodore a8fe40a49a Updating protocol version in test case. 2012-04-09 16:38:43 +00:00
lotodore d1b6a4deec Fixing rejected chat and corresponding test case. 2012-01-08 16:56:51 +00:00
lotodore 63f5aadf40 Preparing release 0.9. 2012-01-03 23:26:58 +00:00
lotodore 6a3ffc1f29 Consider seat position in seat state test. 2012-01-01 13:47:53 +00:00
lotodore 672d202697 Adding new seat state test case. 2012-01-01 12:04:25 +00:00
lotodore ae7a177d72 Improving test cases for rejoin. 2012-01-01 10:36:49 +00:00
lotodore a285683e71 Timeout message may occur during test case. 2011-12-27 21:16:50 +00:00
lotodore 6bab9e8e00 Incrementing protocol version for tests. 2011-12-23 22:45:43 +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 641becb654 Fixing protocol version number. 2011-11-13 19:49:26 +00:00
lotodore c6b4e7cfdc Fixing test cases. 2011-11-13 19:34:47 +00:00
lotodore d975139409 Preparing release 0.9-beta1. Fixing issue that player was not marked as kicked when kicked through the chat cleaner. Fixing java test cases. 2011-11-13 19:10:07 +00:00
lotodore 23b247c90f Trying to fix test case. 2011-10-29 18:26:32 +00:00
lotodore 05dd9980ca Trying to fix test case. 2011-10-29 18:09:28 +00:00
lotodore 63a6441908 Adding test case for multiple rejoins. 2011-10-29 17:50:03 +00:00
lotodore 01047622c2 Adding test case for rejoin. 2011-10-29 12:54:53 +00:00
lotodore d00bd96511 Fixing test cases. 2011-10-27 19:20:08 +00:00
lotodore 0d9bf08934 Still trying to fix the test cases. 2011-10-03 16:07:41 +00:00
lotodore 1e1de466b8 Fixing test cases. 2011-10-03 13:21:58 +00:00
lotodore b5b698ce44 Considering protocol changes in tests. 2011-10-03 12:44:57 +00:00
lotodore 8e31b459d6 Updating test protocol file. 2011-07-17 14:33:52 +00:00
lotodore 77f7287851 Updating protocol files for tests. 2011-07-17 14:16:13 +00:00