81e095adda
Exported the beacon.
2014-07-30 22:19:51 +02:00
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
c0b62ef139
Added a queue for setting chunk data.
...
Fixes #1196 .
2014-07-24 18:32:05 +02: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
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +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
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
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
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
729cc7f6ff
Fixed style consistency.
2014-07-10 23:04:33 +02:00
9e22f46b15
Implemented support for forced chunk ticking.
...
Fixes #1160 .
2014-07-10 18:18:32 +02:00
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
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
bd5df3d3b9
Merge branch 'master' of https://github.com/mc-server/MCServer into portals
2014-06-24 21:15:48 +01:00
1da39568a3
Added asserts for cChunk::GetBlockEntity() coords.
2014-06-24 09:46:38 +02:00
7615ed90c0
Merge branch 'master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
2014-06-21 22:14:23 +01:00
6e681269d9
Fixed invalid iterators
2014-06-21 22:07:38 +01:00
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07:00
ee50790398
Merge branch 'master' of github.com:mc-server/MCServer
2014-06-16 15:12:50 +01:00
c82f4f6309
Fixed order of initalisation
2014-06-12 18:56:48 +01:00
93d4a8aa92
Removed unnessicary indirection from Entity iterator list
2014-06-12 18:51:33 +01:00
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
bfa8aaf41b
Merge branch 'master' into portals
...
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
35b79e5d71
Portal improvements and suggestions
2014-06-10 20:43:27 +01:00
156c9851b8
Suggestions
2014-06-05 17:58:29 +01:00
22236a103a
Redstone fixes and improvements [SEE DESC]
...
Haha, see desc.
* Improved redstone speed through a marking dirty system. Only a select
few devices are still continuously simulated
* Fixed redstone crashing with recent piston changes
2014-06-04 23:23:22 +01:00
3278a403b5
Removed use of auto
2014-06-04 13:24:43 +01:00
86e5273cd1
Merge remote-tracking branch 'origin/master' into portals
2014-06-04 13:14:38 +01:00
5fc7592cba
Merge remote-tracking branch 'origin/pistonfixes'
...
Conflicts:
src/Chunk.cpp
2014-06-02 19:49:14 +01:00
a84f107400
Suggestions two
2014-06-01 20:00:11 +01:00
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
f7777e8c75
Added comments, reformatted code.
2014-05-29 18:25:08 +02:00
cea3a8e7e8
Cauldrons fill
2014-05-29 16:58:40 +01:00
3549d0d5e6
More comments!
2014-05-29 15:59:39 +01:00
ee929793f0
Hopefully fixed piston duplication issues
...
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
8f964886e0
Implemented style changes
2014-05-24 13:33:40 +01:00
5929ffbc40
Fixed stylistic issues
2014-05-21 20:08:34 +01:00
024027db89
Renamed cChunkBuffer to cChunkData
2014-05-21 19:58:48 +01:00
cdd3d11496
Fixed minor style issues
2014-05-21 18:33:54 +01:00
cb6200345c
Fixed bug in setting metas
2014-05-10 15:19:06 +01:00
d478e3cfb1
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.h
2014-05-10 05:05:44 -07:00
0d1804e439
Merge branch 'master' into redstoneimprovements
...
Conflicts:
src/ClientHandle.cpp
src/Entities/FallingBlock.cpp
src/Mobs/AggressiveMonster.cpp
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-05-04 14:15:10 +01:00
Howaner
Tiger Wang
madmaxoft
archshift
Tycho