archshift
15aacc24a5
Protocol/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
archshift
61c4e2e5cb
Blocks/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
archshift
465743757a
Items/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
archshift
1d8e3e2bb8
Entities/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
archshift
2f811fc6a2
Mobs/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
madmaxoft
76b33970b0
Merge branch 'Inventory2'
2014-07-18 23:51:36 +02:00
madmaxoft
0346ab15ad
Debuggers: Optimized and commented the /rmitem handler.
2014-07-18 23:51:15 +02:00
madmaxoft
abe8a6bd45
APIDump: Documented RemoveItem().
2014-07-18 23:48:06 +02:00
madmaxoft
13311c700f
Clarified RemoveItem()'s comments.
2014-07-18 23:47:46 +02:00
madmaxoft
44a4a83292
Merge branch 'Entities'
2014-07-18 23:21:04 +02:00
madmaxoft
19d012c96e
Fixed slime-related comments.
2014-07-18 23:20:42 +02:00
Howaner
51b91befbd
Added RemoveItem() function to the player inventory.
2014-07-18 23:11:59 +02:00
madmaxoft
749f073d70
Merge branch 'Sign'
2014-07-18 22:45:50 +02:00
madmaxoft
23037ce7ec
Normalized code style for both sign handlers.
2014-07-18 22:41:48 +02:00
Tiger Wang
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
Tiger Wang
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
Howaner
44c944716b
Removed cBlockSignPostHandler descend.
2014-07-18 17:04:01 +02:00
Howaner
509d3d3b62
Slime sizes are 1, 2 or 4 and not 1, 2 or 3.
2014-07-18 16:55:28 +02:00
Howaner
e32b0ce4fa
Moved comment.
2014-07-18 16:38:59 +02:00
Tiger Wang
f1be1eb674
Monster fixes
...
* Fixes #1203
* Fixes #627
2014-07-18 10:47:00 +01:00
archshift
38aeaa64ed
MCServer supports Minecraft v1.7.10
2014-07-18 02:02:28 -07:00
archshift
9529a42559
Fixed creative players not being able to drink
...
Fixes #1215
2014-07-18 01:56:26 -07:00
madmaxoft
204b591172
CheckBasicStyle: Proper spaces with commas.
2014-07-18 09:58:29 +02:00
madmaxoft
2df5e26d3b
Fixed spaces before commas.
2014-07-18 09:57:34 +02:00
madmaxoft
d52a51f7b6
Removed duplicate IPvX labels.
2014-07-18 09:18:11 +02:00
Mattes D
35d0a0009e
Merge pull request #1208 from Howaner/MobInventory
...
Spawns skeletons with a bow in their hands
2014-07-18 09:06:59 +02:00
archshift
ffe44c13d0
Moved ChatColor.h out of defines where it was not needed
2014-07-17 23:25:14 -07:00
Mattes D
000ec7a96f
Merge pull request #1210 from Howaner/API
...
Removed special character in APIDump
2014-07-18 08:10:00 +02:00
Mattes D
79a5c90c02
Merge pull request #1212 from mc-server/never-read
...
ProtocolRecognizer.cpp: removed unused NumBytesRead
2014-07-18 08:09:32 +02:00
archshift
33b0a719da
ProtocolRecognizer.cpp: removed unused NumBytesRead
2014-07-17 18:39:44 -07:00
archshift
32b25ec7f7
Generator: removed rnd definitions that are never read
2014-07-17 18:34:47 -07:00
archshift
5729b9489d
Merge pull request #1209 from Howaner/GlobalFixes
...
Added Howaner to the CONTRIBUTORS list.
2014-07-17 18:20:56 -07:00
Howaner
eeacb6f222
Added a extra wall sign handler.
...
Fixes #1119
2014-07-18 02:19:30 +02:00
Howaner
fc6a5878df
Removed special character in APIDump
2014-07-18 01:45:45 +02:00
Howaner
57d415e38b
Added me to the CONTRIBUTORS list. I hope it is ok.
2014-07-18 01:28:56 +02:00
Howaner
33bd78dcdd
Skeletons should spawn with a bow in the hand.
...
Fixes #1184
2014-07-18 01:26:27 +02:00
Howaner
2e9aed793a
Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary.
2014-07-18 01:16:49 +02:00
Howaner
9c32e31edf
Items should first added to the first slot, not the latest.
2014-07-18 01:02:25 +02:00
archshift
bc94ad4b5a
Fixed NULL being passed instead of a double to AddEntityEffect
2014-07-17 14:34:58 -07:00
Howaner
fba93aac2a
Split into more lines.
2014-07-17 23:32:01 +02:00
Tiger Wang
0f8c24e04d
Fixed issues relating to saplings and leaves
...
- Removed cBlockInfo::RequiresSpecialTool
* Fixes #1195
* Fixes #1201
2014-07-17 22:26:53 +01:00
madmaxoft
b2716c720e
Fixed code style in Trees.cpp.
...
The src folder now has zero BasicStyle violations.
2014-07-17 23:25:21 +02:00
madmaxoft
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
archshift
488ecb6912
Player.cpp: Fixed compile error
2014-07-17 14:08:54 -07:00
archshift
5c0789e15e
Player.cpp: Added Wither death message
2014-07-17 14:08:21 -07:00
madmaxoft
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
Howaner
52d4c49d5c
Fixed many slime bugs.
...
- Fixed slime hurt/death sound
- Added slime spawning on death.
- Fixed the max health.
- Fixed the attack damage.
- Little slimes should not attack players.
2014-07-17 22:32:23 +02:00
madmaxoft
7a9f9ab744
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-07-17 22:23:08 +02:00
madmaxoft
a02509ff4b
Initial version of a script to check basic style.
...
This script reports basic violations of the style, such as indentation using spaces, alignment using tabs, trailing whitespace etc. Passing this script does NOT mean that the style is clean, it's only for fast-checking purposes.
2014-07-17 22:19:52 +02:00
