1
0
cuberite-2a/source
Tiger Wang 77468f87b7 Merge remote-tracking branch 'upstream/master'
Conflicts:
	source/Piston.cpp

Merge conflict?
2013-08-14 12:03:13 +01:00
..
BlockEntities Added the OnHopperPullingItem and OnHopperPushingItem hooks. 2013-08-11 14:57:07 +02:00
Blocks Buncha bugfixes [SEE DESC] 2013-08-14 11:44:02 +01:00
Generating Buncha bugfixes [SEE DESC] 2013-08-14 11:44:02 +01:00
Items Fixed food handler for mushroom soup - proper food level and saturation are applied and the player receives a wooden bowl back after nomming 2013-08-08 16:32:14 +01:00
LuaExpat Added Expat and LuaExpat, XML parsing now available in the API. 2013-04-09 13:43:24 +00:00
md5 Fixed *nix compilation for md5.cpp 2012-07-29 12:38:34 +00:00
Mobs Fixed squid crashing the server when above or below the world 2013-08-10 08:22:53 +02:00
OSSupport Added doxyComments for cIsThread. 2013-08-11 18:46:49 +02:00
Protocol Tab completion packet is handled and sent. 2013-07-30 22:48:59 +02:00
Simulator Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
SQLite Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
UI Shift+clicking won't combine different item metas. 2013-08-02 09:12:16 +02:00
WorldStorage Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
AllToLua.bat AllToLua now resets the git status for the files. 2013-08-02 09:25:12 +02:00
AllToLua.pkg Renamed Plugin_NewLua to PluginLua. 2013-08-10 08:22:52 +02:00
AllToLua.sh
Authenticator.cpp Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
Authenticator.h Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
Bindings.cpp Added quartz stairs. 2013-08-12 02:31:02 -07:00
Bindings.h Added quartz stairs. 2013-08-12 02:31:02 -07:00
BlockArea.cpp Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
BlockArea.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
BlockID.cpp Alpha sorted PistonBreakable list 2013-08-14 11:50:21 +01:00
BlockID.h Added quartz stairs. 2013-08-12 02:31:02 -07:00
BlockTracer.h LineBlockTracer: Fixed initial errors 2013-08-04 16:07:15 +02:00
ByteBuffer.cpp Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
ByteBuffer.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
ChatColor.cpp Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
ChatColor.h Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
Chunk.cpp Improved function names for protocol packet sending; alpha-sorted the function lists 2013-07-07 13:06:06 +00:00
Chunk.h Improved function names for protocol packet sending; alpha-sorted the function lists 2013-07-07 13:06:06 +00:00
Chunk.inl.h Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
ChunkDef.h Removed the unused BlockY parameter from cChunkDef::BlockToChunk() 2013-08-03 20:05:07 +02:00
ChunkMap.cpp Added OnExploding() and OnExploded() hooks. 2013-08-09 14:58:43 +02:00
ChunkMap.h Added OnExploding() and OnExploded() hooks. 2013-08-09 14:58:43 +02:00
ChunkSender.cpp Fixed previous commit 2013-05-28 20:36:35 +00:00
ChunkSender.h Rewritten entities so that they are owned by individual chunks and ticked within their chunk's Tick() 2013-04-13 21:02:10 +00:00
ClientHandle.cpp Added OnPlayerAnimation() hook. 2013-08-11 12:29:05 +02:00
ClientHandle.h ClientHandle: alpha-sorted the HandleXXX functions declarations 2013-08-01 09:46:01 +02:00
CommandOutput.cpp Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
CommandOutput.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
CraftingRecipes.cpp Replaced MIN / MAX with std::min and std::max 2013-05-07 19:59:17 +00:00
CraftingRecipes.h Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
Cuboid.cpp cCuboid: Added the IsCompletelyInside() function 2013-03-31 18:22:55 +00:00
Cuboid.h cCuboid: Added the IsCompletelyInside() function 2013-03-31 18:22:55 +00:00
Defines.h Player eating is now properly broadcast to other players. 2013-07-28 22:55:09 +02:00
Doors.h Pickups are now being saved into Anvil. 2013-03-09 14:35:43 +00:00
Enchantments.cpp Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
Enchantments.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
Endianness.h
Entity.cpp Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 2013-08-08 09:13:13 +02:00
Entity.h Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 2013-08-08 09:13:13 +02:00
FallingBlock.cpp Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 2013-08-08 09:13:13 +02:00
FallingBlock.h Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 2013-08-08 09:13:13 +02:00
FastRandom.cpp Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
FastRandom.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
FurnaceRecipe.cpp Rewritten furnaces 2013-06-16 20:24:07 +00:00
FurnaceRecipe.h Rewritten furnaces 2013-06-16 20:24:07 +00:00
Globals.cpp
Globals.h Removed Squirrel. 2013-08-07 22:39:40 +02:00
Group.cpp Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
Group.h Merged branch "branches/hooks" into "trunk". 2013-01-12 04:46:01 +00:00
GroupManager.cpp cIniFile now reads .example.ini if not requested not to. 2013-08-05 15:24:23 +02:00
GroupManager.h Merged branch "branches/hooks" into "trunk". 2013-01-12 04:46:01 +00:00
Inventory.cpp cInventory: Added the ChangeSlotCount() function to the Lua API 2013-07-26 19:50:06 +00:00
Inventory.h cInventory: Added the ChangeSlotCount() function to the Lua API 2013-07-26 19:50:06 +00:00
Item.cpp cItem: Added useful utility functions 2013-06-16 14:12:25 +00:00
Item.h cItem: Removed a warning emitted when creating an item from air 2013-08-04 16:06:28 +02:00
ItemGrid.cpp Added an AllowEmptyStacks param to cItemGrid::HowManyCanFit(). 2013-08-11 14:54:45 +02:00
ItemGrid.h Added an AllowEmptyStacks param to cItemGrid::HowManyCanFit(). 2013-08-11 14:54:45 +02:00
LeakFinder.cpp Fixed underflow issue in LeakFinder.cpp 2013-03-25 00:07:50 +00:00
LeakFinder.h Added auto-kill-with-dump to LeakFinder if the allocated memory grows over 1 GiB. 2013-03-23 19:04:39 +00:00
LightingThread.cpp Fixed a few out-of-bounds reads 2013-05-09 19:06:16 +00:00
LightingThread.h Fixed crashes caused LightingThread overwriting memory where it shouldn't (yay valgrind!) 2012-11-16 09:40:15 +00:00
LinearInterpolation.cpp Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
LinearInterpolation.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
LinearUpscale.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
LineBlockTracer.cpp LineBlockTracer: Fixed initial errors 2013-08-04 16:07:15 +02:00
LineBlockTracer.h First attempt at implementing a cLineBlockTracer class 2013-08-04 13:25:48 +02:00
Log.cpp Fixed logging into debug console. 2013-08-12 08:42:18 +02:00
Log.h Merged branch "branches/hooks" into "trunk". 2013-01-12 04:46:01 +00:00
lua5.1.dll
LuaFunctions.h Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
LuaState.cpp Added the OnHopperPullingItem and OnHopperPushingItem hooks. 2013-08-11 14:57:07 +02:00
LuaState.h Added the OnHopperPullingItem and OnHopperPushingItem hooks. 2013-08-11 14:57:07 +02:00
LuaWindow.cpp Renamed Plugin_NewLua to PluginLua. 2013-08-10 08:22:52 +02:00
LuaWindow.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
main.cpp Removed Squirrel. 2013-08-07 22:39:40 +02:00
ManualBindings.cpp Renamed Plugin_NewLua to PluginLua. 2013-08-10 08:22:52 +02:00
ManualBindings.h
Matrix4f.cpp
Matrix4f.h Pickups are now being saved into Anvil. 2013-03-09 14:35:43 +00:00
MCLogger.cpp Fixed logging into debug console. 2013-08-12 08:42:18 +02:00
MCLogger.h Disabled coloring for redirected output. 2013-08-10 12:44:39 +02:00
MemoryLeak.h
MersenneTwister.h
Minecart.cpp Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 2013-08-08 09:13:13 +02:00
Minecart.h Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 2013-08-08 09:13:13 +02:00
MonsterConfig.cpp Mobs are assigned MaxHealth from monsters.ini; reading monsters.ini doesn't need settings.ini values anymore. 2013-07-07 15:09:05 +00:00
MonsterConfig.h Reduced most mobs' constructors to oneliners by passing parameters to superclasses 2012-12-22 09:39:13 +00:00
Noise.cpp Moved noise debugging into the Noise.* files 2013-05-15 17:09:38 +00:00
Noise.h Moved noise debugging into the Noise.* files 2013-05-15 17:09:38 +00:00
Pawn.cpp Rewritten entity-on-fire management ("forever on fire" bugs) 2013-07-01 10:39:56 +00:00
Pawn.h Rewritten entity-on-fire management ("forever on fire" bugs) 2013-07-01 10:39:56 +00:00
Pickup.cpp Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 2013-08-08 09:13:13 +02:00
Pickup.h Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 2013-08-08 09:13:13 +02:00
Piston.cpp Merge remote-tracking branch 'upstream/master' 2013-08-14 12:03:13 +01:00
Piston.h Pickups are now being saved into Anvil. 2013-03-09 14:35:43 +00:00
Player.cpp Fixed player swimstate crash. 2013-08-14 10:33:26 +02:00
Player.h Removed the need to recalculate whether player is under water in ApplyFoodExhaustion 2013-08-09 08:50:33 +01:00
Plugin.cpp cPlugin: Name now defaults to the plugin folder name. 2013-08-08 16:01:26 +02:00
Plugin.h Added the OnHopperPullingItem and OnHopperPushingItem hooks. 2013-08-11 14:57:07 +02:00
PluginLua.cpp Added the OnHopperPullingItem and OnHopperPushingItem hooks. 2013-08-11 14:57:07 +02:00
PluginLua.h Added the OnHopperPullingItem and OnHopperPushingItem hooks. 2013-08-11 14:57:07 +02:00
PluginManager.cpp Added the OnHopperPullingItem and OnHopperPushingItem hooks. 2013-08-11 14:57:07 +02:00
PluginManager.h Added the OnHopperPullingItem and OnHopperPushingItem hooks. 2013-08-11 14:57:07 +02:00
ProbabDistrib.cpp Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
ProbabDistrib.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
RCONServer.cpp Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
RCONServer.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
ReferenceManager.cpp Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
ReferenceManager.h Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
Root.cpp Removed Squirrel. 2013-08-07 22:39:40 +02:00
Root.h Advanced RCON: Command output is sent to the RCON client. 2013-06-29 15:30:05 +00:00
Server.cpp Removed some stuff again. 2013-08-03 18:36:04 +01:00
Server.h WebAdmin templates can use Lua 2013-07-29 02:37:59 +02:00
StackWalker.cpp Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
StackWalker.h Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
StringCompression.cpp Enchantments: API and sending to client 2013-06-02 10:40:20 +00:00
StringCompression.h Enchantments: API and sending to client 2013-06-02 10:40:20 +00:00
StringMap.cpp Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
StringMap.h Merged branch "branches/hooks" into "trunk". 2013-01-12 04:46:01 +00:00
StringUtils.cpp Added StringUtils functions to Lua API; added StripColorCodes(); ChatLog now strips color codes from logged messages. 2013-07-07 14:42:07 +00:00
StringUtils.h Added StringUtils functions to Lua API; added StripColorCodes(); ChatLog now strips color codes from logged messages. 2013-07-07 14:42:07 +00:00
TNTEntity.cpp Added OnExploding() and OnExploded() hooks. 2013-08-09 14:58:43 +02:00
TNTEntity.h Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 2013-08-08 09:13:13 +02:00
tolua_base.h
tolua++.exe
tolua++.h
Tracer.cpp Tracer: removed the "start and end in the same block" warning, it is a normal condition. 2013-04-06 16:12:52 +00:00
Tracer.h Merged branch "branches/hooks" into "trunk". 2013-01-12 04:46:01 +00:00
Vector3d.cpp Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
Vector3d.h Merged branch "branches/hooks" into "trunk". 2013-01-12 04:46:01 +00:00
Vector3f.cpp
Vector3f.h Merged branch "branches/hooks" into "trunk". 2013-01-12 04:46:01 +00:00
Vector3i.cpp
Vector3i.h Fixed Linux compilation, slight code cleanup 2013-04-19 08:21:39 +00:00
virtual_method_hooks.lua Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
WebAdmin.cpp Removed LuaScript. 2013-08-08 16:30:02 +02:00
WebAdmin.h Removed LuaScript. 2013-08-08 16:30:02 +02:00
WebPlugin.cpp WebAdmin templates can use Lua 2013-07-29 02:37:59 +02:00
WebPlugin.h WebAdmin templates can use Lua 2013-07-29 02:37:59 +02:00
World.cpp Buncha bugfixes [SEE DESC] 2013-08-14 11:44:02 +01:00
World.h Added OnExploding() and OnExploded() hooks. 2013-08-09 14:58:43 +02:00
XMLParser.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00