flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,260 Commits 1 Branch 0 Tags
e39f2a21d550626b962a342b23e0adfb491e6e48
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
madmaxoft e39f2a21d5 Fixed ProtoProxy. 2014-04-29 11:48:57 +02:00
madmaxoft 79ec770d77 Added missing initialization. 2014-04-29 11:17:47 +02:00
madmaxoft ec33bbe294 Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects. 2014-04-29 11:04:54 +02:00
madmaxoft 0b16e6821f Merged branch 'master' into SslWrappers. 2014-04-28 22:05:02 +02:00
madmaxoft bab3a3cd31 Added the G1 root cert. 
Now the authenticator finally works.
 2014-04-28 21:16:52 +02:00
madmaxoft 16b3eae862 Added a debug cert printing function. 2014-04-28 21:16:32 +02:00
Mattes D 709015369d Merge pull request #940 from Howaner/GlobalFixes 
Add entity invulnerable
 2014-04-28 20:58:15 +02:00
madmaxoft 8ab8fb344f Fixed braces. 2014-04-28 20:37:22 +02:00
madmaxoft f04957321d Fixed missing return value warning in MSVC. 2014-04-28 20:37:12 +02:00
madmaxoft 8ae472df86 Merge remote-tracking branch 'worktycho/master' 2014-04-28 20:16:37 +02:00
Mattes D c063051645 Merge pull request #954 from mc-server/projectiles-split 
Totally refactored ProjectileEntity.h, splitting up into several files.
 2014-04-28 12:32:02 +02:00
madmaxoft ef57133f9b Reordered constructors. 2014-04-27 23:35:17 +02:00
madmaxoft bb73af6843 Fixed a late-night typo. 2014-04-27 23:31:26 +02:00
madmaxoft 9dc9713a9c Fixed warnings. 2014-04-27 23:12:52 +02:00
madmaxoft 4c165f8a6d Fixed player spawning #953. 2014-04-27 23:11:36 +02:00
Mattes D 051bb8cfbd Merge pull request #958 from worktycho/bugfix 
Bugfix
 2014-04-27 22:42:22 +02:00
madmaxoft dd52719c2d Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes. 2014-04-27 22:28:14 +02:00
madmaxoft 0bdc49221b PolarSSL wrappers for the SSL context. 2014-04-27 22:27:53 +02:00
madmaxoft f301d052cf cSocket creates the socket in Connect if no socket is present yet. 2014-04-27 22:20:49 +02:00
Mattes D 5c46f9dd39 Merge pull request #864 from mc-server/Stat 
Statistic/Achievement defs
 2014-04-27 19:37:45 +02:00
madmaxoft fdac27c63d Another attempt at #889. 
The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime.
 2014-04-27 17:31:58 +02:00
Mattes D a0f6149d05 Merge pull request #948 from jfhumann/staticFixes 
Fixes motivated by Coverity #1
 2014-04-27 17:00:37 +02:00
Mattes D da931da603 Merge pull request #941 from archshift/master 
Fixed lots of warnings, and other small changes.
 2014-04-26 23:26:59 +02:00
Mattes D 1139b117c4 Merge pull request #863 from mc-server/chunkysparsing 
Chunky sparsing
 2014-04-26 15:12:10 +02:00
Mattes D e5d08aa9a9 Merge pull request #936 from archshift/patch-1 
Use libc++ on OSX
 2014-04-26 13:45:13 +02:00
Mattes D a4f21908b2 Merge pull request #920 from axisd/master 
Mobs shouldn't burn when it's Raining
 2014-04-25 23:48:00 +02:00
madmaxoft 087210302f Updated MSVC side of CMake files after recent changes. 2014-04-25 23:45:16 +02:00
Mattes D 43cca14763 Merge pull request #935 from archshift/projectile-fixes 
Chicken eggs and ender pearls can hit entities.
 2014-04-25 23:41:04 +02:00
Mattes D 20e0465fd1 Merge pull request #938 from archshift/xcode-oops 
Oops, forgot some CMakeLists in #937
 2014-04-25 23:38:45 +02:00
madmaxoft 6d167b370e Fixed C++11 check for SharedPtr. 2014-04-25 16:05:24 +02:00
madmaxoft f3dfc0349d Added shared_ptr handling for C++03 mode. 2014-04-25 09:48:52 +02:00
Mattes D a40108da90 Merge pull request #932 from Howaner/Inventory 
Fix armor in survival mode.
 2014-04-25 08:11:49 +02:00
madmaxoft 4f49c978cf Replaced MSVC-specific decorators with our universal ones. 2014-04-24 22:43:20 +02:00
madmaxoft 616fb15508 cByteBuffer uses void * instead of char * in data interface. 
This makes it compatible with any pointer type.
 2014-04-24 22:42:33 +02:00
