1
0
Fork 0
cuberite-2a/src
Tiger Wang f55f5ec47f Merge branch 'master' into achievementtranslate
Conflicts:
	src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
..
Bindings Merge pull request #998 from mc-server/StatManager 2014-05-18 22:30:34 +02:00
BlockEntities Added static const, initialized fields. 2014-04-26 15:32:14 -07:00
Blocks Fixed cWither::KilledBy 2014-05-21 10:59:14 +03:00
Entities Merge branch 'master' into achievementtranslate 2014-05-24 23:21:39 +01:00
Generating Fixed Mineshaft system size. 2014-05-23 13:01:50 +02:00
HTTPServer Merge branch 'master' into SslWebAdmin 2014-05-10 21:27:57 +02:00
Items Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
Mobs Fixed cWither::KilledBy 2014-05-21 10:59:14 +03:00
OSSupport Merge branch 'master' into SslWebAdmin 2014-05-10 21:27:57 +02:00
PolarSSL++ Client cert is not requested. 2014-05-10 09:21:29 +02:00
Protocol cCompositeChat message type is now formatted 2014-05-19 21:16:29 +01:00
Resources Moved the win resources into a separate subfolder. 2014-01-12 17:57:29 +01:00
Simulator Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
UI Merge pull request #998 from mc-server/StatManager 2014-05-18 22:30:34 +02:00
WorldStorage Merge pull request #998 from mc-server/StatManager 2014-05-18 22:30:34 +02:00
BiomeDef.cpp Added BiomeToString() API function. 2014-04-29 15:36:29 +02:00
BiomeDef.h Added BiomeToString() API function. 2014-04-29 15:36:29 +02:00
BlockArea.cpp Fixed a warning and a complaint about a never-read variable. 2014-05-11 13:44:30 -07:00
BlockArea.h Fixed warning in cBlockArea. 2014-05-01 22:41:18 +02:00
BlockID.cpp Fixed warning in BlockID. 2014-05-01 22:47:02 +02:00
BlockID.h Implemented weighted pressure plates 2014-04-17 12:11:31 +01:00
BlockInServerPluginInterface.h Added missing files 2014-02-02 06:59:36 -08:00
BlockInfo.cpp Merge branch 'master' into Slabs 2014-05-07 12:54:58 +02:00
BlockInfo.h cBlockInfo now manages the respective cBlockHandler 2014-03-02 21:25:05 +02:00
BlockTracer.h Fixed more virtual destructors for interfaces. 2014-04-02 16:40:27 +02:00
BoundingBox.cpp Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
BoundingBox.h Unified Vector classes 2014-03-11 16:02:25 +02:00
ByteBuffer.cpp Fixed warnings in cByteBuffer. 2014-05-01 22:54:22 +02:00
ByteBuffer.h Merged branch 'master' into SslWebAdmin. 2014-05-01 23:20:00 +02:00
CMakeLists.txt Merged branch 'master' into SslWrappers. 2014-04-28 22:05:02 +02:00
ChatColor.cpp Finally removed the function. 2013-12-24 13:25:58 +00:00
ChatColor.h removed the function def also 2013-12-24 13:26:54 +00:00
Chunk.cpp Merge branch 'master' into redstoneimprovements 2014-05-04 14:15:10 +01:00
Chunk.h Redstone simulator now directly accesses cChunk 2014-04-27 17:35:41 +01:00
ChunkDef.h Hopefully fixed repeated clang warnings. 2014-04-28 22:22:07 +02:00
ChunkMap.cpp Merge branch 'master' into redstoneimprovements 2014-05-04 14:15:10 +01:00
ChunkMap.h Add Lua Bindings for FlowerPotEntity.h and add documentation. 2014-03-07 11:44:16 +01:00
ChunkSender.cpp merged in warnings changes 2013-12-22 16:11:34 +00:00
ChunkSender.h Moved source to src 2013-11-24 14:19:41 +00:00
ChunkStay.cpp ChunkStay must be disabled while being deleted. 2014-04-12 22:35:04 +02:00
ChunkStay.h ChunkStay must be disabled while being deleted. 2014-04-12 22:35:04 +02:00
ClientHandle.cpp Merge pull request #1010 from mc-server/cactidamage 2014-05-19 14:01:50 +01:00
ClientHandle.h cCompositeChat message type is now formatted 2014-05-19 21:16:29 +01:00
CommandOutput.cpp Fixed xofts issues 2014-03-14 06:11:49 -07:00
CommandOutput.h Fixed xofts issues 2014-03-14 06:11:49 -07:00
CompositeChat.cpp cCompositeChat message type is now formatted 2014-05-19 21:16:29 +01:00
CompositeChat.h Update CompositeChat.h 2014-05-20 22:49:21 +01:00
CraftingRecipes.cpp Merge branch 'master' into fixes 2014-04-24 18:57:25 +01:00
CraftingRecipes.h Moved firework handler to separate function 2014-03-09 12:48:53 +00:00
Cuboid.cpp Added cCuboid:Assign(OtherCuboid) API function. 2014-03-15 07:50:39 +01:00
Cuboid.h Added cCuboid:Assign(OtherCuboid) API function. 2014-03-15 07:50:39 +01:00
DeadlockDetect.cpp Fixed crash on creating a world during plugin initialisation 2014-05-05 16:06:45 +01:00
DeadlockDetect.h Added Noreturn attribtes to a couple of functions and made a missing noreturn an error 2014-03-14 07:59:25 -07:00
Defines.h Fixed datatype truncation in Diff() template. 2014-05-18 22:36:31 +02:00
Enchantments.cpp Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() 2014-05-06 19:38:09 +02:00
Enchantments.h Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() 2014-05-06 19:38:09 +02:00
Endianness.h Fixed Endiannes conversion routines for floats and doubles. 2014-04-05 22:34:05 +02:00
FastRandom.cpp Initalize counter in fastrandom 2014-04-27 13:15:19 -07:00
FastRandom.h Modified comment 2014-04-07 20:41:47 +02:00
ForEachChunkProvider.h Fixed non-virtual destructors warnings. 2014-03-28 21:35:45 +01:00
FurnaceRecipe.cpp Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
FurnaceRecipe.h Moved source to src 2013-11-24 14:19:41 +00:00
Globals.cpp Moved source to src 2013-11-24 14:19:41 +00:00
Globals.h Fixed MSVC2013 compilation. 2014-05-01 20:22:23 +02:00
Group.cpp Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Group.h Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
GroupManager.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
GroupManager.h Moved common cGroupManager code to a separate function. 2014-02-28 15:31:20 +01:00
Inventory.cpp Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. 2014-05-09 23:10:02 +02:00
Inventory.h Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. 2014-05-09 23:10:02 +02:00
Item.cpp Change m_RepairCost to int. 2014-05-07 20:43:37 +02:00
Item.h Movement Statistics 2014-05-12 21:38:52 +03:00
ItemGrid.cpp Changed inheritance a bit 2014-02-12 22:01:22 +00:00
ItemGrid.h Fixed non-virtual destructors warnings. 2014-03-28 21:35:45 +01:00
LeakFinder.cpp Fixed a bug in LeakFinder. 2014-01-23 17:54:38 +01:00
LeakFinder.h Moved source to src 2013-11-24 14:19:41 +00:00
LightingThread.cpp Lighting thread disabled its chunkstays before deleting them. 2014-05-09 18:32:03 +02:00
LightingThread.h Removed unneeded asserts. 2014-04-03 09:38:29 +02:00
LineBlockTracer.cpp Removed unused assignments. 2014-04-25 18:18:46 -07:00
LineBlockTracer.h Moved source to src 2013-11-24 14:19:41 +00:00
LinearInterpolation.cpp Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
LinearInterpolation.h Moved source to src 2013-11-24 14:19:41 +00:00
LinearUpscale.h Implemented faster upscaling using templates. 2014-03-21 22:53:46 +01:00
Log.cpp Fixed xofts issues 2014-03-14 06:11:49 -07:00
Log.h Fixed xofts issues 2014-03-14 06:11:49 -07:00
MCLogger.cpp More small fixes. 2014-04-26 14:05:00 -07:00
MCLogger.h Further refactored, Reverted Minecart change 2014-04-26 09:25:30 -07:00
MCServer.vcproj.user Added a generic .user file for MSVC. 2014-01-13 16:49:49 +01:00
Map.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Map.h Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
MapManager.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
MapManager.h Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Matrix4.h M_PI MSVC Fix 2014-03-12 16:13:03 +02:00
MemoryLeak.h Moved source to src 2013-11-24 14:19:41 +00:00
MersenneTwister.h Fixed MTRand warnings 2014-03-10 10:24:44 -07:00
MobCensus.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
MobCensus.h Moved source to src 2013-11-24 14:19:41 +00:00
MobFamilyCollecter.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
MobFamilyCollecter.h Moved source to src 2013-11-24 14:19:41 +00:00
MobProximityCounter.cpp Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
MobProximityCounter.h Moved source to src 2013-11-24 14:19:41 +00:00
MobSpawner.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
MobSpawner.h Moved source to src 2013-11-24 14:19:41 +00:00
MonsterConfig.cpp Renamed getter and setter for IsFireproof. 2014-04-23 00:12:37 -07:00
MonsterConfig.h Moved source to src 2013-11-24 14:19:41 +00:00
Noise.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Noise.h Fixed a warning in Noise. 2014-05-01 23:10:37 +02:00
Piston.cpp g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
Piston.h Improved Type safety of eBlockFace 2014-02-04 10:59:05 -08:00
ProbabDistrib.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
ProbabDistrib.h Moved source to src 2013-11-24 14:19:41 +00:00
RCONServer.cpp Merge branch 'master' into SslWebAdmin 2014-05-10 21:27:57 +02:00
RCONServer.h Fixed crashes in the SSL HTTP connection. 2014-05-01 15:08:15 +02:00
Root.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Root.h Added Yggdrasil Authentication System 2014-04-13 13:04:56 +02:00
Scoreboard.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Scoreboard.h Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Server.cpp removed the <list> include 2014-05-18 17:30:21 +02:00
Server.h Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects. 2014-04-29 11:04:54 +02:00
StackWalker.cpp Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
StackWalker.h Moved source to src 2013-11-24 14:19:41 +00:00
Statistics.cpp Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
Statistics.h Statistic Manager 2014-05-11 14:57:06 +03:00
StringCompression.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
StringCompression.h Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
StringUtils.cpp Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
StringUtils.h Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Tracer.cpp Some change to Entity.cpp 2014-04-23 21:06:46 +01:00
Tracer.h Unified Vector classes 2014-03-11 16:02:25 +02:00
Vector3.h Merge branch 'master' into fixes 2014-05-06 20:15:19 +01:00
VoronoiMap.cpp Voronoi-related biomegens use the new cVoronoiMap class. 2013-11-27 21:42:34 +01:00
VoronoiMap.h Added missing files for Voronoi map generation. 2013-11-27 14:26:28 +01:00
WebAdmin.cpp If webadmin.ini doesn't exist, example one is written immediately. 2014-04-30 17:37:25 +02:00
WebAdmin.h Rewritten HTTPServer to use size_t for data lengths. 2014-04-01 16:36:00 +02:00
World.cpp World pre-generation distance is settable in world.ini. 2014-05-09 18:32:04 +02:00
World.h Merge branch 'master' into fixes 2014-05-06 20:15:19 +01:00
XMLParser.h Moved source to src 2013-11-24 14:19:41 +00:00
main.cpp Fixed a few unneeded breaks 2014-03-14 07:12:00 -07:00