Commit Graph
2814 Commits
Author SHA1 Message Date
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
doitux 341c564d49 hopefully bugfix for chatbot regression (#164) 2012-12-25 22:31:49 +01:00
lotodore d62ba13c93 Preparing 1.0 beta2 2012-12-25 19:02:54 +01:00
doitux 5ef35c52ff Merge remote-tracking branch 'origin/master' 2012-12-25 16:30:32 +01:00
doitux ae985034b7 fix forgotten strings for translation 2012-12-25 16:30:18 +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
doitux de3cc9d8de android gui fix for applysettings when quit settingsdialog 2012-12-25 01:14:32 +01:00
doitux 74afc8d46f log button to startwindow also for desktop 2012-12-24 14:19:37 +01:00
doitux 59e329789a additional fix for settingsdialog, new Logs button also for desktops 2012-12-24 11:28:00 +01:00
doitux 3ae4ded536 fix #162 (Does not keep settings on Android) and settingsdialog issues for desktop 2012-12-24 00:14:01 +01:00
lotodore 805a804400 Preparing 1.0 beta1. 2012-12-23 14:38:20 +01:00
doitux f46f2fe9fd remove serverlist testing hack 2012-12-23 14:21:15 +01:00
lotodore 89144b2832 Fixing log upload error handling. 2012-12-23 00:33:04 +01:00
lotodore d9f6bd88c2 More work on log upload error codes. 2012-12-22 20:56:00 +01:00
lotodore ae786702f6 Handle specific web server errors during log file upload. 2012-12-22 19:57:45 +01:00
doitux ff0963a4d8 Merge remote-tracking branch 'origin/master' 2012-12-22 19:08:35 +01:00
doitux dc11a850dc please android_test now ;D 2012-12-22 19:08:23 +01:00
lotodore 6d904100dc Fixing compiler warnings and cppcheck issues. 2012-12-22 17:57:00 +01:00
floty c879e3aed8 codes for handling error file upload (#146) 2012-12-22 13:48:04 +01:00
doitux 92d71f5c0d Merge remote-tracking branch 'origin/master' 2012-12-22 01:22:40 +01:00
doitux f07c6f1333 android test fixes 2012-12-22 01:22:28 +01:00
floty 838e91576b Merge remote branch 'origin/master' 2012-12-22 00:21:30 +01:00
floty dc5f7fb495 adapt log of local game to log of network/internet game 2012-12-22 00:19:53 +01:00
doitux 8ffa29b34a fix android test 2012-12-22 00:18:54 +01:00
doitux d6d7c5501a android gui tweaks 2012-12-21 02:20:14 +01:00
lotodore 2ec1abd6ae Correcting domain which was changed for testing purposes. 2012-12-21 01:03:43 +01:00
lotodore d3cd97c666 Running astyle. 2012-12-21 01:01:01 +01:00
doitux 7503b1754e android gui tweaks 2012-12-21 00:51:50 +01:00
doitux 5a87ce08b3 android return key behaviour enhancements 2012-12-21 00:36:01 +01:00
doitux 5a869691e4 Merge remote-tracking branch 'origin/master' 2012-12-20 23:48:29 +01:00