flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
4,637 Commits 1 Branch 0 Tags 92 MiB
1259844084
Commit Graph

1234 Commits

Author SHA1 Message Date
Tiger Wang
528467bc5c Fixed compile 2014-02-27 21:48:49 +00:00
Alexander Harkness
03624f33a7 Merge pull request #730 from tonibm19/master 
added mooshroom to cow conversion
 2014-02-27 21:15:47 +00:00
tonibm19
1de2c23d64 added mooshroom to cow conversion 2014-02-27 22:04:48 +01:00
Tycho
84913299f4 Added some Metadate rotaters using templated Mixin 2014-02-27 11:33:35 -08:00
madmaxoft
a23b5d13bd Added a "nooutbuf" cmdline param. 
This forces that the stdout stream uses no buffer, even when not a TTY. Used for running MCServer under ZeroBraneStudio.
 2014-02-27 15:17:42 +01:00
madmaxoft
9c6d72a023 Fixed crash and some warnings in map handling. 
Fixes #728.
 2014-02-27 09:06:25 +01:00
Tiger Wang
a97f28939f Fixed sheep ASSERTing sometimes 2014-02-26 23:33:54 +00:00
Tiger Wang
baf2d88921 Implemented ballistic missiles (fireworks) 
+ Added fireworks
 2014-02-26 23:33:52 +00:00
madmaxoft
cb40d114ab Fixed a gcc warning in FastNBT.h. 2014-02-26 22:17:28 +01:00
madmaxoft
aaddc98b46 Attempted fix for several GCC warnings. 2014-02-26 21:37:38 +01:00
madmaxoft
5cceca7fbc Added more utility functions to cCuboid. 
GetVolume(), Expand(), ClampX(), ClampY(), ClampZ()
 2014-02-26 20:22:34 +01:00
madmaxoft
9ab766189d Added useful parameter overloads to cBlockArea Lua API. 2014-02-24 23:17:12 +01:00
madmaxoft
f96801290e Fixed tolua export for Byte. 
No longer treated as an unknown class.
 2014-02-24 22:52:55 +01:00
madmaxoft
46f6cef99f Fixed compilation in MSVC (forward class definitions). 2014-02-24 22:47:58 +01:00
Tycho
df193c8f6f BlockEntities is warnings free 2014-02-24 11:29:59 -08:00
Mattes D
23093fd4d1 Merge pull request #710 from TheJumper/master 
Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
 2014-02-24 18:30:44 +01:00
TheJumper
0b6aa7b370 Fixed Formatting, added compiler warning suppressing methods, fixed comments 2014-02-24 15:38:38 +01:00
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
TheJumper
2cc597372a Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters 2014-02-23 19:50:51 +01:00
TheJumper
8716263238 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-23 19:50:51 +01:00
madmaxoft
fd4af0f992 Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta(). 
They no longer require the ghost output params.
 2014-02-23 19:50:51 +01:00
