Commit Graph
493 Commits
Author SHA1 Message Date
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
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 dc5c43c0aa Changed comments. 2014-07-13 01:04:43 +02:00
Howaner 4b093972ea Merge branch 'master' into Sheep 2014-07-13 00:54:11 +02:00
archshift 4e6395d6ff For now, removed creator member from Entity Effect for pointer safety 2014-07-11 17:27:29 -07: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
Tiger Wang 372dbbb994 Merge pull request #1135 from mc-server/fixes
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
madmaxoft 66fa015534 Fixed slime handling in cMonster::StringToMobType(). 2014-07-06 13:37:28 +02:00
Tiger Wang 460d6bd0cb Changed everything to callbacks 2014-07-05 22:59:22 +01:00
Tiger Wang a0d2df9327 Tailored death messages 2014-07-04 10:55:09 +01:00
Howaner 68007ab3e5 Add doxy-comments. 2014-07-01 20:42:23 +02:00
worktycho afda11a495 Changed comment 2014-06-30 19:33:10 +01:00
Howaner c3cde6232f Moved the random code to a function (cSheep::GenerateNaturalRandomColor()) 2014-06-30 20:23:17 +02:00
Howaner 11d02a447e Save IsSheared from Sheep. 2014-06-28 13:19:32 +02:00
Howaner bef84b4821 Fix sheep color's, add shear sound. 2014-06-28 12:59:09 +02:00
Mattes D 7102e9edb0 Merged branch 'tonibm19/master'. 2014-06-26 17:09:28 +02:00
Tiger Wang dad0037f98 Bettered zombie and skeleton AI
* Fixed potential issues with skylight detection
2014-06-22 20:44:55 +01:00
Tiger Wang 7615ed90c0 Merge branch 'master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
2014-06-21 22:14:23 +01:00
Tiger Wang 1296c5dce7 More suggestions 2014-06-21 20:42:29 +01:00
tonibm19 3e15c92d18 Added pig riding.
Now you can ride a pig using a carrot on a stick.
2014-06-20 10:50:21 +02:00
archshift e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07: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
worktychoandarchshift 0690788cdf Replaced strange algebra with dot product.
10 degrees is a completely arbitary constant I pulled from nowhere. Feel free to adjust this value.
2014-06-17 20:36:47 -07:00
Tiger Wangandarchshift 5d4f70a7a5 Improved Enderman code 2014-06-17 20:36:47 -07:00
STRWarriorandarchshift 806130a967 Swapped m_Player and m_EndermanPos 2014-06-17 20:34:20 -07:00
STRWarriorandarchshift 9f03682258 Enderman attacks a player if he's looking at him. 2014-06-17 20:34:20 -07:00
archshift 68c30790db Entity effects: changed User to Creator, removed pawn pass-by-value 2014-06-17 11:39:22 -07:00
archshift 9e8361976b Entity Effects: Clarified user, added it to AddEntityEffect
Added second AddEntityEffect with a pass-by-value of the class.
2014-06-17 11:39:22 -07:00
madmaxoftandarchshift e289fe4dd7 Changed the AddEntityEffect() params for easier calls. 2014-06-17 11:39:21 -07:00
madmaxoftandarchshift 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 71b4c49490 Cave spider now poisons its victim, added IsPawn function to Entity 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 bfa8aaf41b Merge branch 'master' into portals
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
Mattes D af4a21ea06 Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
2014-06-08 21:58:30 +02:00
archshift b768e54ce8 Fixed mob hitbox sizes, removed TODOs
Measured bat and blaze in vanilla, updated values.
Cavespiders are, in fact, passive in the day.
2014-06-07 00:40:01 -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
Tiger Wang 9ef4b9d52d Exploded creepers drop nothing, part of #1058 2014-06-04 09:27:50 +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
andrew 7aeb8ce993 Fixed cWither::KilledBy 2014-05-21 10:59:14 +03:00
andrew 07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03: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
archshiftandarchshift 3f9e00a3f3 Fixed a few more switch warnings. 2014-05-11 16:28:48 -07:00