Masy98
c836b52dd1
Added Entity Guardian
2014-12-18 19:30:32 +01:00
Howaner
2478e290f9
Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.
2014-11-29 15:20:44 +01:00
Howaner
8b028c5c78
Finished mob spawner implementation.
2014-11-18 15:33:41 +01:00
Howaner
42120e2ea5
Merge branch 'master' into MobSpawner
...
Conflicts:
MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Alexander Harkness
232343065f
Fixed compile (typos).
2014-10-27 22:03:11 +00:00
Alexander Harkness
b67eb2169e
Another one.#
2014-10-27 20:16:51 +00:00
Tiger Wang
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Mattes D
a42fa071bc
Properly exported cItemFrame and cHangingEntity to Lua.
2014-10-21 22:02:30 +02:00
Tiger Wang
d1814d2d67
Merge remote-tracking branch 'origin/master' into chestcarts
...
Conflicts:
src/Entities/Minecart.cpp
2014-09-27 18:40:00 +01:00
Howaner
033d16babb
Merge branch 'master' into MobSpawner
...
Conflicts:
src/MobSpawner.h
src/Mobs/Monster.h
2014-09-26 23:56:20 +02:00
worktycho
411c69b420
Merge pull request #1419 from mc-server/redstoneTests
...
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
Howaner
7cdcf0a883
Anvil: Arrow Tile tags are a short in Vanilla
2014-09-25 19:01:44 +02:00
Tycho
9c459cbe50
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Howaner
32ecb121a3
derp
2014-09-24 15:30:52 +02:00
Howaner
1d588b5195
Don't create two entity lists.
2014-09-24 15:17:20 +02:00
Howaner
65077c314a
Merge branch 'master' into WorldLoader
2014-09-24 15:00:49 +02:00
madmaxoft
8d9dfc5d1a
Anvil: Wolf collar color is a byte in Vanilla.
...
Kept the old Int reading for compatibility reasons.
Ref.: #1448
2014-09-23 22:22:38 +02:00
Howaner
366af5067b
MCServer world compatiblity with vanilla and mcedit.
2014-09-23 19:16:17 +02:00
Howaner
718eb227ab
Implemented mob spawner.
2014-09-19 23:00:54 +02:00
Tycho
6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
Tiger Wang
3e74113427
Implemented Chest Minecarts
2014-09-12 23:18:02 +01:00
Howaner
5c53608dd0
Added CustomName saving.
2014-09-02 19:34:58 +02:00
Tiger Wang
114b14faad
Removed unused code
2014-08-29 13:44:01 +01:00
madmaxoft
054ce9bcc4
Anvil: Wolf owner not saved if not present.
2014-08-04 11:29:40 +02:00
madmaxoft
3136fc6246
Wolf uses UUID for owner.
...
Fixes #1277 .
2014-08-03 22:04:52 +02:00
Howaner
556fc908ae
Renamed functions and added beacon json saving.
2014-07-31 12:13:11 +02:00
Howaner
dcd226d904
Added beacon load/save.
2014-07-30 22:50:34 +02:00
Tiger Wang
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
Tiger Wang
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
archshift
e8262373e1
NBTChunkSerializer.cpp: Added break after serializing the splash potion
2014-07-20 03:19:46 -07:00
archshift
f5bcfdc58c
Splash potions: Renamed PotionParticleType to PotionColor for clarity
2014-07-19 02:51:39 -07:00
Tiger Wang
37140ae578
Merge branch 'master' into portals
...
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
2014-07-18 20:10:51 +01:00
madmaxoft
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
madmaxoft
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
madmaxoft
cc452f51c8
Restructured cSplashPotionEntity code.
...
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
2014-07-15 22:41:42 +02:00
madmaxoft
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
Tiger Wang
5f72cdac38
Merge pull request #1154 from mc-server/trappedchests
...
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
madmaxoft
e2e0f52ecb
cNBTChunkSerializer: Fixed alignment.
2014-07-12 23:48:39 +02:00
Tiger Wang
e71e432633
Suggestions and bug fix
...
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
2014-07-12 22:06:25 +01:00
archshift
8cbd43e043
Added splash potions to NBT serialization and retrieval
2014-07-11 18:58:11 -07:00
Tiger Wang
6a33fa84ae
Suggestions
2014-07-11 12:43:24 +01:00
Tiger Wang
372dbbb994
Merge pull request #1135 from mc-server/fixes
...
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
Tiger Wang
164ffe50ad
Made things consistent
2014-07-08 12:34:39 +01:00
Tiger Wang
9e44b0aae1
Implemented trapped chests & others
...
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
Tiger Wang
f4e3c01a71
Various fixed
...
* Fixed potential invalid pointer dereferencing, fixes #1117
* Fixed ender pearls not being loaded properly
2014-07-04 16:49:24 +01:00
Tiger Wang
89a26cc786
Suggestions
2014-07-02 21:07:34 +01:00
Tiger Wang
b94fef3089
Removed unneeded code
2014-06-30 19:15:10 +01:00
Tiger Wang
dde641ce83
Properly implemented enderchests
2014-06-29 11:36:38 +01:00
Tiger Wang
bd5df3d3b9
Merge branch 'master' of https://github.com/mc-server/MCServer into portals
2014-06-24 21:15:48 +01:00
Howaner
d4e1277724
Add entity health saving.
2014-06-24 16:06:26 +02:00