Howaner
1f726b7d9d Rename SkullEntity to MobHeadEntity 2014-02-23 19:50:50 +01:00
Howaner
a71e8be4d2 Add break to Protocol17x.cpp and use new comment delimiter 2014-02-23 19:50:50 +01:00
Howaner
7bc5946883 Add Heads completely 2014-02-23 19:50:50 +01:00
Howaner
ab2eba17ec Add Skulls/Heads 2014-02-23 19:50:50 +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
Howaner
b3339a6617 Better Jukebox API 2014-02-21 22:26:04 +01:00
Howaner
3777873f22 Remove users.ini generation in Player.cpp and use the CheckUsers() Function 2014-02-21 15:10:31 +01:00
Howaner
5b39572334 Remove old Output Finish 2014-02-21 14:56:33 +01:00
Howaner
a755758553 Unicode :-( 2014-02-21 14:55:28 +01:00
Howaner
21febaf4b3 Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini 2014-02-21 14:53:46 +01: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
Howaner
52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
andrew
393ca0221d Map decorators; Map clients 2014-02-18 20:50:08 +02:00
madmaxoft
b1c6b4f584 The cuboid for cWorld::SetAreaBiome() doesn't need sorting. 2014-02-18 13:49:24 +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
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
Tiger Wang
7a23e27fc5 Added an explanatory comment 2014-02-18 00:29:10 +00:00
Tiger Wang
ced6eb971d Comments & new BLOCK_FACE constants 2014-02-18 00:28:31 +00:00
Tiger Wang
320cc74f0a Implemented paintings, fixes #689 
+ Implemented paintings
 2014-02-18 00:16:03 +00:00
Tiger Wang
7c0d11fbb2 Used new BLOCK_FACE constants 
Also added more comments
 2014-02-17 23:38:25 +00:00
Tiger Wang
464ec47eb7 Implemented item frames, a part of #689 
+ Implemented Item Frames
* Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
 2014-02-17 23:00:03 +00:00
madmaxoft
1a26f05ed0 Added cPluginManager:GetPluginsPath() to the Lua API. 2014-02-17 23:36:39 +01:00
madmaxoft
865ae82114 Add Lua plugin path to package.path and .cpath. 
Fixes #693.
 2014-02-17 23:12:46 +01:00
Howaner
777041806f Add Skulls/Heads 2014-02-17 20:14:08 +01:00
Alexander Harkness
72d312ac9b Merge pull request #690 from tonibm19/master 
Now mobs can't escape from fences.
 2014-02-17 16:12:59 +00:00
tonibm19
8707f7ddc8 Improved formatting 2014-02-17 17:01:22 +01:00
andrew
3b24bc870b Map item handler; Fixed several bugs 2014-02-17 16:27:12 +02:00
Alexander Harkness
d47e0b055b Merge pull request #692 from mc-server/wolfcleanup 
Wolf cleanup
 2014-02-17 10:21:38 +00:00
madmaxoft
a4ff63f223 Fixed a memory leak in CompositeChat. 2014-02-17 10:15:18 +01:00
madmaxoft
ea55a22a71 Links sent via chat messages are clickable. 
Fixes #658.
 2014-02-16 23:51:32 +01:00
madmaxoft
4a24e39ac1 Implemented cCompositeChat::ParseText(), incl. self-test. 2014-02-16 23:32:08 +01:00
madmaxoft
b0dbe51210 Fixed cBoundingBox self-test code-style. 
Also made the class name unique and the global variable static, to avoid linkage problems with other self-tests
 2014-02-16 23:32:08 +01:00
Mattes D
b90c9936b8 Merge pull request #683 from mc-server/redstoneimprovements 
Redstone speed improvements
 2014-02-16 21:44:15 +01:00
tonibm19
60bcf2807a Now mobs can't escape from fences. 2014-02-16 18:18:07 +01:00
Tiger Wang
2350b77bb5 Fixes to previous commit 2014-02-16 17:08:49 +00:00
Tiger Wang
1a84102b10 Slight cleanup of wolf code 2014-02-16 13:47:55 +00:00
Mattes D
ec37e53465 Merge pull request #686 from Howaner/GlobalFixes 
Add Locale to ClientHandle
 2014-02-16 14:46:36 +01:00
Tiger Wang
4908b6f500 Fixed minor formatting issues from #682 
- Removed unused PlaySoundEffect
* Simplified and parenthesised code
 2014-02-16 13:37:36 +00:00
Howaner
48d28a0f94 Add Locale to ClientHandle 2014-02-16 13:26:07 +01:00
Tiger Wang
55a6306e2b Fixed a glaring bug with chunk cross-simulating 
* A chunk's redstone blocks list is no longer touched if AddBlock was
being called with another chunk's coordinates
* Fixed chunk boundary checks
 2014-02-16 00:45:14 +00:00
Howaner
707916b404 Replace random Float Generation and broadcast the Exp Pickup Sound 2014-02-16 01:25:39 +01:00
Howaner
f3bd288f02 Add Exp Bottle Effects 2014-02-16 01:19:30 +01:00
Howaner
507a8a4b84 Set max. Players in the Tablist to 60 2014-02-16 01:18:57 +01:00
Howaner
d15d6acc58 Disable Hunger Death 2014-02-16 01:18:10 +01:00
madmaxoft
52cd9dfe9f Removed the unnecessary LoopPlayersAndBroadcastChat() functions. 2014-02-15 23:26:19 +01:00
madmaxoft
0f1f7583ae Implemented cCompositeChat. 
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678.
 2014-02-15 23:17:49 +01:00
Tiger Wang
d273cc4142 Added a 'default:' for SimChunk()'s switch 2014-02-15 20:22:51 +00:00
Tiger Wang
c494d0f6f2 A fix and an improvement 
* Fixed a special case with the wrong ChunkX/Z values being used to
calculate a relative position
* Simplified data structure adding and removing operations (no more
pointers!)
- Removed one character of whitespace :D
 2014-02-15 19:56:45 +00:00
Alexander Harkness
584f7bd806 Merge pull request #679 from mc-server/NotchDeath 
NotchApple
 2014-02-15 19:04:13 +00:00
STRWarrior
0040a88b9b If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch 2014-02-15 19:51:05 +01:00
andrew
cf96e69716 cMap::UpdateRadius 2014-02-15 20:06:47 +02:00
Tiger Wang
8fbb936b63 Fixed TNT fizzing everywhere 2014-02-15 15:53:02 +00:00
Tiger Wang
6eeeb2aa01 Sizeable speed improvements to redstone 
+ Moved all simulator data into individual chunks
* Cleaned up parameters for functions and some code
* Fixed repeaters powering off faster than they power on

The main issue before was that, although the redstone simulator stored
blocks to be simulated in individual cChunks, other data, such as
powered lists, and etcetera, were global regardless of which chunk was
being simulated. Therefore, with worlds with lots of redstone, each tick
saw the ticking of chunks, which themselves iterated through the entire
dataset needlessly, creating LOTS of lag. Should be better now :)
 2014-02-15 15:51:49 +00:00
