1eae7d0ece
Fixed style.
2014-10-13 10:34:33 +02:00
fff9e50109
Aligned simulators
2014-10-12 12:44:59 +01:00
473c0425d3
Moved a few objects to unique_ptr
2014-10-10 15:33:19 +01:00
af997a09ca
Merge branch 'master' into Fixes
2014-09-26 22:23:36 +02:00
d83d6456e8
Fixed players custom name in 1.8
2014-09-26 17:37:19 +02:00
9c459cbe50
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
4398156b2e
Merge branch 'master' into 1.8-Protocol
2014-09-19 14:31:18 +02:00
43ed690520
Exported player list states to extra functions.
2014-09-18 18:50:17 +02:00
045d54e0e2
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
b70e09bc90
Update World.h
2014-09-17 17:32:37 +02:00
f246faec16
Preparing 1.8 update
...
Added Spectator gamemode
2014-09-16 20:05:55 +02:00
69afc4dbba
Merge branch 'master' into 1.8-Protocol
...
Conflicts:
src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
d07ef85ee3
Spawn exp if you break a mob spawner.
2014-09-12 16:41:23 +02:00
bee615b75b
Merge branch 'master' into 1.8-Protocol
2014-09-12 13:28:06 +02:00
0b044e1c83
Possibly decoupled IncrementalRedstoneSimulator from the rest of the server
...
THis wil hopefully allow for unit testing
2014-09-11 17:48:21 +01:00
3bd3ac2200
1.8: Added ParticleEffect packet.
2014-09-11 17:03:09 +02:00
f94df06b66
Added the player list to the 1.8 protocol.
2014-09-09 03:02:25 +02:00
2c945c8818
TimeOfDay does not need to be an Int64
2014-09-08 19:07:45 +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
a51c1e0b73
Added cWorld::ForEachEntityInBox()
2014-09-03 17:00:26 +02:00
75e1316386
fix chunk regenerating
2014-08-29 20:19:45 +02:00
3c1c073714
remove y-coord from chunks
2014-08-28 11:36:35 +02:00
008c1cdaf4
CheckBasicStyle checks the src folder as well.
2014-08-14 01:03:30 +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
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
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
c0b62ef139
Added a queue for setting chunk data.
...
Fixes #1196 .
2014-07-24 18:32:05 +02:00
9045246e74
Export BroadcastEntityAnimation with ToLua
...
Fixes #752
2014-07-22 13:02:28 -07:00
a28b0dc120
Speed improvements, crash fixes, & self-suggestions
2014-07-22 17:26:48 +01:00
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
8050a5b98a
Suggestions
2014-07-21 22:49:06 +01:00
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
6ab9afd0fd
Bug and crash fixes
...
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
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
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
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
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
4a6d606f74
Made CreateProjectile a pointer
2014-07-13 15:16:49 +01:00
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
5f72cdac38
Merge pull request #1154 from mc-server/trappedchests
...
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
Mattes D
worktycho
tycho
Howaner
Tycho
nesco
LO1ZB
Tiger Wang
archshift