1
0
Commit Graph

4038 Commits

Author SHA1 Message Date
Tiger Wang
2d0b31e7b6 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-02-02 22:09:03 +00:00
Tiger Wang
ac03c51997 Fixed #624 2014-02-02 22:08:57 +00:00
Mattes D
67d7d83726 Merge pull request #622 from worktycho/registerfix
Removed register keyword from Messinne Twister
2014-02-02 09:13:42 -08:00
Tycho
1e4e6c4619 Merge branch 'master' into registerfix 2014-02-02 09:11:53 -08:00
madmaxoft
c3d4cc4f4f Fixed dark oak and acacia placement.
Fixes #621.
2014-02-02 17:52:05 +01:00
Mattes D
3cfd9ce269 Merge pull request #615 from worktycho/GeneratingBenchmark2
Generating benchmark2
2014-02-02 07:25:30 -08:00
Tycho
42497847ac Added missing files 2014-02-02 06:59:36 -08:00
Tycho
0b0aa5554f Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/Blocks/BlockTorch.h
2014-02-02 06:56:07 -08:00
Tycho
b82fc394dd Changed Signiture of OnUpdate 2014-02-02 06:49:37 -08:00
Tiger Wang
275035eb70 Fixed #620 2014-02-02 12:43:57 +00:00
Mattes D
6f90b492b8 Merge pull request #617 from UltraCoderRU/master
Some fixes in wolves implementation
2014-02-02 02:35:24 -08:00
Kirill Kirilenko
a134fd45cf Added saving of angry flag. 2014-02-02 14:28:42 +04:00
Kirill Kirilenko
a1c36c18e0 Fixed sitting tag. 2014-02-02 13:56:55 +04:00
Kirill Kirilenko
2a52b390c0 Monster's nominal speed was increased. 2014-02-01 20:38:53 +04:00
Tycho
6e39ed3868 Changed Signiture of OnDigging 2014-02-01 08:35:48 -08:00
Kirill Kirilenko
0d33f2d11d Fixed teleport to air, if owner is flying. 2014-02-01 20:22:12 +04:00
Kirill Kirilenko
0259aed8be Added saving of collar's color. 2014-02-01 20:16:42 +04:00
Tycho
cf3b4ec226 Changed Signiture of OnDestroyedByPlayer 2014-02-01 06:01:13 -08:00
Tycho
4b5bd4dedf Removed register keyword from Messinne Twister
Removed register as it is meaningless in c++ and causes a depreciated warning in clang 3.4 in c++ mode for va_copy
2014-02-01 05:14:31 -08:00
Mattes D
33759197e9 Merge pull request #585 from daniel0916/hooks
Added "player destroying" and "player destroyed" hooks
2014-02-01 05:08:08 -08:00
Tycho
c6304b2b4f Changed pointers to references 2014-02-01 05:06:32 -08:00
daniel0916
b34ba6be7b Added PlayerDestroyedHook Documentation 2014-02-01 13:58:35 +01:00
daniel0916
dbbd47b96d Removed "player destroying" hook 2014-02-01 13:27:44 +01:00
Mattes D
af4b1cd659 Merge pull request #613 from UltraCoderRU/master
Added reading saved state of the wolf (sitting or standing).
2014-02-01 01:22:46 -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
Kirill Kirilenko
c976a7f706 Merge remote-tracking branch 'upstream/master' 2014-02-01 02:24:36 +04:00
Kirill Kirilenko
8180b643ff Added reading saved state of the wolf (sitting or standing). 2014-01-31 21:34:00 +04:00
Alexander Harkness
f9a4c49fd4 Contributors now match real life, and are alpha-sorted. 2014-01-31 17:16:08 +00:00
Mattes D
617c5b1fff Merge pull request #607 from mc-server/Wolf_Owner_Saving
Wolf: Their owner now gets saved.
2014-01-31 07:32:38 -08:00
STRWarrior
19e5122b77 Inversed condition. 2014-01-31 16:31:55 +01:00
STRWarrior
c7e4ade7c3 Wolf: If Owner tag is missing a normal ownerless wolf will spawn. 2014-01-31 16:27:21 +01:00
madmaxoft
882d108622 Fixed cLineBlockTracer:Trace() signature. 2014-01-31 16:01:16 +01:00
madmaxoft
5092ae5266 Added cPluginManager:BindCommand() form to the API.
That's the canonical way to call static functions.
2014-01-31 16:01:15 +01:00
madmaxoft
66427d754b Added cChunkDest::UpdateHeightmap()
This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator.
2014-01-31 16:01:15 +01:00
Alexander Harkness
79ef653cb7 Fixed some more. 2014-01-31 07:41:21 +00:00
Alexander Harkness
d3b8796c48 Fixed at least a little of the plugin guide. 2014-01-30 21:19:45 +00:00
STRWarrior
550a09020d Fixed bad variable. 2014-01-30 21:49:39 +01:00
STRWarrior
1a361be44f Check if the tag is found. 2014-01-30 21:46:45 +01:00
STRWarrior
419778a306 Fixes #606 2014-01-30 21:39:31 +01:00
Alexander Harkness
e0cb06dfae Update Core 2014-01-30 17:54:10 +00:00
Mattes D
6f185f0f21 Merge pull request #605 from tonibm19/patch-1
Attempt at implementing #563
2014-01-30 09:03:49 -08:00
tonibm19
16a939a757 Attempt at implementing #563
Not tested (I don't have RasPi)
2014-01-30 18:02:37 +01:00
madmaxoft
b61a74d6a2 Lua: Fixed an error in table-functions callbacks. 2014-01-29 22:56:38 +01:00
Mattes D
07fb1bca23 Merge pull request #599 from tonibm19/master
Now mobs follow you when holding their breed item.
2014-01-29 11:05:38 -08:00
tonibm19
e9c1d1ea9c Did what xoft said 2014-01-29 20:02:41 +01:00
tonibm19
1c1832b6ce Rewritten code.
Implemented xoft suggestion.
Using MoveToPosition as tigerw suggested.
2014-01-29 19:15:26 +01:00
Mattes D
6accedffd5 Added instructions for ZIP source downloads.
The ZIP file doesn't contain git submodules, people complained about not being able to compile from it.
2014-01-29 19:10:59 +01:00
tonibm19
ba4865f7ee Fixed sheep 2014-01-29 18:32:46 +01:00
tonibm19
73d9a285d5 Fixed a copypasta error... 2014-01-29 18:25:10 +01:00