1
0
Commit Graph

102 Commits

Author SHA1 Message Date
Tiger Wang
f77720c43f Merge pull request #669 from xdot/master
Implementation of in-game maps :D
2014-02-24 10:28:34 +00:00
andrew
f471873945 Maps: Improvements 2014-02-23 15:05:03 +02: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
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
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
andrew
3b24bc870b Map item handler; Fixed several bugs 2014-02-17 16:27:12 +02: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
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
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
madmaxoft
ea71bfa9b6 Initial ChunkStay code. 2014-02-08 21:55:21 +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
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
Alexander Harkness
b9aa0420a3 Merge pull request #646 from worktycho/warningfixes
Fixed most of the reordering warnings
2014-02-05 18:24:08 +00:00
Tycho
8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08: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
c2e7dd34d9 Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API 2014-02-03 20:52:11 +01:00
Mattes D
b090547c17 Merge pull request #602 from mc-server/improvementsandfixes
Redstone crash fix and current console line replace function
2014-02-02 22:02:25 -08:00
Tiger Wang
0f67f80c6e Added IsBlockWaterOrIce() 2014-02-02 21:48:21 +00:00
Tiger Wang
d9a9052de7 Revert "Added LOGREPLACELINE for line replacement"
This reverts commit 7d03876a3e.
2014-02-02 20:10:31 +00:00
Tiger Wang
6ef5c057aa Revert "Improved code"
This reverts commit d8aa0b0ec7.
2014-02-02 20:10:23 +00:00
Tiger Wang
55cfb232db Possibly fixed #618 2014-02-02 19:10:22 +00:00
Tiger Wang
e26dc5cc0a Added checks for ice into IsBlockWater()
* This fixes players spawning in vast oceans of ice, as opposed to the
previous water
2014-02-01 21:40:50 +00: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
Tiger Wang
d8aa0b0ec7 Improved code
* Fixed some issues
* Fixed standard violation
2014-01-31 00:04:57 +00:00
tonibm19
16a939a757 Attempt at implementing #563
Not tested (I don't have RasPi)
2014-01-30 18:02:37 +01:00
Tiger Wang
7d03876a3e Added LOGREPLACELINE for line replacement 2014-01-29 19:22:03 +00: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