Commit Graph
3143 Commits
Author SHA1 Message Date
floty 52830ba4a6 bugfix #177 (reading array overflow in flopCardsValue) 2013-03-21 21:53:52 +01:00
doitux 7813ff34c2 Galician (gl) translation preperation 2013-03-16 20:49:20 +01:00
lotodore e233b48160 Preparing 1.0.1pre release. 2013-03-01 18:03:56 +01:00
lotodore 202825ab15 Also log IP address of player who is banned. 2013-02-28 20:48:44 +01:00
lotodore 0052de02e1 Enabling banning a player from the client (as admin). 2013-02-28 20:38:37 +01:00
lotodore 44b90f9433 Adding server log messages for admin actions. 2013-02-27 22:34:30 +01:00
doitux 30d0ba6415 msg fixes 2013-02-26 23:45:57 +01:00
doitux 846ec346e0 fix 2013-02-26 23:32:47 +01:00
doitux 578b43bfa8 implement admin action return msg 2013-02-26 23:25:33 +01:00
lotodore 2aba7cf7ed Add message callbacks to client admin functions. 2013-02-26 23:15:33 +01:00
doitux 70f6a1ae78 check for incorrect admin actions 2013-02-25 23:21:59 +01:00
lotodore f7777b535d Improving in-game admin functions, implementing reply packets to report results. 2013-02-25 23:02:20 +01:00
lotodore 19f27a890c Implementing packet validation for new packets and client side game removal for admin players. 2013-02-24 23:04:02 +01:00
doitux 55348a000c admin action submenu fixes 2013-02-24 21:14:09 +01:00
doitux 261b32e051 Merge remote-tracking branch 'origin/master' 2013-02-24 19:28:31 +01:00
doitux d79f981623 admin action signal fixes 2013-02-24 19:28:23 +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
doitux 6d85adf7e2 add admin actions 2013-02-24 14:49:03 +01:00
doitux a89f479dd7 Merge remote-tracking branch 'origin/master' 2013-02-14 10:53:40 +01:00
doitux 1217f654b8 scottish gaelic translation update 2013-02-14 10:53:20 +01:00
Sven-Hendrik Haase 36d5e02436 Fix libircclient fix to work with multiple versions 2013-01-11 15:44:03 +01:00
Sven-Hendrik Haase 7e9d89051a Merge branch 'master' of git://github.com/pokerth/pokerth 2013-01-11 15:38:13 +01:00
lotodore 6b6fa24ead Rewriting connectivity tool for google protocol buffers. 2013-01-05 14:24:45 +01:00
Sven-Hendrik Haase 02473d95b4 Fix for newer libircclient 2013-01-03 15:41:35 +01:00
lotodore 1c5c3a5a1d Preparing 1.0 final release. 2013-01-01 16:18:45 +01:00
lotodore 13afee52f8 Consider avatar server of server list (reverting change specific for the beta release). 2013-01-01 15:17:50 +01:00
lotodore 1e0bd74db6 Fixing validation of empty packets. 2013-01-01 15:06:09 +01:00
lotodore ccdd838900 Fixing reset timeout and show own cards messages. 2013-01-01 14:31:04 +01:00
lotodore b78f1e730f Fixing gcc warning. 2013-01-01 10:15:53 +01:00
lotodore 163014328c Fixing gcc compiler warnings in packet validation code. 2013-01-01 00:37:18 +01:00
lotodore d4c1d64eda Trying to fix game info validation. 2013-01-01 00:27:49 +01:00
lotodore fb620625b6 Testing packet validation. 2012-12-31 23:05:28 +01:00
lotodore cbed0685e9 Log packet type of invalid packets. 2012-12-31 21:40:55 +01:00
lotodore eaa64cbc8c More packet validation for google protocol buffers. 2012-12-31 19:36:18 +01:00
doitux 871d0d9ae9 Merge remote-tracking branch 'origin/master' 2012-12-31 17:08:35 +01:00
doitux d1e3970f77 fixing file permissions for resources 2012-12-31 17:05:06 +01:00
lotodore 196686ee0e Fixing packet validation. 2012-12-31 16:38:29 +01:00
lotodore 4431efbbd8 First steps for network server packet validation. 2012-12-31 16:31:26 +01:00
doitux 4173af3be7 mobile gui fixes, better keycode BACK handling 2012-12-31 02:01:28 +01:00
doitux 75db51e950 crashbugfix on android 2012-12-31 00:20:05 +01:00
doitux 6a1e8f3a12 mobile gui tweaks 2012-12-30 00:21:20 +01:00
doitux 2003a67fb5 gui fixes 2012-12-29 23:05:30 +01:00
doitux 3cef4e96df gfx changes for startup on android 2012-12-29 21:56:12 +01:00
floty dcf318244e rename log file name without dots in time description (fixing #165) 2012-12-29 17:19:17 +01:00
lotodore fc8ac6403c Merge pull request #166 from evgeni/master
Fix compilation on FreeBSD and Hurd
2012-12-28 12:13:04 -08:00
doitux 2b298d0924 new gfx for 1.0 final (thx to danuxi) 2012-12-28 20:24:00 +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 a102afe606 mobile gui tweaks 2012-12-28 08:47:52 +01:00
doitux 9f97ee7d25 BUGFIX: Emoticons breaks URLs in the chat (#163) 2012-12-26 13:51:17 +01:00