acae3c9c65
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
2014-09-09 16:00:26 +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
e431bb4e63
Merge branch 'master' into Inventory
2014-09-02 20:11:38 +02:00
4470ebffd7
Fire can be destroyed with the sword in creative-mode
2014-08-28 20:49:34 +02:00
6c3b80f04c
Fixed crashes and use std::swap.
2014-08-28 14:58:03 +02:00
3c1c073714
remove y-coord from chunks
2014-08-28 11:36:35 +02:00
8fa4ac9ad9
Fixed item drop.
...
Fixes #1341
2014-08-22 15:32:27 +02:00
64fec204c4
Added initializers for class members.
...
As reported by Coverity, these weren't initialized.
2014-08-21 22:39:53 +02:00
f7774ec336
Merge branch 'master' into Fire
2014-08-20 22:25:05 +02:00
cb98014582
Revert "Removes the fire if the block under the fire was broken."
...
This reverts commit 01001d2a49
2014-08-11 23:12:32 +02:00
01001d2a49
Removes the fire if the block under the fire was broken.
2014-08-11 22:37:28 +02:00
74fabb079c
Moved the clicked-through block check to the top of the function.
2014-08-11 22:34:33 +02:00
202a0d1c1d
Fixed cancelled fire interact from all directions.
2014-08-11 14:24:36 +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
4271d719b6
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
...
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
ff7171fc5a
Resending fire to the client when the interact cancelled.
2014-08-06 14:04:25 +02:00
3b4255dbfe
Fixed a bug who can used from hacked clients.
2014-08-02 00:14:05 +02:00
941a182d8a
Merge pull request #1255 from mc-server/NameToUUID
...
Name to UUID
2014-08-01 22:35:12 +02:00
d2744713bb
Merge pull request #1272 from Howaner/Food
...
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
86d84bcb73
Compile fix.
2014-08-01 17:29:17 +02:00
160fa3a9a9
Import Statistics.h
2014-07-31 23:56:49 +02:00
6d02fce9a2
Merged branch 'master' into NameToUUID.
2014-07-31 23:17:49 +02:00
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
6b1f7e7a45
Renamed "select..." methods to "set..." and better IsValidEffect() function.
2014-07-31 18:15:39 +02:00
556fc908ae
Renamed functions and added beacon json saving.
2014-07-31 12:13:11 +02:00
89b1bbdc5f
Added beacon.
2014-07-30 21:59:35 +02:00
17a94b16ea
MojangAPI: Implemented UUID shortening and dashing.
2014-07-30 13:56:30 +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
7f9f46c911
Fixed group color's.
2014-07-27 13:47:21 +02:00
1156914dd6
Suggestions
2014-07-23 21:12:59 +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
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
52add840cf
Fixed attempts to call c_str on ChatColors
2014-07-19 11:15:21 -07: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
9529a42559
Fixed creative players not being able to drink
...
Fixes #1215
2014-07-18 01:56:26 -07: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
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
1f6854792c
Store properties as Json::Value
2014-07-16 00:03:47 +01:00
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
4e24f711ab
Player properties are now retrieved
2014-07-14 19:49:31 +01:00
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
e11f41d048
Revert failed fix for #31
...
This reverts commit 69dc9b4c9a
2014-07-13 00:17:31 +01:00
Masy98
Mattes D
Howaner
LO1ZB
Tiger Wang
archshift