1
0
Commit Graph

4363 Commits

Author SHA1 Message Date
Mattes D
93f881fab4 Merge pull request #717 from worktycho/warningfixes
fixed globals.h warnings
2014-02-23 21:52:54 +01:00
Tycho
e3f38b04fd Undid changing core 2014-02-23 12:25:48 -08:00
Tycho
462e0bcf46 fixed globals.h warnings 2014-02-23 12:23:35 -08:00
Mattes D
b432f57608 Updated CONTRIBUTING file with formatting and essential rules. 2014-02-23 14:57:59 +01:00
madmaxoft
6da013c538 Documented cBlockArea:GetOrigin(), :GetSize() and :GetVolume(). 2014-02-23 14:28:03 +01:00
madmaxoft
ea84f8cf89 Added cBlockArea::GetVolume, exported to Lua API. 2014-02-23 14:08:05 +01:00
madmaxoft
3af235b9bb Added cBlockArea:GetSize() and :GetOrigin() to Lua API.
These don't have a direct C++ equivalent, but are rather useful for the plugins.
2014-02-23 14:03:24 +01:00
madmaxoft
1b9840b328 APIDump: Documented cClientHandle:HasPluginChannel. 2014-02-20 23:32:08 +01:00
madmaxoft
27e77a28fa cClientHandle manages the client-registered plugin channels.
Fixes #706.
2014-02-20 23:24:39 +01:00
madmaxoft
ffc4691f48 Removed problematic utf8. 2014-02-20 22:17:01 +01:00
Mattes D
6c9779630e Merge pull request #704 from Howaner/GlobalFixes
Global fixes
2014-02-20 22:14:16 +01:00
Howaner
337c4e5cd4 Bad UTF-8 o.O 2014-02-20 22:02:14 +01:00
Mattes D
eabf25ddbd Merge pull request #702 from TheJumper/master
BlockBed.cpp: Fixed Multiple people in one bed.
2014-02-20 21:33:54 +01:00
Howaner
d47f421e2d Remove typeinfo import in IncrementalRedstoneSimulator 2014-02-20 21:00:16 +01:00
Howaner
1016922012 Fix Cauldron 2014-02-20 20:58:23 +01:00
Howaner
5e7f2ba6d6 Add Wolf Heal with Food 2014-02-20 20:41:53 +01:00
madmaxoft
50bebd2dbd Disabled the leak finder. 2014-02-20 20:13:06 +01:00
Howaner
4dd39f8cd6 Add Pressure Plate Sound 2014-02-20 19:21:04 +01:00
Howaner
69961fc4df Add Light weighted pressure plates 2014-02-20 19:07:32 +01:00
Howaner
4b7891f290 Add Hay Bale to Burnable 2014-02-20 17:56:35 +01:00
Howaner
01c01bac37 Add 'Meta < 3' to Cauldron 2014-02-20 17:45:18 +01:00
TheJumper
1b081a0fbb BlockBed.cpp: Fixed space at if statement
Added a space after an if statement and before the first bracket to keep up code conventions.
2014-02-20 17:31:38 +01:00
TheJumper
c2277c6fee BlockBed.cpp: Fixed Multiple people in one bed.
OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed.
2014-02-20 16:26:50 +01:00
Mattes D
191a08fc32 Merge pull request #700 from Howaner/GlobalFixes
Add new Trees (without Generator)
2014-02-20 16:24:52 +01:00
madmaxoft
7b8ff7c986 APIDump: Fixed cBlockArea:GetRelBlockType() return types. 2014-02-20 11:06:15 +01:00
madmaxoft
a3fa52ec73 Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta().
They no longer require the ghost output params.
2014-02-20 11:06:14 +01:00
Mattes D
87db4b6a90 Merge pull request #697 from Howaner/Skull
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
Howaner
16f3809ded Add BlockNewLeaves.h and rename Darkoac to Darkoak 2014-02-19 19:18:40 +01:00
Howaner
a5a52fe160 Add new Trees (without Generator) 2014-02-19 16:58:31 +01:00
Howaner
d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
Howaner
823ee3a125 Add break to Protocol17x.cpp and use new comment delimiter 2014-02-19 14:12:34 +01:00
Mattes D
1d9b02c956 Merge pull request #694 from mc-server/itemframes
Implemented item frames, a part of #689
2014-02-18 23:21:05 +01:00
Tiger Wang
a686656253 Merge branch 'master' into itemframes
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
2014-02-18 22:13:44 +00:00
Mattes D
98332c5b76 Merge pull request #696 from mc-server/paintings
Implemented paintings, fixes #689
2014-02-18 23:08:12 +01:00
Tiger Wang
08229956ff Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes 2014-02-18 22:07:30 +00:00
Tiger Wang
8b2153ba97 De-breaked stuff 2014-02-18 22:07:21 +00:00
Tiger Wang
5b961453d1 Fixed possible ASSERT failure 2014-02-18 21:54:53 +00:00
Tiger Wang
05789f9e66 Changed BlockFace type to eBlockFace 2014-02-18 21:33:33 +00:00
Howaner
52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
madmaxoft
29269a6ef8 ProtoProxy: ignoring PolarSSL build files. 2014-02-18 13:51:45 +01:00
madmaxoft
600861988e APIDump: Documented missing cWorld functions. 2014-02-18 13:49:24 +01:00
madmaxoft
b1c6b4f584 The cuboid for cWorld::SetAreaBiome() doesn't need sorting. 2014-02-18 13:49:24 +01:00
madmaxoft
71b6fd3da9 Debuggers: Added a test for the cWorld:SetAreaBiome() function. 2014-02-18 13:49:23 +01:00
madmaxoft
803ea41236 Added cWorld:SetAreaBiome() API function.
Fixes #675.
2014-02-18 13:49:23 +01:00
madmaxoft
fc8743df96 Added a bit more documentation to cForEachChunkProvider. 2014-02-18 13:49:23 +01:00
Tiger Wang
8ad4ab5bc1 Updated Core 2014-02-18 12:48:25 +00:00
Tiger Wang
9c409fc65c Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes 2014-02-18 11:44:19 +00:00
Tiger Wang
d5ee899d0e Added a brace
====
{       }
{  __  }
{  | |  }
====

REMOVE ALL THE BRACES!!
2014-02-18 11:44:09 +00:00
Tiger Wang
6788dbe7f2 Properly exported and documented paintings 2014-02-18 11:37:45 +00:00
Mattes D
d05964cbd2 Merge pull request #695 from narroo/Issue673
ChunkWorx uses QueueUnloadUnusedChunks
2014-02-18 07:07:45 +01:00