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
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
Tiger Wang
8b2153ba97
De-breaked stuff
2014-02-18 22:07:21 +00:00
andrew
393ca0221d
Map decorators; Map clients
2014-02-18 20:50:08 +02:00
Tiger Wang
320cc74f0a
Implemented paintings, fixes #689
...
+ Implemented paintings
2014-02-18 00:16:03 +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
Howaner
777041806f
Add Skulls/Heads
2014-02-17 20:14:08 +01:00
Howaner
48d28a0f94
Add Locale to ClientHandle
2014-02-16 13:26:07 +01:00
Howaner
507a8a4b84
Set max. Players in the Tablist to 60
2014-02-16 01:18:57 +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
92e85cc960
Implementation of in-game maps
2014-02-13 17:13:09 +02: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
9e98c9691d
Improved the signedness conversion.
2014-02-05 13:54:47 +01:00
Tiger Wang
630507fd5b
Fixed a bunch of MSVS warnings
...
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
2014-02-04 23:07:22 +00:00
madmaxoft
91a8db0d7e
Protocol 1.7: Fixed a signed / unsigned comparison warning.
2014-02-04 22:41:54 +01:00
madmaxoft
835a59b8fc
Protocol 1.7 uses char for blockface.
...
That should fix #644 on RasPi.
2014-02-04 22:15:01 +01:00
Tycho
8464f689ea
Improved Type safety of eBlockFace
...
May Fix #640
2014-02-04 10:59:05 -08:00
madmaxoft
04107fa85d
Limited sign lines to 15 chars.
...
Fixes #598 .
2014-01-29 17:59:49 +01:00
madmaxoft
789cf63740
Added 1.7.4 to the list of supported protocols.
2014-01-29 12:16:27 +01:00
madmaxoft
3bbca8c291
Protocol 1.7: Encryption is enabled only with auth.
2014-01-29 09:56:31 +01:00
madmaxoft
bc6fc859f4
Protocol 1.7: Forced encryption on all connections.
...
This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication.
2014-01-28 23:53:54 +01:00
madmaxoft
30c431b479
Fixed client packet parsing.
...
When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541 .
Also modified comm logging, now each direction can be turned on separately.
2014-01-26 17:56:12 +01:00
madmaxoft
a2dfb28537
Merged branch 'master' into ChangeToPolarSSL.
2014-01-25 15:37:00 +01:00
madmaxoft
ff066453b8
Comm logging is available in both Debug and Release modes.
2014-01-25 15:28:16 +01:00
madmaxoft
96b4af1596
Protocol17: Comm logging shows the data left over from previous parse.
2014-01-25 15:06:30 +01:00
madmaxoft
d0da5d392f
Added per-connection comm logging in debug mode.
...
It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter.
2014-01-24 23:03:48 +01:00
madmaxoft
98976de071
Merge branch 'master' into ChangeToPolarSSL.
2014-01-23 23:46:51 +01:00
madmaxoft
5f34c78091
PolarSSL is fully used for 1.3.2 protocol encryption.
2014-01-23 23:35:23 +01:00
andrew
b21b682d85
Fixed 1.5.x scoreboard packet IDs
2014-01-23 21:06:05 +02:00
andrew
9bd8f74b59
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-01-21 20:40:41 +02:00
andrew
fa4750f015
Scoreboard SendTo()
2014-01-21 19:43:13 +02:00
andrew
aa61f55b74
Scoreboard protocol support
2014-01-21 15:58:17 +02:00
Alexander Harkness
9c93ab15ab
Fix a crash but somewhere...
2014-01-20 19:02:37 +00:00
Mattes D
865016abe2
Merge pull request #569 from worktycho/EnchantmentsFix
...
Enchantments fix
2014-01-19 13:50:50 -08:00
Tiger Wang
e4c3d799ff
Removed unneeded paramters
2014-01-19 19:42:25 +00:00
Tycho
f13a14d2cf
Switched EnchantmentSerilizer to namespace
2014-01-19 08:52:45 -08:00
Tycho
e14ddff1c0
Spilt Writing of Enchantments to seperate class
...
Created a new class cEnchantmentSerializer to serilize Enchantments to NBT.
This breaks a dependecy chain between cChunkGenerator and cWorld.
cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments
so having it seperate reduces the spread of the frein modifier
2014-01-19 07:38:59 -08:00
Tiger Wang
1af89a8b50
Changed SendBlockEntity format slightly
...
* Writing NBT is now in Protocol, not BlockEntity files
* Fixed a last output bug
2014-01-19 13:25:35 +00:00
Tiger Wang
f8c8dcc7f3
Improved command blocks
...
* Their command and previous output are displayed on the client
* They have a BlockHandler implementation, so you can't place blocks on
them anymore
+ As a side effect, implemented UpdateBlockEntity
2014-01-19 00:54:38 +00:00
Mattes D
79c1f6f438
Merge pull request #534 from mc-server/SpawnMinecart
...
Added cWorld::SpawnMinecart.
2014-01-17 02:27:56 -08:00
madmaxoft
aec5200893
Removed internal cEntity::GetRot() usage.
2014-01-17 11:11:17 +01:00
madmaxoft
ed1d336614
Merge remote-tracking branch 'origin/customnames'
2014-01-17 10:44:23 +01:00
madmaxoft
3a1c0f2aef
Protocol 1.7: More output on unknown packets / protocol states.
2014-01-17 10:12:27 +01:00
Tiger Wang
7ecf50c309
Fixed block break packet number
2014-01-16 22:42:47 +00:00
Tiger Wang
d675173b80
Changed newline character because of issues
2014-01-16 22:30:57 +00:00
madmaxoft
a085319455
Protocol 1.7: Unknown packets are dumped to log in Debug mode.
2014-01-16 20:39:59 +01:00
