4b38e077cf
Merge branch 'master' into EntityCustomName
...
Conflicts:
src/ClientHandle.cpp
src/ClientHandle.h
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/World.cpp
src/World.h
2014-09-23 14:39:49 +02:00
43ed690520
Exported player list states to extra functions.
2014-09-18 18:50:17 +02:00
69afc4dbba
Merge branch 'master' into 1.8-Protocol
...
Conflicts:
src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
fcf558173e
Fixed farmland issues.
2014-09-12 19:07:20 +02:00
bee615b75b
Merge branch 'master' into 1.8-Protocol
2014-09-12 13:28:06 +02:00
3bd3ac2200
1.8: Added ParticleEffect packet.
2014-09-11 17:03:09 +02:00
1f0b6eeaf3
Actually set default
2014-09-09 12:18:20 +01:00
f94df06b66
Added the player list to the 1.8 protocol.
2014-09-09 03:02:25 +02:00
bd810b80a6
use the correct ASSERT
2014-09-08 21:31:47 +01:00
fb20c2eb85
FIxed a couple more warnings
2014-09-08 19:15:29 +01:00
2c945c8818
TimeOfDay does not need to be an Int64
2014-09-08 19:07:45 +01:00
4bdf9256f2
Fixed a few compile warnings
2014-09-08 18:56:27 +01:00
137b021d26
Rewritten chunk status to specify whether the chunk is in queue.
...
This fixes #1370 .
2014-09-05 22:16:48 +02:00
3297a39c27
Merge remote-tracking branch 'origin/master' into EntitiesInBox
2014-09-04 14:02:18 +02:00
c140ba2367
Merge pull request #1351 from LO1ZB/remove-a_RelY
...
remove y-coord from chunks
2014-09-03 21:47:00 +02:00
a51c1e0b73
Added cWorld::ForEachEntityInBox()
2014-09-03 17:00:26 +02:00
a600e3bdfe
hopefully the last commit for removing y-coord from chunks. :)
2014-09-03 00:14:51 +02:00
1bb4d79412
Added SetCustomName() to players.
2014-09-02 19:12:35 +02:00
26b8471280
Merge branch 'master' into fixes
2014-08-30 22:17:49 +02:00
5a6ef8b8e5
me being stupid
2014-08-29 20:27:58 +02:00
e45a27add9
add comments
2014-08-29 20:26:19 +02:00
75e1316386
fix chunk regenerating
2014-08-29 20:19:45 +02:00
22e3bbd0db
Rewritten block entity loading.
...
Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked.
The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't.
Fixes #1354 .
2014-08-29 19:19:47 +03:00
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
21ff1d81ab
Improved explosion damage
2014-08-29 13:44:10 +01:00
3c1c073714
remove y-coord from chunks
2014-08-28 11:36:35 +02:00
d2d63b8a05
World: Report chunk count for the spawn area.
2014-08-22 10:35:51 +02:00
81d238e080
Added cWorld initializers.
2014-08-21 21:53:25 +02:00
b5ffe06f88
Code formatting fixes.
2014-08-19 22:14:37 +02:00
008c1cdaf4
CheckBasicStyle checks the src folder as well.
2014-08-14 01:03:30 +02:00
47c928cab7
Exported daylight cycle flag to the protocol.
2014-08-11 00:20:28 +02:00
42bad0edec
Added a comment and simplified code.
2014-08-10 20:06:03 +02:00
f90078c09f
Added IsDaylightCycleEnabled saving.
2014-08-10 16:48:20 +02:00
cccc321384
Renamed functions.
2014-08-10 16:46:03 +02:00
32e1e9a553
Renamed m_DoDaylightCycle to m_CycleDaylight.
2014-08-08 22:07:30 +02:00
4271d719b6
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
...
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
b5c0a4aa3a
Fixed issues with autocomplete and time loading
...
* Fixes #1274
2014-08-01 22:15:34 +01:00
35cfbfd51a
Merge pull request #1269 from Howaner/BlockEntitys
...
Added beacon.
2014-08-01 17:43:02 +02:00
cfaef0de38
Capitalised "incremental"
2014-07-31 23:11:51 +02:00
f47765dcbd
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.
2014-07-31 18:21:45 +02:00
81e095adda
Exported the beacon.
2014-07-30 22:19:51 +02:00
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
a5cca16abe
Add "Broadcasting" settings to world.ini
2014-07-27 00:39:39 +02:00
c0b62ef139
Added a queue for setting chunk data.
...
Fixes #1196 .
2014-07-24 18:32:05 +02:00
9678341a11
Made the cWorld::SpawnMobFinalize function more readable.
2014-07-24 12:15:48 +02:00
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
a28b0dc120
Speed improvements, crash fixes, & self-suggestions
2014-07-22 17:26:48 +01:00
0a15e1f420
Suggestion and failed merge fix
2014-07-22 10:33:16 +01:00
Howaner
worktycho
Tycho
Mattes D
LO1ZB
Tiger Wang
STRWarrior