1
0
Fork 0
Commit Graph

121 Commits

Author SHA1 Message Date
Howaner 83d3f3347b Use m_UsedViewDistance and m_SetViewDistance. 2014-11-14 22:53:12 +01:00
Howaner 44514e53fc Merge branch 'master' into ChunkLoader
Conflicts:
	src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Mattes D cf73fee7e3 Fixed minor style issues. 2014-10-19 18:45:42 +02:00
Tiger Wang 2874bf73be Merge pull request #1502 from mc-server/furnaces
Improved furnaces
2014-10-18 21:33:55 +01:00
Mattes D 8c2a99711e Merged branch 'fix_chunks'. 2014-10-16 21:12:26 +02:00
Howaner b493beb3bb Stream 4 chunks per tick. Added priority. 2014-10-06 21:27:53 +02:00
Howaner a59f2d15fb Merge branch 'master' into ChunkLoader 2014-10-06 17:38:42 +02:00
Howaner 5a6b86180e Better StreamNextChunk() method 2014-10-06 17:38:17 +02:00
Mattes D a8aeceab9d cClientHandle: Added protocol version knowledge. 2014-10-05 20:19:21 +02:00
Tiger Wang b5a2c6667a Improved furnaces
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
Howaner 382e014ebc Optimized chunk loader 2014-10-02 23:50:41 +02:00
madmaxoft e65e0f1795 cClientHandle: Alpha-sorted the sending functions. 2014-10-01 12:14:38 +02:00
madmaxoft d7066f43d3 Rewritten plugin messages, vanilla are being parsed directly.
This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages.
2014-09-30 13:33:57 +02:00
Tiger Wang 72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
Howaner d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
Howaner 4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00
Howaner 43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
madmaxoft 82317709f8 Full BungeeCord compatibility.
Fixes #1392.
Fixes SpigotMC/BungeeCord#1211.
2014-09-17 11:07:42 +02:00
Howaner b462416e1f 1.8: Fixed maps. 2014-09-13 02:20:04 +02:00
Howaner 3bd3ac2200 1.8: Added ParticleEffect packet. 2014-09-11 17:03:09 +02:00
Howaner f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
Mattes D c5cd75fae8 Exported cClientHandle:GetIPString() to Lua API. 2014-09-07 22:35:22 +02:00
Mattes D c140ba2367 Merge pull request #1351 from LO1ZB/remove-a_RelY
remove y-coord from chunks
2014-09-03 21:47:00 +02:00
Hownaer 6c3b80f04c Fixed crashes and use std::swap. 2014-08-28 14:58:03 +02:00
LO1ZB 3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
Howaner 47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
Howaner 4271d719b6 Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
Mattes D 941a182d8a Merge pull request #1255 from mc-server/NameToUUID
Name to UUID
2014-08-01 22:35:12 +02:00
madmaxoft 6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
Howaner 89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
madmaxoft 17a94b16ea MojangAPI: Implemented UUID shortening and dashing. 2014-07-30 13:56:30 +02:00
Tiger Wang 8811837aea Merge branch 'master' into portals
Conflicts:
	src/World.h
2014-07-29 15:27:19 +01:00
tonibm19 997a643977 Moar view distance!
Let's blow up our computers! :D
2014-07-23 20:28:56 +02:00
archshift 4044d0a6e6 Export SendEntityAnimation to ToLua 2014-07-22 13:10:12 -07: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
madmaxoft 93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
Tiger Wang 719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01: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 7fff12bfac Fixed spaces around single-line comments.
There should be at least two spaces in front and one space after //-style comments.
2014-07-17 19:13:23 +02:00
madmaxoft 993fd14ddf Fixed basic whitespace problems.
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
2014-07-17 16:33:09 +02:00
Mattes D e444106d09 Merge pull request #1192 from mc-server/skinuuid
Skins
2014-07-16 13:30:57 +02:00
Tiger Wang 1f6854792c Store properties as Json::Value 2014-07-16 00:03:47 +01:00
Tiger Wang 4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang e11f41d048 Revert failed fix for #31
This reverts commit 69dc9b4c9a.
2014-07-13 00:17:31 +01:00
Tiger Wang b9d4431f6f Fixed respawning
* Fixes #1103
2014-06-29 22:44:16 +01:00
Mattes D 9926abd4f5 Added generic entity-collecting.
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
2014-06-27 20:56:44 +02:00
Tiger Wang bd5df3d3b9 Merge branch 'master' of https://github.com/mc-server/MCServer into portals 2014-06-24 21:15:48 +01:00
madmaxoft 08fed2a213 Added cClientHandle::IsUUIDOnline function.
Ref.: #771
2014-06-21 22:13:35 +02:00
Tiger Wang 29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00