Howaner
|
4b38e077cf
|
Merge branch 'master' into EntityCustomName
Conflicts:
src/ClientHandle.cpp
src/ClientHandle.h
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/World.cpp
src/World.h
|
2014-09-23 14:39:49 +02:00 |
|
Tiger Wang
|
fdabfd77e2
|
Improved cBlockHandler::DropBlock
|
2014-09-13 22:49:27 +01:00 |
|
Howaner
|
1223a24d3c
|
Merge branch 'master' into Effects
|
2014-09-12 19:13:46 +02:00 |
|
archshift
|
e1206568ec
|
Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc"
This reverts commit 472efa8174 .
Apparently we don't support some of these features quite yet (darn you C++98!)
|
2014-09-03 16:23:03 -07:00 |
|
archshift
|
472efa8174
|
Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc
Snow Golems must also be above 64Y to spawn snow (as of 1.8).
|
2014-09-03 16:12:43 -07:00 |
|
madmaxoft
|
1cc65b6264
|
Fixed style and alpha-sorting.
|
2014-09-03 10:29:10 +02:00 |
|
archshift
|
34d6f0713e
|
Added mutton, which sheep now drop when killed
|
2014-09-02 23:21:08 -07:00 |
|
Howaner
|
38e824dbcf
|
Renamed SetWalkSpeed() to SetRelativeWalkSpeed()
|
2014-09-02 20:10:41 +02:00 |
|
Howaner
|
5c53608dd0
|
Added CustomName saving.
|
2014-09-02 19:34:58 +02:00 |
|
Howaner
|
079634d18c
|
Added the new functions to APIDump.
|
2014-09-02 19:20:59 +02:00 |
|
Howaner
|
1bb4d79412
|
Added SetCustomName() to players.
|
2014-09-02 19:12:35 +02:00 |
|
Howaner
|
dfed6f94ca
|
Added name tag
|
2014-09-01 21:05:45 +02:00 |
|
Howaner
|
7c4cb9a385
|
Added CustomName to cMonster.
|
2014-09-01 20:12:56 +02:00 |
|
Howaner
|
d7ee2245e8
|
Added SetWalkSpeed() to cMonster.
|
2014-08-30 12:44:54 +02:00 |
|
reiter
|
690e6cb6f8
|
Fixed mob burning.
Fixes #1298
|
2014-08-28 00:01:01 +02:00 |
|
madmaxoft
|
ff37192e94
|
BasicStyleCheck: Dividers are exactly 80 slashes.
|
2014-08-04 13:20:28 +02:00 |
|
Howaner
|
7bd414e9ed
|
Merge branch 'master' into Monster
|
2014-08-04 12:11:38 +02:00 |
|
madmaxoft
|
1fa210c7f9
|
Refactored case-conversion functions.
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
|
2014-08-04 11:30:20 +02:00 |
|
Howaner
|
e70077361d
|
Changed /** to /*
|
2014-08-04 11:23:35 +02:00 |
|
Howaner
|
7bea90d6ca
|
Fixed warnings
|
2014-08-04 01:35:25 +02:00 |
|
Howaner
|
0911072d27
|
Attempt to fix knockback and swimming.
|
2014-08-04 01:34:12 +02:00 |
|
madmaxoft
|
3136fc6246
|
Wolf uses UUID for owner.
Fixes #1277.
|
2014-08-03 22:04:52 +02:00 |
|
madmaxoft
|
98a13d97b3
|
Trailing whitespace fix.
|
2014-08-03 22:04:50 +02:00 |
|
Tiger Wang
|
c865fc8ca5
|
Improved endermen code a little
|
2014-08-01 22:15:32 +01:00 |
|
Tiger Wang
|
1094d91fba
|
Merge pull request #1047 from mc-server/Enderman
Enderman attacks a player if he's looking at him
|
2014-07-31 22:20:05 +01:00 |
|
Tiger Wang
|
ffd6797fe1
|
Comment suggestions
|
2014-07-31 18:17:21 +01:00 |
|
STRWarrior
|
c4e6a14235
|
Added lighting code and added comments
|
2014-07-30 19:18:11 +02:00 |
|
STRWarrior
|
5daeba7e88
|
Removed lighting code in cEnderman::CheckEventSeePlayer
|
2014-07-30 13:59:47 +02:00 |
|
Tiger Wang
|
8811837aea
|
Merge branch 'master' into portals
Conflicts:
src/World.h
|
2014-07-29 15:27:19 +01:00 |
|
Howaner
|
ba36e79bc5
|
Merge branch 'master' into Inventory2
Conflicts:
src/BlockInfo.cpp
|
2014-07-26 13:23:11 +02:00 |
|
archshift
|
4191be7ddb
|
Removed redundant semicolons and re-added warning
|
2014-07-24 11:21:37 -07:00 |
|
Howaner
|
396739cc0f
|
Fix item durability.
Fixes #1181
|
2014-07-23 16:32:09 +02:00 |
|
Tiger Wang
|
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 |
|
madmaxoft
|
93d29555e5
|
Style: Normalized to no spaces before closing parenthesis.
|
2014-07-21 17:40:43 +02:00 |
|
madmaxoft
|
6be79575fd
|
Style: Normalized spaces after if, for and while.
|
2014-07-21 17:38:50 +02:00 |
|
archshift
|
ada88a5805
|
Monsters: Made IsUndead overridable by the respective mob classes
|
2014-07-19 14:35:35 -07:00 |
|
madmaxoft
|
00c524519e
|
Fixed style: spaces after commas.
|
2014-07-19 14:53:41 +02:00 |
|
Mattes D
|
4293db5eae
|
Merge pull request #1214 from mc-server/anti-glob
CMake - Explicitly lists all source files
|
2014-07-19 14:29:22 +02:00 |
|
archshift
|
041bfd5860
|
Fixed clamping issues
|
2014-07-19 01:40:29 -07:00 |
|
archshift
|
725d1fd1e2
|
Subdirs: Only add_library if not using MSVC
|
2014-07-18 17:41:43 -07:00 |
|
archshift
|
2f811fc6a2
|
Mobs/CMakeLists.txt: Replaced glob with list of files
|
2014-07-18 17:41:42 -07: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 |
|
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
|
509d3d3b62
|
Slime sizes are 1, 2 or 4 and not 1, 2 or 3.
|
2014-07-18 16:55:28 +02:00 |
|
Tiger Wang
|
f1be1eb674
|
Monster fixes
* Fixes #1203
* Fixes #627
|
2014-07-18 10:47:00 +01:00 |
|
madmaxoft
|
2df5e26d3b
|
Fixed spaces before commas.
|
2014-07-18 09:57:34 +02:00 |
|
Howaner
|
33bd78dcdd
|
Skeletons should spawn with a bow in the hand.
Fixes #1184
|
2014-07-18 01:26:27 +02:00 |
|
Howaner
|
fba93aac2a
|
Split into more lines.
|
2014-07-17 23:32:01 +02:00 |
|
madmaxoft
|
c03161f75d
|
Fixed tabs used for alignment.
|
2014-07-17 23:16:55 +02:00 |
|