madmaxoft a02e8e8021 Declared a SharedPtr that hopefully resolves on all platforms. 
MSVC2008 has it in std::tr1, all the others in std.
 2014-04-24 22:30:19 +02:00
madmaxoft c7694687f5 Fixed filename case. 2014-04-24 22:15:21 +02:00
Mattes D 85e0b0eae9 Merge pull request #929 from archshift/master 
Renamed mob source files to better fit the CamelCase naming style.
 2014-04-24 22:12:28 +02:00
madmaxoft e33573ab59 Attempted CMake inclusion for PolarSSL++. 2014-04-24 21:53:42 +02:00
madmaxoft c4b4447a3a Authenticator uses some C++ SSL objects. 2014-04-24 21:53:41 +02:00
madmaxoft c701adbd24 Initial C++ SSL classes. 2014-04-24 21:53:41 +02:00
madmaxoft 449cf77420 Changed cByteBuffer constructor to take a size_t instead of int. 2014-04-24 21:52:24 +02:00
madmaxoft 695baed226 Updated docs for StringToEnchantmentID. 
Ref.: mc-server/Core#67
 2014-04-23 23:06:29 +02:00
madmaxoft 6d7da6b15d Updated NetherFort prefabs to latest Gallery content. 2014-04-23 23:03:09 +02:00
Mattes D 0d0e0af2d8 Merge pull request #925 from archshift/master 
Added monsters.ini rule for fireproof mobs.
 2014-04-23 09:46:06 +02:00
madmaxoft 2533842ca4 Updated NetherFort prefabs from the Gallery server. 2014-04-22 22:26:01 +02:00
Mattes D b3a9b73278 Merge pull request #923 from archshift/master 
Added flag for fireproof entities.
 2014-04-22 15:04:04 +02:00
Mattes D 6492aa000b Merge pull request #909 from jfhumann/fixes 
Bug fixes and optimizations.

We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
 2014-04-22 13:34:32 +02:00
madmaxoft e3ec857264 Added prefab hitboxes. 
The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish.
 2014-04-21 10:31:30 +02:00
madmaxoft 7c6ef26be9 Added enchantment combining into cEnchantments. 2014-04-21 10:31:30 +02:00
madmaxoft bdd8b43b3e Replaced X.size() with X.empty(), where applicable. 2014-04-21 10:31:29 +02:00
Mattes D 4c7621ed16 Fixed a warning in CraftingRecipes. 2014-04-21 09:21:31 +02:00
Mattes D 9f58046b5b Allow 1.6.4 Forge clients to log in. 
Fixes #913.
 2014-04-21 08:22:25 +02:00
Mattes D d7f88396e0 Fixed enchanting return values. 
Items are enchanted in those cases, so return true.
Ref.: #914.
 2014-04-21 06:41:11 +02:00
madmaxoft d80c082def Updated the nightbuild script. 2014-04-20 14:14:16 +02:00
madmaxoft 7b246d9a8d Fixed MSVC compilation. 2014-04-20 13:50:37 +02:00
Mattes D f99bdfb457 Merge pull request #890 from daniel0916/Enchanting 
Enchanting
 2014-04-20 13:34:38 +02:00
madmaxoft 62991d46fe APIDump: Added a ChunkStay article. 
Fixes #772.
 2014-04-19 16:15:57 +02:00
madmaxoft 6eac586794 Fixed formatting, made function static. 2014-04-19 13:05:58 +02:00
madmaxoft 5f3df1445f Merge remote-tracking branch 'origin/Beacons' 2014-04-19 13:01:28 +02:00
madmaxoft 6d3bde5221 Added performance test of the nether fort generator. 2014-04-18 14:35:33 +02:00
madmaxoft 193dcca1e3 Removed unsupported C++11 features. 2014-04-18 09:36:11 +02:00
Mattes D b7e074b10b Merge pull request #891 from mc-server/fixes 
Fixes to redstone & general
 2014-04-17 22:37:00 +02:00
madmaxoft 6779010242 Added area flooring. 
Fixes #743.
 2014-04-17 22:03:30 +02:00
madmaxoft afb20132fe Added Prefab initializers to SELFTEST code. 2014-04-17 17:50:52 +02:00
madmaxoft be091800f8 Prefabs can have per-piece per-placement weights. 
Fixes #753.
Also upgraded NetherFortPrefabs to lates Gallery contents.
 2014-04-17 17:32:08 +02:00
Mattes D 35e847d2f5 Merge pull request #896 from axisd/master 
Mobs rotation
 2014-04-17 08:45:14 +02:00
madmaxoft 09866bb382 Added asserts for proper game state. 
This is to help hunt #889.
 2014-04-16 18:10:48 +02:00
madmaxoft 99e4225269 Attempted fix for the client crash with the new protocols. 2014-04-15 23:40:06 +02:00
madmaxoft b5ea5fbf90 Added support for per-piece per-placement weights in cPieceGenerator. 
Ref.: #753.
 2014-04-15 12:57:52 +02:00
