1
0
Commit Graph

541 Commits

Author SHA1 Message Date
Mattes D
6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Samuel Barney
804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
bibo38
6a27ec2ea0 Added Rabbit Metadata values.
Added the Rabbit Types and the MoreCarrotTicks value. Types are selected randomly on creation.
Fixes #1867
2015-07-17 01:09:06 +02:00
Tiger Wang
c633dd8cec Merge pull request #2363 from scribblemaniac/improve-spider-ai
Improved spider AI
2015-07-16 22:22:48 +01:00
hallucino
9c85ed5864 Spawn baby mobs 2015-07-16 22:49:55 +02:00
scribblemaniac
55aa438831 Improved spider AI
Fixes #2335
2015-07-16 11:15:57 -06:00
Tiger Wang
c390604bc1 Merge pull request #2349 from cuberite/maps
Improved maps
2015-07-15 17:13:55 +01:00
Tiger Wang
8656e149c8 Improved maps 2015-07-14 21:46:30 +01:00
Hallucino
53207d3f18 Support ageable mobs
Move ageable stuff in Monster directly
2015-07-14 22:41:31 +02:00
bibo38
bb46afcb7e Now Horses spawn with correct data values.
The max-value of style is 4, of color is 6.
See http://wiki.vg/Entities#Horse
Also based on the if, the max value of HorseType is 7.
Bugfix #2259
2015-06-26 19:32:16 +02:00
Tiger Wang
f44d123ba8 Vector hasher is now a separate class 2015-06-07 12:53:59 +01:00
Tiger Wang
171c59a01b Changed appropriate containers to unordered_map
Thanks to @worktycho for guidance!

* Potential speed improvements
2015-06-06 12:21:21 +01:00
Alexander Harkness
28bab37425 Fixed wrong indent. 2015-05-30 11:22:49 +01:00
Alexander Harkness
97ee861c20 Merge pull request #2171 from SafwatHalaby/fence
PF - Handle all fencetypes
2015-05-30 11:13:59 +01:00
SafwatHalaby
5f7455bc19 PF - Handle all fencetypes 2015-05-30 12:49:49 +03:00
worktycho
2b51958c85 Merge pull request #2167 from SafwatHalaby/diags
PF - Fixed diagonal cutting
2015-05-30 10:28:37 +01:00
SafwatHalaby
d9f5d3c858 PF - Fixed diagonal cutting 2015-05-30 10:50:04 +03:00
Safwat Halaby
054d2cd451 Merge pull request #2166 from SafwatHalaby/squid
Disabled squid and Guardian Pathfinding
2015-05-30 10:31:26 +03:00
SafwatHalaby
a0f4e182b1 Disabled squid and Guardian Pathfinding 2015-05-30 10:04:27 +03:00
SafwatHalaby
9c6c6af75a Fixed creeper explosions 2015-05-30 09:54:32 +03:00
tycho
4956e8700d Merge branch 'master' into PreventNewWarnings
Conflicts:
	src/Entities/ArrowEntity.cpp
2015-05-29 00:12:56 +01:00
SafwatHalaby
f1540173da AI - Sane Skeleton 2015-05-28 19:19:56 +03:00
tycho
b2fa71a32a Fix comments 2015-05-28 12:54:04 +01:00
tycho
e19693e529 Merge branch 'master' into PreventNewWarnings
Conflicts:
	src/Inventory.cpp
