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
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
11f8198a80
World.cpp: fixed not all enum fields being used in m_Dimension switch
2014-07-19 02:56:46 -07: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
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
57f4e871bb
Fixed FindClosestPlayer
2014-07-15 12:52:02 +01:00
4e24f711ab
Player properties are now retrieved
2014-07-14 19:49:31 +01: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
9e22f46b15
Implemented support for forced chunk ticking.
...
Fixes #1160 .
2014-07-10 18:18:32 +02:00
74b6b398e7
Fixed arrow collection animation
...
* Fixed piston extension non-solidness
2014-07-09 19:56:50 +01: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
632e8680b1
Removed world-saving log messages.
...
Ref.: http://forum.mc-server.org/showthread.php?tid=1518
2014-07-04 11:50:50 +02: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
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
c82f4f6309
Fixed order of initalisation
2014-06-12 18:56:48 +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
366ecf9dfd
Fixed a race condition when adding a player to a world.
2014-06-10 18:25:53 +02:00
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
b904223b9d
Added queue for adding entities to cWorld.
...
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
43342540c8
Fixed Time of day
2014-06-06 23:54:24 +01:00
Howaner
Tiger Wang
Mattes D
STRWarrior
archshift
Tycho
worktycho