1
0
Fork 0
Commit Graph

78 Commits

Author SHA1 Message Date
andrew f471873945 Maps: Improvements 2014-02-23 15:05:03 +02: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
Mattes D 87db4b6a90 Merge pull request #697 from Howaner/Skull
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
Howaner d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
Howaner 52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01: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
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
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 5b92b877bc Send map when selected 2014-02-14 16:21:16 +02: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
narroo e53b331b4a Fixed formatting. Moved UnloadUnusedChunks from public to private. 2014-02-11 14:38:28 -05: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
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 a184d59209 Merge remote-tracking branch 'origin/master' into ChunkStay 2014-02-09 09:36:42 +01: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
madmaxoft ea71bfa9b6 Initial ChunkStay code. 2014-02-08 21:55:21 +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 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 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
Tiger Wang 3450f0ca42 Added more chat functions 2014-02-05 23:24:02 +00:00
Mattes D 0ceb0ef607 Merge pull request #635 from tonibm19/master
Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
2014-02-04 09:23:03 -08:00
Tycho 80807eec2c Increased Type safety of Biomes
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-02-03 12:26:17 -08:00
tonibm19 df8b589b31 Not exporting FindClosestPlayer 2014-02-03 21:06:43 +01:00
tonibm19 c2e7dd34d9 Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API 2014-02-03 20:52:11 +01:00
Tycho c6304b2b4f Changed pointers to references 2014-02-01 05:06:32 -08:00
Tycho fec17409d2 Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/World.h
2014-01-31 15:31:05 -08:00
Tycho 25ec7750aa Changed signitures of Several BLockHandler Methods
Changed the signitures of the following to use interfaces:
GetPlacementBlockTypeMeta
OnPlaced
OnPlacedByPlayer
OnDestroyed
OnNeighbourChanged
NeighbourChanged
OnUse
CanBeAt
Check
2014-01-31 15:17:41 -08:00
STRWarrior babc80ed77 The world can now be configured wether farmers should be able to harvest crops. 2014-01-27 22:02:19 +01:00
Tycho bed2ee22e8 Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/Blocks/BlockRail.h
	src/World.h
2014-01-26 06:28:51 -08:00
Tycho 14e48ccb4b Refactored cBlockHandler::OnUse and dependents 2014-01-26 06:20:39 -08:00
Mattes D f78a62a5e3 Merge pull request #575 from worktycho/GeneratingBenchmark
More Interfaces to decouple Generator from the rest of the code
2014-01-25 13:55:33 -08:00
Tycho 15b92af166 First attempt at Implementing Interfaces 2014-01-25 11:14:14 -08:00
Tiger Wang 314fc3cdac Mob bugfixes
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
2014-01-25 14:42:26 +00:00
andrew 4ef61d8bf6 Command block fixes 2 2014-01-23 14:57:04 +02:00
Tycho c832fbeb8e Merge branch 'master' into GeneratingBenchmark
Conflicts:
	src/World.h
2014-01-22 09:13:12 -08:00
andrew 9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02:00
Tycho ca3389231e Actually implemented interfaces 2014-01-20 10:15:19 -08:00
Tycho 613f238ab6 Merge branch 'ForEachChunkProvider' into GeneratingBenchmark
Conflicts:
	src/World.h
2014-01-20 09:37:31 -08:00
Tycho 9bb61e6e2e Seperated BlockArea From World
If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things
2014-01-20 09:17:24 -08:00
madmaxoft 41618bf242 Changed the cWorld::ScheduleTask() signature.
Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
2014-01-19 23:49:19 +01:00
andrew 2b94361059 Basic scoreboard implementation 2014-01-19 14:20:57 +02:00