2015-05-28 11:05:41 +01:00
SafwatHalaby
b936781f93 AI - Tweaked wolf speed and teleport threshold 2015-05-28 08:31:17 +03:00
SafwatHalaby
52fcbb5c65 AI - Saner Livestock 2015-05-27 19:26:08 +03:00
tycho
d1c9122340 Fix warnings in cPath 2015-05-24 17:47:15 +01:00
tycho
a6ccee5948 Merge branch 'master' into PreventNewWarnings 2015-05-24 17:27:05 +01:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
worktycho
d86e8fae79 Merge pull request #2122 from SafwatHalaby/bounding
Pathfinder - Bounding boxes and some tweaks
2015-05-24 12:51:15 +01:00
SafwatHalaby
7021547e99 Pathfinder - Bounding boxes and some tweaks 2015-05-23 22:16:19 +03:00
tycho
81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
Lukas Pioch
e30b2ed487 Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. 2015-05-23 16:28:37 +02:00
tycho
1577a080ee Merge branch 'master' into PreventNewWarnings 2015-05-23 11:31:03 +01:00
SafwatHalaby
f983bb6234 Fixed creeper not exploding when 1 block higher than player 2015-05-23 09:06:00 +03:00
SafwatHalaby
8436e5d8bd Path recalculation improvements 2015-05-20 20:42:35 +03:00
worktycho
eaedd5f19d Merge pull request #2074 from SafwatHalaby/rmUnique
Removed UniquePTR from PathFinder
2015-05-20 13:06:51 +01:00
SafwatHalaby
395f3d9c4c newlines 2015-05-19 22:47:48 +03:00
tycho
77f1f58c0a Make -Werror disabling file only
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
SafwatHalaby
0741ad3526 Removed UniquePTR from PathFinder 2015-05-19 21:07:05 +03:00
Alexander Harkness
d852209f8d Manual merge of #2066 2015-05-19 09:29:27 +01:00
SafwatHalaby
29e31c5be9 Pathfinder - approximated paths when original destination unreachable 2015-05-17 19:36:52 +03:00
SafwatHalaby
4ffc6621a9 PathFinder uses UniquePtr for cell map. 2015-05-16 10:38:58 +02:00
worktycho
5c3a85fba1 Revert "PathFinder - smart pointers" 2015-05-15 18:54:45 +01:00
SafwatHalaby
a8878dd2b6 uniquePTR 2015-05-15 20:25:44 +03:00
Tiger Wang
9c490293b8 Merge remote-tracking branch 'origin/master' into warnings
Conflicts:
	src/Mobs/Monster.cpp
	src/Vector3.h
2015-05-10 12:16:20 +01:00
Tiger Wang
11ef1fd24a Fixed some warnings and logic errors in Monster.cpp 2015-05-10 12:14:55 +01:00
wiseoldman95
8a576a0a35 PF - Less calcs per tick 2015-05-10 09:08:42 +03:00
Mattes D
c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
Mattes D
92b8cd2f2a Merge pull request #1956 from Tri125/master
Fixed Magma cube sound and spawn size
2015-05-09 12:44:57 +02:00
Tristan
4642a50d62 GetSizeName of cSlime and cMagmaCube is now static 2015-05-08 20:50:05 -04:00
Tiger Wang
218010cd96 Fixed some Visual Studio warnings 2015-05-08 23:32:02 +01:00
worktycho
1cef39cb73 Move chunk position accesses after the chunk validity checks 2015-05-08 23:20:22 +01:00
wiseoldman95
290bc2e377 Spaces in cPath 2015-05-08 17:08:15 +03:00
worktycho
011126293b Merge pull request #1949 from SafwatHalaby/burn
AI - Better shade cover
2015-05-07 21:58:02 +01:00
Mattes D
4888f671d1 Merge pull request #1951 from mc-server/BroadcastRefactor
Added support for sending additional data in the ParticleEffect packet
2015-05-07 16:14:56 +02:00
Tri125
9f6192687f Big Magma Cube can now spawn
Following the same method as the Slime, Magma Cube can now spawn with the size of 1, 2 or 4.
2015-05-06 23:56:08 -04:00
Tri125
63af47832d Fixed the sound issue with the MagmaCube
-Name of the sound is correctly capitalized