Howaner
70a0dcb1eb Add more Sounds to Redstone Simulator 2014-02-15 16:30:28 +01:00
Howaner
87e79de4b7 Add Fence Gate to Redstone Simulator 2014-02-15 16:30:27 +01:00
Mattes D
48eafee823 Merge pull request #664 from mc-server/generalfixes 
General fixes
 2014-02-15 15:06:23 +01:00
Tiger Wang
b0fd5511ea Fixed typographical error 2014-02-15 13:55:58 +00:00
Tiger Wang
c6a2e8c688 Removed debug messages again 2014-02-15 12:58:17 +00:00
Alexander Harkness
a57c8bd7da Merge pull request #677 from mc-server/BroadcastParticleEffect 
Broadcast particle effect
 2014-02-15 10:52:31 +00:00
STRWarrior
ceb16ea2f7 Exported cWorld::BroadcastParticleEffect. 2014-02-15 11:38:20 +01:00
andrew
c7fb000858 EmptyMap item handler 2014-02-14 17:38:22 +02:00
andrew
5b92b877bc Send map when selected 2014-02-14 16:21:16 +02:00
Tiger Wang
f4f0099947 Added proper debug messages 2014-02-13 20:20:37 +00:00
Tiger Wang
c0e7d6fec9 Fancy stuff with constant references 2014-02-13 19:57:23 +00:00
andrew
32b465b8e1 IDCount Serialization 2014-02-13 21:36:24 +02:00
madmaxoft
9bb48a8fa4 Merged branch 'narroo/master'. 
This merges pull request #661.
 2014-02-13 17:04:25 +01:00
andrew
92e85cc960 Implementation of in-game maps 2014-02-13 17:13:09 +02:00
Tiger Wang
6ed4f476ce Added more missing GetClassStatic()s 2014-02-12 22:06:59 +00:00
Tiger Wang
e915a0df4c Removed some unneeded BroadcastWholeWindow()s 2014-02-12 22:06:13 +00:00
Tiger Wang
f97ce30151 Changed inheritance a bit 
* cBlockEntityWithItems now inherits from cBlockEntityWindowOwner
 2014-02-12 22:01:22 +00:00
