Commit Graph
1055 Commits
Author SHA1 Message Date
STRWarrior 9440b61c8c Fixed MCServer not compiling with C++03 compilers 2014-02-24 14:43:46 +01:00
STRWarrior 145b3492e7 Small improvements to boats. 2014-02-24 12:58:57 +01:00
Tiger Wang f77720c43f Merge pull request #669 from xdot/master
Implementation of in-game maps :D
2014-02-24 10:28:34 +00:00
madmaxoft 31d15f8654 Removed an unused member variable from cChunk. 2014-02-24 09:34:37 +01:00
madmaxoft 0aa8f765f9 Fixed crash in cBlockArea rotation.
Fixes #720.
2014-02-24 09:34:37 +01:00
madmaxoft 728e3c68b6 Fixed a possible crash in cWorld::WakeUpSimulatorsInArea().
The Y coords weren't checked.
2014-02-24 09:34:37 +01:00
Mattes D f8586b8e9d Merge pull request #716 from Howaner/BreakFix
No Sword Block Destroying in Creative Mode
2014-02-23 23:06:50 +01:00
Tycho 462e0bcf46 fixed globals.h warnings 2014-02-23 12:23:35 -08:00
Howaner 084971424f Use the ItemCategorie::IsSword() Method. 2014-02-23 20:31:58 +01:00
Howaner cc34898e45 No Sword Block Destroying in Creative Mode 2014-02-23 20:02:44 +01:00
madmaxoft ea84f8cf89 Added cBlockArea::GetVolume, exported to Lua API. 2014-02-23 14:08:05 +01:00
andrew f471873945 Maps: Improvements 2014-02-23 15:05:03 +02: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
andrew 30b22e9f59 Manually exported DoWithMap 2014-02-23 13:25:02 +02:00
andrew 9fa4fa1cc7 Documented and exported cMapManager 2014-02-23 12:55:55 +02:00
andrew 866fde81ca Documented and exported cMap 2014-02-22 13:59:49 +02:00
andrew a96eea5e66 Semi-working implementation of cMap::UpdatePixel 2014-02-22 12:50:30 +02:00
andrew 8bf5d116fe Split cMap::UpdateClient 2014-02-21 15:26:33 +02: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
andrew f201f4f176 Thread safe cMap manager 2014-02-20 16:38:37 +02:00
andrew 83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02: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
andrew 58a708825f cMapDecorator: Implemented random rotations 2014-02-19 20:57:14 +02: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
andrew 4a1ac57408 Documented cMap 2014-02-19 15:28:48 +02:00
Howaner 823ee3a125 Add break to Protocol17x.cpp and use new comment delimiter 2014-02-19 14:12:34 +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