-Get the appropriate sound depending on its size
2015-05-06 23:12:17 -04:00
tycho
448df85e56 Added support for additional data in the ParticleEffect Packet
Also started refactoring how broadcasts are handled
2015-05-07 03:47:46 +01:00
wiseoldman95
40af96b100 AI - Safer WouldBurnAt() 2015-05-06 20:01:06 +03:00
wiseoldman95
753dfb950a AI - Better shade cover 2015-05-06 20:01:06 +03:00
worktycho
7771091099 Actually empty the open list 2015-05-06 17:26:59 +01:00
wiseoldman95
b8aa38b18d (duplicate) AI - Livestock escape fixed, water jumping fixed 2015-05-06 17:23:07 +03:00
wiseoldman95
c6dd455d72 PF - Swimming bugfix 2015-05-06 09:27:47 +03:00
wiseoldman95
020e928685 PF - Fixed mobs not reaching leaning player 2015-05-06 07:31:02 +03:00
wiseoldman95
304bc4eca4 AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bug 2015-05-05 12:51:58 +03:00
Tiger Wang
a509cf00ef Entity improvements
•Pathfinder improvements
•Fixes #1217
•Fixes #1933

Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
2015-05-03 23:58:12 +01:00
Tiger Wang
f96f9dae66 Merge pull request #1930 from SafwatHalaby/AI_Jump
AI - Improved Mob Jumping
2015-05-03 13:23:04 +01:00
wiseoldman95
d68b75a679 AI - Improved Mob Jumping 2015-05-03 14:24:24 +03:00
wiseoldman95
599ad97b65 PathFinder - Crash fix, chunks in parameters are now references 2015-05-03 10:49:06 +03:00
Tiger Wang
9226bdbd4c Merge pull request #1925 from SafwatHalaby/PathFinder_Optimze
Pathfinder optimization
2015-05-02 16:50:42 +01:00
wiseoldman95
3586f25853 AI - Better daylight handling 2015-05-02 14:32:33 +03:00
wiseoldman95
16b6fc9b5d PathFinding - Chunk querying optimization and improve cPath::IsSolid 2015-05-02 14:16:16 +03:00
wiseoldman95
1b0e21e0b2 A* Pathfinding and better monster AI 2015-05-01 13:18:47 +03:00
mathias-gh
9cbd7f64c1 Update IronGolem.cpp 2015-04-17 21:18:34 +03:00
mathias-gh
f370443b9b Added MobTypeName for Giant 2015-04-17 19:33:34 +03:00
DevToaster
45c84ea933 Changed air drag units to 'interpolated ticks' per second 2015-03-31 11:03:35 -04:00
DevToaster
c743c7fd0c Modified physics for more vanilla-like behavior 2015-03-30 19:42:32 -04:00
Mattes D
e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer
Unify packetizer
2015-03-24 13:09:41 +01:00
Mattes D
b698286e86 Creeper: Fixed skeleton check. 2015-03-21 15:52:49 +01:00
Tommy Santerre
3f6d823aa4 Correct world height validations.
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
2015-03-19 20:32:17 -04:00
tumultenrx
a215070cf2 Monsters will now attack. Additional checks have been added when generating spawn.
Monsters will now attack. Additional checks have been added when generating spawn.
2015-03-13 00:02:36 +01:00
Tycho
bfe1960191 Converted Monster to std::chrono 2015-01-16 14:38:21 +00:00
Tycho
2a9664d6ca Initial convertion of a_Dt to std::chrono
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
2015-01-11 21:12:26 +00:00
Mattes D
3da6e4374e Fixed basic style. 2014-12-25 00:44:09 +01:00
Masy98
5695649bb9 Fixed damn empty line with no use 2014-12-20 13:04:42 +01:00
Masy98
7903ee485e Added Rabbit.h and Rabbit.cpp to the CMakeList 2014-12-20 11:41:23 +01:00
Masy98
3d2b1875a1 Fixed Rabbit size 2014-12-20 10:38:56 +01:00
Masy98
6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Masy98
5cfb6063c3 Fixed Guardians size and health 2014-12-19 16:06:43 +01:00
Masy98
f09c6701eb Guardian can now spawn if wanted!? 2014-12-18 20:44:39 +01:00
Masy98
706b9181e6 Merge branch 'master' into entities 2014-12-18 19:32:48 +01:00
Masy98
c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
Howaner
c2926f8de1 derp 2014-12-17 20:08:55 +01:00
Howaner
fff108f20a Added comment. 2014-12-17 19:16:35 +01:00
Howaner
5c99f3fada Fixed eMonsterType lua bugs. 2014-12-17 17:28:24 +01:00
Tiger Wang
3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
Mattes D
e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Mattes D
44644ae025 Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
p-mcgowan
27185dd374 clearing CheckBasicStyle.lua messages 2014-12-03 00:26:15 -08:00
Howaner
bcbd73f7d8 MobSpawner fixes. 2014-12-01 14:58:13 +01:00
Howaner
677dde51bd Merge branch 'master' into MobSpawner
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
2014-12-01 14:43:03 +01:00
Howaner
c173bf61ad Removed old StringToMobType() function from Monster.cpp 2014-11-30 02:29:17 +01:00
Howaner
c673eb590f Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead 2014-11-29 15:40:38 +01:00
Howaner
2478e290f9 Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. 2014-11-29 15:20:44 +01:00
Howaner
648fee1a08 Merge branch 'master' into MobSpawner 2014-11-29 12:05:35 +01:00
Tiger Wang
187bdab4fa Merge remote-tracking branch 'origin-master' into c++11 2014-11-25 23:03:33 +00:00
Tiger Wang
79e5b82354 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/Noise/Noise.h
	src/World.h