Tiger Wang
91ebb6cef0 Made player jump reset less ambiguous 2014-02-12 21:53:46 +00:00
Tiger Wang
7ced2f290f Simplified Attack() tracing 2014-02-12 21:53:21 +00:00
STRWarrior
8470841f84 Fixed #573 2014-02-12 19:07:17 +01:00
Tiger Wang
a0a44b969e Improved pressure plates 
+ Two (or more) pressure plates can be triggered at the same time
* Fixed issues caused by pressure plates not being in the sources list
 2014-02-11 23:13:49 +00:00
Tiger Wang
9d54f2b761 Fixed #190 
+ Hoppers now collect pickups above them
 2014-02-11 22:54:01 +00:00
Tiger Wang
06239c8336 Fixed #627 
- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
 2014-02-11 22:09:56 +00:00
Tiger Wang
c53406f0d4 Fixed #612 
* Chests send contents updates to client
 2014-02-11 22:04:11 +00:00
narroo
e53b331b4a Fixed formatting. Moved UnloadUnusedChunks from public to private. 2014-02-11 14:38:28 -05:00
madmaxoft
a1e01ff725 cWorld:ChunkStay() accepts nils as callbacks. 
Also removed leftover debug logging.
 2014-02-11 15:04:35 +01:00
madmaxoft
33c84aaa4d Added cLuaState::CheckParamFunctionOrNil(). 
Also fixed error reporting for the two function-checking functions.
 2014-02-11 15:03:35 +01:00
narroo
d7f32ed682 Fixed formatting of previous commit. 2014-02-11 08:01:25 -05:00
madmaxoft
892c7eb57f More gcc warnings fixed. 2014-02-11 11:56:29 +01:00
madmaxoft
2559aa58f4 Made cChunkStay's destructor virtual. 2014-02-11 11:46:19 +01:00
madmaxoft
7e80b04114 Fixed gcc warnings in Item.h. 2014-02-11 11:30:11 +01:00
madmaxoft
b41bb3bb44 Fixed nested plugin function calls. 2014-02-11 08:52:14 +01:00
madmaxoft
8a8997cc38 Merge branch 'master' into ChunkStay 2014-02-11 08:50:30 +01:00
narroo
e8e76a6058 Fixed bug #385. UnloadUnusedChunks now has the same interface as 
SaveAllChunks.  Meaning, QueueUnloadUnusedChunks and the supporting
cTaskUnloadUnusedChunks has been added.  Use QueueUnloadUnusedChunks from
now on to prevent deadlocking.
 2014-02-10 20:00:07 -05:00
madmaxoft
de7bf126db Added LuaChunkStay to Bindings sources. 
This should fix *nix compilation. Also alpha-sorted the lists.
 2014-02-10 23:23:04 +01:00
madmaxoft
9cebc9157c Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay(). 
This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready.
 2014-02-10 22:47:10 +01:00
madmaxoft
589a4839df cLuaState: Stack traces don't include ghost 0-th element. 2014-02-10 22:44:56 +01:00
madmaxoft
5aa1123f70 Added cPluginLua::cOperation. 
This class should be used to lock-and-access the plugin's LuaState. cPluginLua::GetLuaState() is unsafe and by this commit obsolete.
 2014-02-10 20:38:02 +01:00
worktycho
7ad4a86c49 Added additional parenthasies 2014-02-10 18:06:49 +00:00
Tycho
9f542ee0f8 Merge branch 'master' into boatsFix 
Conflicts:
	src/Items/ItemBoat.h
 2014-02-10 10:01:50 -08:00
worktycho
23f69bc093 Fixed stupid mistax in conditional 
boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one.
 2014-02-10 17:59:17 +00:00
tonibm19
75e0b38d83 Maybe fixed boat placing 2014-02-10 18:17:44 +01:00
madmaxoft
47a497fa89 First working version of cLuaChunkStay. 
It works, but has random failures, probably due to threading issues.
 2014-02-09 20:39:45 +01:00
madmaxoft
9455f59b11 Initial Lua cChunkStay export. 2014-02-09 18:56:16 +01:00
madmaxoft
310a25c456 cLuaState::cRef can be unbound and re-bound. 
This will allow us to store Lua references as member variables in classes and initialize those later than in the constructor.
 2014-02-09 18:39:22 +01:00
