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 |
|