sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,681 Commits 9 Branches 1 Tag
4ddc972d73ef680b26121a278aaff1c2e673294b
Commit Graph
316 Commits
Author SHA1 Message Date
lotodore 2c6a98e998 Consider new "allow spectators" game flag in server (#215) 2013-11-02 18:13:18 +01:00
lotodore aea8a6c2e9 Allow spectators to join invite-only games (for now) #214 2013-10-20 19:06:53 +02:00
lotodore f0f3d2eb04 Running astyle. 2013-10-06 16:30:09 +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 bc7f34a2a6 Move spectators to lobby before closing a game. 2013-10-05 12:49:21 +02:00
lotodore 496a668a15 Fixing retrieval of remote webclient address for login blocker. 2013-09-16 22:33:52 +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 0be7632875 Fixing session counter with regard to spectators. 2013-06-29 23:44:00 +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 202825ab15 Also log IP address of player who is banned. 2013-02-28 20:48:44 +01:00
lotodore 44b90f9433 Adding server log messages for admin actions. 2013-02-27 22:34:30 +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 d8dcf78ab4 Protocol changes for admin functions. Fixing generic DB implementation. 2013-02-24 18:24:38 +01:00
lotodore 883ccdcf44 Preparing admin functions in PokerTH client. 2013-02-24 16:22: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
lotodore 45a5c7cef8 License change: OpenSSL exception (for Windows 8 support, because gcrypt does not work on Windows 8). 2012-12-25 15:06:23 +01:00
lotodore d3cd97c666 Running astyle. 2012-12-21 01:01:01 +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 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 f145ae2b42 Fixing cppcheck issues. 2012-09-02 12:35:41 +02:00
lotodore 546f8c7ab5 Fixing issue #135: Double game invite no longer leads to kick (server side fix). 2012-06-08 21:21:44 +02:00
lotodore 26a152c157 Ignore additional "leave game" messages if the player is in the lobby (part of issue #134). 2012-06-01 21:26:15 +02:00
lotodore ed43fa107c Server feedback after report game. 2012-04-09 10:22:24 +00:00
lotodore dbdd135bc7 More work on report game function on server side. 2012-04-08 16:54:31 +00:00
lotodore c49abf215e Preparing server side code for reporting game names. 2012-04-08 14:36:14 +00:00
lotodore ac0041cb8f Preparing "reportGameName" network message. 2012-03-31 20:14:11 +00:00
lotodore 81ee27de70 New admin function to remove a complete game by any player name within that game (#115). 2012-02-13 20:28:55 +00:00
lotodore 6af6da5658 Remove tabs and newline characters from game name on server side. 2012-02-03 21:34:26 +00:00
floty 3b96fb2196 show logos in the log preview (#101) 2012-01-28 12:51:42 +00:00
lotodore e658a18913 Do not rejoin games with 0 cash. Workaround for #108. 2012-01-28 11:50:33 +00:00
floty 5769423595 last bugfixes for sqlite-log; activating sqlite-log for release version 0.9.1 2012-01-09 12:42:04 +00:00
lotodore 03a1a1dc55 Implement chat bot mute on server side (#1). 2012-01-08 13:02:29 +00:00
floty 3a659dd5d5 logging missing network actions in sqlite; run astyle. 2012-01-05 20:54:27 +00:00
lotodore a327ac02e5 Fixing login error when uploading an avatar. 2012-01-05 19:59:35 +00:00
lotodore df35ea550f Remove log object from server, server-side logging is deactivated. Pass NULL as log object to game. 2012-01-02 21:04:49 +00:00
lotodore c7a4e61d61 Fixing network game (ticket #90). 2012-01-02 10:42:35 +00:00
lotodore 0d71521559 Fixing ticket #81: Do not show a "you were kicked from the server" message if your username is already present in the lobby. Instead, kick the existing user from the lobby. 2011-12-27 17:26:03 +00:00
lotodore 1843015630 Fixing server exception when shutting down a socket which was already closed. 2011-12-17 10:29:56 +00:00
lotodore 0a8cd1cce4 Implementing automatic kick of players after a certain timeout within a game. 2011-12-16 22:39:24 +00:00
lotodore 1bf12328ee Remove players from game (without possibility to rejoin) if they did not act within a certain time. Feature is still broken, because the timer is canceled on disconnect. 2011-12-11 19:37:51 +00:00
lotodore 7bb9841f83 More timer cleanup. 2011-12-11 17:12:26 +00:00
lotodore aad9e271db Cleaning up the different timeouts and how players can be removed from the game. 2011-12-11 14:54:17 +00:00
lotodore edef79e9d1 Disable rejoin for players who have been kicked. 2011-11-13 14:28:54 +00:00