madmaxoft
4bcaf302b9 Added AllToLua.pkg to MSVC project files. 
MSVC ignores the file when compiling and it makes it easier to open it up for editing.
 2014-02-09 16:22:49 +01:00
madmaxoft
a184d59209 Merge remote-tracking branch 'origin/master' into ChunkStay 2014-02-09 09:36:42 +01:00
Tiger Wang
c68bdaf34b Fixed compile and some warnings in MSVS 2014-02-09 00:57:22 +00:00
Tiger Wang
9d1c9097e3 Merge remote-tracking branch 'origin/master' into playerimprovements 
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
 2014-02-09 00:14:42 +00:00
Tiger Wang
f86f066615 Merge branch 'master' into playerimprovements 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-02-09 00:04:42 +00:00
Mattes D
d2bc39ba84 Merge pull request #656 from mc-server/ReloadGroups 
The console reload command also reloads the groups.
 2014-02-09 00:14:44 +01:00
STRWarrior
2a741e719c "reload" is back. 2014-02-09 00:13:25 +01:00
STRWarrior
011a334a8a Split "reload" in "reloadplugins" and "reloadgroups". 2014-02-09 00:06:37 +01:00
Tiger Wang
14b5054c95 Fixed a boat ASSERT 2014-02-08 23:02:50 +00:00
STRWarrior
645c096e2b The console reload command also reloads the groups. 2014-02-09 00:02:16 +01:00
madmaxoft
cf48968835 Moved a forgotten comment back to its place. 2014-02-08 22:35:45 +01:00
madmaxoft
df0ecc6c07 Fixed lighting thread queueing. 2014-02-08 22:33:42 +01:00
madmaxoft
7432d2f74d Fixed ChunkStay initialization. 2014-02-08 22:23:38 +01:00
madmaxoft
a4bf44858d Fixed gcc compilation. 2014-02-08 22:01:04 +01:00
madmaxoft
ea71bfa9b6 Initial ChunkStay code. 2014-02-08 21:55:21 +01:00
Mattes D
169b918222 Merge pull request #653 from mc-server/RedstoneSimulator 
Improvements for the redstone simulator.
 2014-02-08 14:54:00 +01:00
madmaxoft
cfd6875c86 Fixed cWorld:TryGetHeight() API. 2014-02-08 13:35:08 +01:00
STRWarrior
53475e36d5 Fixed comment. 2014-02-08 11:20:00 +01:00
STRWarrior
3a897844a0 Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). 2014-02-07 22:59:08 +01:00
STRWarrior
09a23fa114 Fixed some end of lines 2014-02-07 22:25:15 +01:00
STRWarrior
176664810b Implemented an easy way of adding new redstone simulators. 
Also added a "noop" redstone simulator that does the same as the fluid version.
 2014-02-07 22:13:55 +01:00
Tiger Wang
fadf3c037b Moved Gamemode setting into General root tag 2014-02-07 20:11:56 +00:00
Tiger Wang
0f36d1c122 Added sender name to PM if prefixes disabled 
* Also moved the PVP setting into Mechanics
 2014-02-07 20:10:12 +00:00
Tiger Wang
88a64ec40d Improved chat messaging functions 
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
 2014-02-07 18:58:52 +00:00
madmaxoft
e165da946e WebAdmin is stopped properly on server shutdown / restart. 
Fixes #272.
 2014-02-07 12:26:41 +01:00
madmaxoft
916020d6c2 Fixed wiki link in auto-generated settings.ini. 2014-02-07 12:07:22 +01:00
Tiger Wang
aa8b46e947 Server internally uses new functions 2014-02-05 23:24:16 +00:00
Tiger Wang
3450f0ca42 Added more chat functions 2014-02-05 23:24:02 +00:00
Mattes D
24dfe7f9cc Merge pull request #648 from worktycho/runMCServer 
Added BoundingBox Test
 2014-02-05 21:26:12 +01:00
worktycho
374fecf61f Change Output to stderr 2014-02-05 20:13:37 +00:00
Mattes D
cd634ea138 Merge pull request #649 from mc-server/GroupsPermissions 
Removed deprecated HasCommand function
 2014-02-05 21:07:10 +01:00