1
0
cuberite-2a/source
Tiger Wang fb32c28f80 Merge branch 'master' of https://github.com/tigerw/MCServer into tigerw-master
Conflicts:
	source/Piston.cpp

Merged pull request and fixed merge conflicts
2013-08-18 15:58:27 +01:00
..
BlockEntities Added cWindow property manipulation API. 2013-08-18 13:26:37 +02:00
Blocks Buncha bugfixes [SEE DESC] 2013-08-14 11:44:02 +01:00
Generating Generation and simulation defaults 2013-08-14 22:26:15 +01:00
Items Compilation and Minecart fixes 2013-08-16 13:04:06 +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 Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX. 2013-08-16 10:48:30 +02:00
OSSupport cListenThread correctly closes all sockets. 2013-08-18 12:27:46 +02:00
Protocol Added cWindow property manipulation API. 2013-08-18 13:26:37 +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 Added cWindow property manipulation API. 2013-08-18 13:26:37 +02:00
WorldStorage Compilation and Minecart fixes 2013-08-16 13:04:06 +01:00
AllToLua.bat Merge branch 'master' into PerWorldThreads. 2013-08-13 23:02:22 +02:00
AllToLua.pkg Renamed Plugin_NewLua to PluginLua. 2013-08-10 08:22:52 +02:00
AllToLua.sh Updated zlib, added chat formatting, fixed upside down stairs and slabs, fixed makefiles, hopefully updated vc project files 2012-06-03 23:35:17 +00:00
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 cWindow property manipulation API. 2013-08-18 13:26:37 +02:00
Bindings.h Added cWindow property manipulation API. 2013-08-18 13:26:37 +02: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 Merge remote-tracking branch 'upstream/master' 2013-08-16 11:25:53 +01:00
BlockID.h Enhancements to Tabcompletion and Compile Fix 2013-08-18 11:58:19 +01: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 Properly fixed piston non-animation 2013-08-18 14:52:38 +01:00
Chunk.h Properly fixed piston non-animation 2013-08-18 14:52:38 +01:00
Chunk.inl.h Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
ChunkDef.h Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX. 2013-08-16 10:48:30 +02:00
ChunkMap.cpp Properly fixed piston non-animation 2013-08-18 14:52:38 +01:00
ChunkMap.h Properly fixed piston non-animation 2013-08-18 14:52:38 +01: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 cWindow property manipulation API. 2013-08-18 13:26:37 +02:00
ClientHandle.h Added cWindow property manipulation API. 2013-08-18 13:26:37 +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
DeadlockDetect.cpp Added simple deadlock detection code. 2013-08-14 22:39:12 +02:00
DeadlockDetect.h Added simple deadlock detection code. 2013-08-14 22:39:12 +02:00
Defines.h Feature and bugfixes [SEE DESC] 2013-08-16 11:23:24 +01: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 Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
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 Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
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 14:47:08 +02:00
Log.h Merged branch "branches/hooks" into "trunk". 2013-01-12 04:46:01 +00:00
lua5.1.dll Added m_IP to player class and binding to get IP for LUA. (Probably should use m_pState) 2011-11-09 22:17:30 +00:00
LuaFunctions.h Source files cleanup: The rest of the files renamed. 2012-09-23 22:09:57 +00:00
LuaState.cpp Fixed assert failures in cLuaState when using it for pushing a StringVector. 2013-08-18 00:20:23 +02:00
LuaState.h Added the OnHopperPullingItem and OnHopperPushingItem hooks. 2013-08-11 14:57:07 +02:00
LuaWindow.cpp Fixed LuaWindow destructor causing a crash. 2013-08-18 00:39:15 +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 Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
Matrix4f.cpp Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
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 14:47:08 +02:00
MCLogger.h Disabled coloring for redirected output. 2013-08-10 12:44:39 +02:00
MemoryLeak.h Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
MersenneTwister.h Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
Minecart.cpp Possible entity ID fix? 2013-08-16 13:12:44 +01:00
Minecart.h Another compile fix 2013-08-16 13:20:33 +01: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 branch 'master' of https://github.com/tigerw/MCServer into tigerw-master 2013-08-18 15:58:27 +01:00
Piston.h Made cPiston code more readable and configurable. 2013-08-18 14:28:52 +02:00
Player.cpp Merge pull request #93 from mc-server/PerWorldThreads 2013-08-15 01:56:52 -07:00
Player.h Clients are now ticked in cServer first, then in cWorld once they get assigned a world. 2013-08-13 22:45:29 +02: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 Added cRoot:BroadcastChat() to the Lua API. 2013-08-17 23:58:37 +02:00
Root.h Added cRoot:BroadcastChat() to the Lua API. 2013-08-17 23:58:37 +02:00
Server.cpp The server Tick thread ticks PluginManager. 2013-08-17 23:45:58 +02:00
Server.h Server counts the players correctly. 2013-08-14 19:11:54 +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 Fixed compile-time warning in TNTEntity. 2013-08-17 18:08:46 +02:00
TNTEntity.h Fixed compile-time warning in TNTEntity. 2013-08-17 18:08:46 +02:00
tolua_base.h Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
tolua++.exe Fixed tolua++ sources to consider AString a builtin string type. Fixed tolua++ VC projects for compilation with local Lua. 2012-06-04 14:58:17 +00:00
tolua++.h MCServer c++ source files 2011-10-03 18:41:19 +00:00
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 Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
Vector3f.h Merged branch "branches/hooks" into "trunk". 2013-01-12 04:46:01 +00:00
Vector3i.cpp Attempt to bring sanity to newlines across systems. 2012-06-14 13:06:06 +00:00
Vector3i.h Fixed Linux compilation, slight code cleanup 2013-04-19 08:21:39 +00:00
virtual_method_hooks.lua Disabled Lua virtual hooks. 2013-08-18 10:51:21 +02: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 Properly fixed piston non-animation 2013-08-18 14:52:38 +01:00
World.h Properly fixed piston non-animation 2013-08-18 14:52:38 +01:00
XMLParser.h Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00