Droog71
/
Terasology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PRs #1423 by @msteiger and #1436 by @flo - library updates

develop
Rasmus Praestholm 2014-12-11 00:12:14 -05:00
parent bd249dc4ac 4a8aab08a6 104e9eb743
commit e9b06d99d0
6 changed files with 1096 additions and 1197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/build.gradle
View File

@ -92,10 +92,10 @@ dependencies {
// Storage and networking // Storage and networking
compile group: 'com.google.guava', name: 'guava', version: '18.0' compile group: 'com.google.guava', name: 'guava', version: '18.0'
compile group: 'com.google.code.gson', name: 'gson', version: '2.3' compile group: 'com.google.code.gson', name: 'gson', version: '2.3.1'
compile group: 'com.google.protobuf', name: 'protobuf-java', version: '2.5.0' compile group: 'com.google.protobuf', name: 'protobuf-java', version: '2.6.1'
compile group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3' compile group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'
compile group: 'io.netty', name: 'netty', version: '3.6.5.Final' compile group: 'io.netty', name: 'netty', version: '3.9.5.Final'
// Java magic // Java magic
compile group: 'net.java.dev.jna', name: 'jna', version: '3.5.2' compile group: 'net.java.dev.jna', name: 'jna', version: '3.5.2'

877
engine/src/main/java/org/terasology/protobuf/EntityData.java
View File

File diff suppressed because it is too large Load Diff

1406
engine/src/main/java/org/terasology/protobuf/NetData.java
View File

File diff suppressed because it is too large Load Diff

BIN
protobuf/compiler/protoc
View File

Binary file not shown.

BIN
protobuf/compiler/protoc.exe
View File

Binary file not shown.

4
protobuf/compiler/readme.txt
View File

@ -1,6 +1,6 @@
Protocol Buffers - Google's data interchange format Protocol Buffers - Google's data interchange format
Copyright 2008 Google Inc. Copyright 2008 Google Inc.
http://code.google.com/p/protobuf/ https://developers.google.com/protocol-buffers/
This package contains a precompiled Win32 binary version of the protocol buffer This package contains a precompiled Win32 binary version of the protocol buffer
compiler (protoc). This binary is intended for Windows users who want to compiler (protoc). This binary is intended for Windows users who want to
@ -12,4 +12,4 @@ the C++ compiler used.
You will still need to download the source code package in order to obtain the You will still need to download the source code package in order to obtain the
Java or Python runtime libraries. Get it from: Java or Python runtime libraries. Get it from:
http://code.google.com/p/protobuf/downloads/ https://github.com/google/protobuf/releases/