2014-11-23 17:12:34 +00:00
Mattes D
e9797c6a2a Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor 2014-11-23 12:33:04 +01:00
p-mcgowan
7a08c05787 formatting - newline at EOF inserted: Pig.cpp 2014-11-22 15:48:05 -08:00
p-mcgowan
d1b7a965d1 pigs turn into pigmen on lightning 2014-11-22 15:33:34 -08:00
p-mcgowan
793b1012c4 formatter error 2014-11-21 23:58:35 -08:00
p-mcgowan
635e9321c6 villagers turn into witches on lightning 2014-11-21 23:36:35 -08:00
p-mcgowan
ac2e3ede1d villagers turn into witches when struck by lightning 2014-11-21 23:20:44 -08:00
Howaner
42120e2ea5 Merge branch 'master' into MobSpawner
Conflicts:
	MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Mattes D
1240e583d2 Mobs: Fixed crash with terrain too high. 2014-11-15 21:45:57 +01:00
Mattes D
f8c54f4243 Merged branch 'master' into c++11. 2014-10-23 08:40:39 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Tiger Wang
987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang
aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00
Steven Riehl
856764dee8 convert old style casts to fix warnings 2014-10-11 20:39:55 -06:00
madmaxoft
c94e82980e Fixed a missed value. 2014-10-05 22:56:56 +02:00
madmaxoft
112fac5798 Removed obsolete cMonster::eType.
Has been replaced with global eMonsterType.
2014-10-05 22:12:25 +02:00
madmaxoft
77c5b410e6 Fixed eMonsterType Lua API mismatch. 2014-10-05 22:09:19 +02:00
Jonathan Frederick
c02711633d Derp 2014-09-28 19:27:53 -07:00
Jonathan Frederick
7a61e1e604 Fix comments 2014-09-28 19:24:47 -07:00
Jonathan Frederick
126b14aa09 Make endermen take damage in water 2014-09-28 13:56:41 -07:00
madmaxoft
e7de548c89 Fixed minor style issues. 2014-09-27 21:37:36 +02:00
Howaner
033d16babb Merge branch 'master' into MobSpawner
Conflicts:
	src/MobSpawner.h
	src/Mobs/Monster.h
2014-09-26 23:56:20 +02:00
Mattes D
2c5b0f2378 Merge pull request #1415 from Masy98/blocks
Added 1.8 Blocks and Items
2014-09-26 22:24:45 +02:00
Tycho
a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Masy98
2feee3b316 Merge branch 'master' into blocks
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-26 18:32:31 +02:00
worktycho
411c69b420 Merge pull request #1419 from mc-server/redstoneTests
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
Howaner
060ac500fc Fixed wrong Surrounding size 2014-09-25 19:19:30 +02:00
Tycho
799c96661d Fixed style 2014-09-25 15:45:39 +01:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
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
Howaner
718eb227ab Implemented mob spawner. 2014-09-19 23:00:54 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests
Conflicts:
	src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01: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
Masy98
a01994389d Fixed mutton name in Sheep.cpp 2014-09-11 16:24:16 +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
madmaxoft
d0cc9aedb3 More trailing whitespace fixes. 2014-07-17 23:16:54 +02: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
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
madmaxoft
7d0fc85d00 Merge branch 'master' into potions 2014-07-17 11:01:26 +02:00
Mattes D
98244e96d1 Merge pull request #1193 from mc-server/deathmessages
Death messages
2014-07-17 10:12:22 +02:00
Tiger Wang
2189f37c20 Resolved backwards compatibility issues 2014-07-16 11:38:52 +01:00
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Howaner
9b0b57bcbc Update. 2014-07-13 11:11:40 +02:00