1
0
Fork 0
Commit Graph

225 Commits

Author SHA1 Message Date
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 f370443b9b Added MobTypeName for Giant 2015-04-17 19:33:34 +03: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
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 6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Masy98 f09c6701eb Guardian can now spawn if wanted!? 2014-12-18 20:44:39 +01:00
Masy98 c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +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 c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01: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 2478e290f9 Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. 2014-11-29 15:20:44 +01:00
Tiger Wang 187bdab4fa Merge remote-tracking branch 'origin-master' into c++11 2014-11-25 23:03:33 +00:00
Mattes D 1240e583d2 Mobs: Fixed crash with terrain too high. 2014-11-15 21:45:57 +01: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
madmaxoft c94e82980e Fixed a missed value. 2014-10-05 22:56:56 +02:00
madmaxoft 77c5b410e6 Fixed eMonsterType Lua API mismatch. 2014-10-05 22:09:19 +02: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
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 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 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
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
Tiger Wang c865fc8ca5 Improved endermen code a little 2014-08-01 22:15:32 +01: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 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
archshift 041bfd5860 Fixed clamping issues 2014-07-19 01:40:29 -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 c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +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
madmaxoft 8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Howaner e48d172f49 Merge branch 'master' into Sounds 2014-07-13 11:09:19 +02:00
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Howaner 4b093972ea Merge branch 'master' into Sheep 2014-07-13 00:54:11 +02:00
archshift e824cd09b3 Merge remote-tracking branch 'origin/master' into potions
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
madmaxoft 66fa015534 Fixed slime handling in cMonster::StringToMobType(). 2014-07-06 13:37:28 +02:00
Tiger Wang a0d2df9327 Tailored death messages 2014-07-04 10:55:09 +01:00
Howaner bef84b4821 Fix sheep color's, add shear sound. 2014-06-28 12:59:09 +02:00
Tiger Wang 1296c5dce7 More suggestions 2014-06-21 20:42:29 +01:00
archshift f5529e544c EntityEffects.x -> EntityEffect.x, Object-Oriented effects
Changed effect map to take a pointer of the effect as a result.
2014-06-18 22:54:14 -07:00
archshift 68c30790db Entity effects: changed User to Creator, removed pawn pass-by-value 2014-06-17 11:39:22 -07:00
madmaxoft 045ae2ef2c Fixed MSVC compilation. 2014-06-17 11:39:21 -07:00
archshift 5b2b6e0615 Pawn: renamed HandleEntityEffects to HandleEntityEffect
Exported entity effect functions for ToLua and documented them in APIDesc.lua
2014-06-17 11:39:21 -07:00
archshift 2574573c88 Monster: added IsUndead(), undead-specific entity effects 2014-06-17 11:39:20 -07:00
Tiger Wang b73bf1a1e3 Fixed decision failure 2014-06-05 08:28:01 +01:00
Tiger Wang 01f38d8836 Added checks for no downfall biomes 2014-06-04 13:22:50 +01:00
Tiger Wang 86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
STRWarrior b9ca7bd120 Small tweak for mobs
Mobs move a bit smoother and aren't able to move allot when in air.
2014-06-02 14:16:36 +02:00
Tiger Wang 60a37c1370 Very minor code changes 2014-05-29 16:58:55 +01:00
Mattes D ac00568183 Merge pull request #998 from mc-server/StatManager
Statistic Manager
2014-05-18 22:30:34 +02:00
andrew 466ff2204f Fixes 2014-05-13 14:53:15 +03:00
andrew aea866f5b1 Movement Statistics 2014-05-12 21:38:52 +03:00
archshift 3f9e00a3f3 Fixed a few more switch warnings. 2014-05-11 16:28:48 -07:00
madmaxoft 202ce3e737 Fixed MagmaCube spawning.
Fixes #928.
2014-05-02 19:17:22 +02:00
Mattes D 709015369d Merge pull request #940 from Howaner/GlobalFixes
Add entity invulnerable
2014-04-28 20:58:15 +02:00
archshift 80b97fd9dd Fixed mobs that don't naturally spawn. 2014-04-25 20:49:55 -07:00
Howaner 7e76f030aa Add entity invulnerable 2014-04-26 00:32:30 +02:00
archshift 624deea6c4 Giants!
Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning.
2014-04-24 18:11:11 -07:00
archshift 8fc45c5730 Fixed class capitalization for the cave spider. 2014-04-24 12:18:17 -07:00
Tiger Wang 19358fc7d5 Compilation fix 2014-04-18 20:20:00 +01:00
Tiger Wang 6cb63a768d Fixed #906 2014-04-18 12:59:14 +01:00
Tiger Wang 200ea6254c Fixed #904 2014-04-18 12:54:17 +01:00
Tiger Wang bdea8706d8 Added new AI rules
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
2014-04-17 18:50:25 +01:00
Alexander Harkness 9ad87f670b Fixed GitHuB WebEdit fail. 2014-04-10 15:52:00 +01:00
Alexander Harkness 2d02ff1df8 Update Monster.cpp 2014-04-10 15:50:43 +01:00
Tiger Wang ef48b30baa Final realisation of suggestions 2014-03-31 22:37:05 +01:00
Tiger Wang 0836fe9a84 Fixed a few Y too high/low asserts 2014-03-31 20:33:33 +01:00
andrew 6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
madmaxoft 89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
andrew d73cdba1f6 g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
TheJumper 0b6aa7b370 Fixed Formatting, added compiler warning suppressing methods, fixed comments 2014-02-24 15:38:38 +01:00
TheJumper 2cc597372a Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters 2014-02-23 19:50:51 +01:00
tonibm19 8707f7ddc8 Improved formatting 2014-02-17 17:01:22 +01:00
tonibm19 60bcf2807a Now mobs can't escape from fences. 2014-02-16 18:18:07 +01:00
Tiger Wang 06239c8336 Fixed #627
- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
2014-02-11 22:09:56 +00:00
Tiger Wang 9d1c9097e3 Merge remote-tracking branch 'origin/master' into playerimprovements
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
2014-02-09 00:14:42 +00:00
Tiger Wang f86f066615 Merge branch 'master' into playerimprovements
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
2014-02-09 00:04:42 +00:00
Alexander Harkness b9aa0420a3 Merge pull request #646 from worktycho/warningfixes
Fixed most of the reordering warnings
2014-02-05 18:24:08 +00:00
Tycho 8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08:00
Tiger Wang 630507fd5b Fixed a bunch of MSVS warnings
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
2014-02-04 23:07:22 +00:00
tonibm19 a845b9abbb Blank lines and indentation.
Also removed GetClosestPlayer documentation
2014-02-04 17:29:36 +01:00
tonibm19 c2e7dd34d9 Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API 2014-02-03 20:52:11 +01:00
Kirill Kirilenko 2a52b390c0 Monster's nominal speed was increased. 2014-02-01 20:38:53 +04:00
Tiger Wang 7468ba0f10 Implemented fall damage for mobs
+ Implemented mobile fall damage
* Formatting fixes
+ Defined new Position->Integer macros
2014-01-25 19:02:13 +00:00
Tiger Wang 314fc3cdac Mob bugfixes
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
2014-01-25 14:42:26 +00:00
Tiger Wang 1112f5adc6 Fixed a generator bug 2014-01-24 23:56:19 +00:00
Tiger Wang a988063915 Miscellaneous improvements 2014-01-24 21:55:04 +00:00
Tiger Wang 1f82b6e192 Monsters no longer check for direct line of sight 2014-01-24 20:46:22 +00:00
Tiger Wang 9c0e3615ce Large reworking of mob code [SEE DESC]
+ Implemented better pathfinding
- Removed lots of unused variables, functions, etc.
* Changed some variable types
* Other miscellaneous fixes, and also completes the previous PRs
2014-01-24 19:57:32 +00:00
Tiger Wang 74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
madmaxoft 77aaa5c367 Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer 2013-12-25 19:50:18 +01:00
Tiger Wang 548273c8f7 Preliminary mobile entity saving
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
2013-12-25 16:07:52 +00:00
tonibm19 c6946fb8c4 Some fixes (SEE DESC)
-Added missing mobs (wither, enderdragon and iron golem) to type to string list.
-Wither and iron golem can now spawn
2013-12-23 10:32:49 +01:00
STRWarrior 488d7ddd7d EnderDragons and SnowGolems are able to spawn. 2013-12-22 20:15:09 +01:00
madmaxoft d6de11da07 Sorted a few constructors to remove warnings. 2013-12-20 16:39:20 +01:00
madmaxoft 8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
STRWarrior 483ef89503 Fixed not getting XP from mobs. 2013-12-14 12:50:08 +01:00
Alexander Harkness 0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	VC2008/MCServer.vcproj
2013-11-26 17:21:06 +00:00
Alexander Harkness 675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00