madmaxoft 146824cb68 NetherFortPrefabs: Fixed a connector in MidStaircase. 2014-04-15 12:57:52 +02:00
Mattes D 112dd2c5ec Merge pull request #888 from mc-server/Proto176 
Protocol 1.7.6
 2014-04-15 08:16:16 +02:00
madmaxoft d12d7b6715 Implemented the 1.7.6 protocol and authenticator. 
Server works both in online and offline modes with 1.7.9.
 2014-04-14 22:52:59 +02:00
madmaxoft d505ffc704 A client UUID is generated when the server is in offline mode. 
1.7.9 client works with these changes in offline mode.
 2014-04-14 20:21:00 +02:00
madmaxoft ffe65b6a18 Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176 2014-04-14 18:53:56 +02:00
madmaxoft 0f55dcf036 Initial 1.7.6 protocol support. 
Doesn't work yet because of missing UUIDs.
 2014-04-14 18:52:21 +02:00
madmaxoft 21e5690811 ProtoProxy: Fixed weird gcc compilation errors. 2014-04-14 18:50:44 +02:00
madmaxoft 449afa850e ProtoProxy: Added 1.7.9 compatibility. 2014-04-14 18:24:44 +02:00
madmaxoft 34cf058b02 ChunkStay must be disabled while being deleted. 
Fixes #758.
 2014-04-12 22:35:04 +02:00
madmaxoft 75b7244f05 Fixed chunkstays not being removed on auto-delete. 
Fixes #837.
 2014-04-12 22:15:09 +02:00
madmaxoft 83b25d085c Updated the NetherFort prefabs to current Gallery contents. 
Code exported from the Gallery server by the GalExport plugin.
 2014-04-12 19:36:50 +02:00
madmaxoft f44a291da8 Fixed issues with 64-bit MSVC compilation. 2014-04-11 13:09:19 +02:00
madmaxoft 22d56d1a3f Fixed enchantment parsing. 
Fixes #880. Enchantment parsing now reports in detail which value failed to parse
 2014-04-10 19:09:37 +02:00
madmaxoft 8c7d0f5304 InfoReg uses cCompositeChat for subcommand lists. 
Also fixed an issue with console commands.
 2014-04-10 19:09:37 +02:00
Mattes D b45e8a8bd9 Merge pull request #878 from mc-server/mobexp 
@axisd Changes
 2014-04-10 17:23:32 +02:00
Mattes D e08a31daf5 Merge pull request #871 from worktycho/worldstorage 
Removed check for enqueuing a chunk that is already enqueued to be loaded
 2014-04-08 19:55:50 +02:00
madmaxoft f9b2c2956e Fixed HTTP chunked encoding. 
Fixes #858.
 2014-04-07 08:11:56 +02:00
madmaxoft 176deb4b5b Added the generated ZBS API file to ignore list. 2014-04-06 22:30:34 +02:00
madmaxoft 95fb90eaa6 Fixed 1.6.4 client crash on composite chat messages. 2014-04-06 22:28:41 +02:00
madmaxoft de3df0a71f Fixed crash in protocols sending 64-bit ints. 
Fixes #855.
 2014-04-06 22:15:49 +02:00
madmaxoft 7119dd293a Updated the tolua executable for Windows. 2014-04-06 22:05:44 +02:00
madmaxoft d40ab2b788 Merge remote-tracking branch 'worktycho/override' 2014-04-06 22:03:09 +02:00
madmaxoft 143a5e61fc Fixed Endiannes conversion routines for floats and doubles. 
This bug has been introduced in 8825d30aab.
This change fixes #854.
 2014-04-05 22:34:05 +02:00
madmaxoft 22794e7208 Fixed double projectile spawning. 
Two spawn packets were sent per projectile.
 2014-04-05 22:26:10 +02:00
madmaxoft d43c5a9c47 Removed debugging log from entity physics handling. 2014-04-05 22:25:40 +02:00
madmaxoft 43e3a55a70 Added more API documentation to cCompositeChat. 2014-04-05 12:09:30 +02:00
madmaxoft 1cab52f867 Added cPlayer:SendRotation() API function. 2014-04-05 12:09:30 +02:00
Mattes D 2e789b63d3 Merge pull request #840 from Howaner/NewBlocks 
Add tall flower handler.
 2014-04-04 15:06:54 +02:00
madmaxoft d77ca77086 Merge branch 'master' into HTTPSizeT 2014-04-04 13:29:48 +02:00
madmaxoft 87f39e9e28 Explicit change record size. 2014-04-04 13:19:25 +02:00
madmaxoft 4b4c3f2a20 Changed cNoise seed to signed. 2014-04-04 12:28:38 +02:00