9427 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Laubstein	13f0cfbb3d	Merge pull request #2633 from cuberite/IncludeBrewingRecipes ... Added brewing.txt to list of files packed with the windows build.	2015-11-10 16:26:02 +01:00
Mattes D	ecbb857fad	Added brewing.txt to list of files packed with the windows build.	2015-11-10 16:04:48 +01:00
Julian Laubstein	ec61c918db	Merge pull request #2630 from Gargaj/shallowwater ... Fix damage in shallow water (fixes #2622)	2015-11-10 01:10:34 +01:00
Gargaj	51f8e0e36c	fix shallow water + add future code for liquid fall dampening	2015-11-10 00:36:15 +01:00
worktycho	0a1751d2d8	Merge pull request #2629 from Gargaj/slabfix ... Remove slab from inventory when using it on another slab (fixes #2610)	2015-11-09 21:37:40 +00:00
Gargaj	b5de4a9a6f	remove slab from inventory when using it on another slab (fixes #2610)	2015-11-09 21:12:32 +01:00
Alexander Harkness	b32d13ae2d	Merge pull request #2628 from Gargaj/creeperdeflate ... Idle/deflating creeper should send -1	2015-11-09 19:18:12 +00:00
Gargaj	6d8baa6a75	idle/deflating creeper should be -1 ... according to http://wiki.vg/Entities#Creeper	2015-11-09 20:06:32 +01:00
Lukas Pioch	3c3be921d7	Merge pull request #2627 from Gargaj/patch-1 ... Add comment to Attack() return values	2015-11-09 16:22:05 +01:00
Gargaj	4e991f4632	Add comment to Attack() return values	2015-11-09 15:51:35 +01:00
worktycho	1e93d2f73c	Merge pull request #2625 from Gargaj/chilloutyo ... Neutral mobs should be neutral	2015-11-09 10:37:26 +00:00
Gargaj	97ddcc1c0a	neutral mobs shouldn't chase the player unless aggro'd ... code style neutral mobs shouldn't chase the player unless aggro'd neutral mobs shouldn't chase the player unless aggro'd Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo Conflicts: src/Mobs/PassiveAggressiveMonster.h code style Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo	2015-11-08 23:42:26 +01:00
Julian Laubstein	cfbb7360cd	Merge pull request #2626 from cuberite/worktycho-patch-1 ... Fix memory leak	2015-11-08 23:41:18 +01:00
worktycho	171867009e	Fix memory leak ... Fixes CID 132249	2015-11-08 22:34:52 +00:00
worktycho	a1926ca16e	Merge pull request #2615 from Gargaj/cavespider-attack ... Fix cavespider poisoning even if attack is in cooldown	2015-11-08 22:08:40 +00:00
Julian Laubstein	70f5892056	Merge pull request #2616 from Gargaj/patch-1 ... Fix chicken flying	2015-11-08 22:52:19 +01:00
Gargaj	d413e34475	Fix chicken flying ... The gravity might not be correct but my rough timing (with a stopwatch) seems to be close. Merge branch 'master' into patch-1 Merge branch 'master' into patch-1 Merge branch 'master' into patch-1	2015-11-08 22:34:35 +01:00
Alexander Harkness	2aaf30e406	Merge pull request #2619 from cuberite/worktycho-patch-1 ... Use .travis.yml to whitelist coverity_scan for push builds.	2015-11-08 21:33:38 +00:00
worktycho	059f6ec1e5	Use .travis.yml to whitelist coverity_scan for push builds.	2015-11-08 21:20:55 +00:00
Julian Laubstein	fbd1eb2f44	Merge pull request #2620 from Gargaj/pressureplatesnd ... Add sound to stone pressure plates	2015-11-08 22:03:42 +01:00
Gargaj	392a3d319c	fix cavespider poisoning even if attack is in cooldown ... make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'master' into cavespider-attack fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack	2015-11-08 21:01:02 +01:00
Gargaj	2ce2d9b7ce	add sound to stone pressure plates ... add sound to stone pressure plates	2015-11-08 20:57:05 +01:00
worktycho	f3d3c9adca	Merge pull request #2624 from Gargaj/patch-2 ... Only send creeper metadata updates on change	2015-11-07 21:29:41 +00:00
Gargaj	429c896e33	Only send creeper updates when there is a change ... Otherwise this keeps spamming the metadata packet for all the creepers on the server.	2015-11-07 21:57:32 +01:00
worktycho	e85082d2f1	Merge pull request #2609 from bibo38/slimeblock ... Slimeblock implementation	2015-11-07 18:45:59 +00:00
worktycho	74b6ff8f90	Merge pull request #2621 from Gargaj/pressureplatepower ... Fix pressure plate power levels	2015-11-07 18:42:40 +00:00
bibo38	ea55e75672	Refactored code to use vectors in the cPistonHandler class	2015-11-07 17:34:54 +01:00
bibo38	429f615390	Added some code improvements	2015-11-07 17:23:02 +01:00
bibo38	0447af8bcb	Renamed GetDirectionVec into VectorFromMetaData to improve code readability.	2015-11-07 17:23:02 +01:00
bibo38	f8c28cc373	Commented the GetDirectionVec method	2015-11-07 17:23:02 +01:00
bibo38	64012bf46f	Fixed the style problems and added some comments	2015-11-07 17:23:02 +01:00
bibo38	5fa077f869	Removed unused CanPull method	2015-11-07 17:23:02 +01:00
bibo38	558991a725	Extracted block moving code into a seperate method	2015-11-07 17:23:02 +01:00
bibo38	f35060e8b5	Replaced the usage of pistonMeta with a direction vector to allow better meta value abstraction	2015-11-07 17:23:02 +01:00
bibo38	ceec6c936d	Fixed pulling/pushing of breakable blocks, which are not required to be moved	2015-11-07 17:23:02 +01:00
bibo38	ede4eec4c5	Implemented the basic slime block pulling	2015-11-07 17:23:02 +01:00
bibo38	59a9ac5e6f	Implemented the SlimeBlock into the CanPush method to allow slimeblocks to work correctly when pushed	2015-11-07 17:23:02 +01:00
bibo38	8f066a16ec	Piston extension now works with the new recursive CanPushBlock method.	2015-11-07 17:23:02 +01:00
bibo38	e2d88106a9	Added the CanPushBlock method for the piston push check. ... This allows the recursive check for blocks to push, which is needed to implement the slime blocks into the piston system.	2015-11-07 17:23:02 +01:00
bibo38	d92a92d78a	Implemented the slime block dropping behaviour. ... Fixes #2530	2015-11-07 17:23:02 +01:00
Gargaj	68a4205f4e	Merge branch 'pressureplatepower' of github.com:Gargaj/cuberite into pressureplatepower	2015-11-07 16:29:00 +01:00
Gargaj	6ce98a702d	fix pressure plate power levels	2015-11-07 16:28:37 +01:00
Gargaj	1bef47bfde	fix pressure plate power levels	2015-11-07 16:26:19 +01:00
worktycho	7dae50fc14	Merge pull request #2618 from Gargaj/deadmeansdead ... Fix mobs firing when already dead	2015-11-07 13:26:31 +00:00
worktycho	4a01e486e3	Merge pull request #2617 from Gargaj/pushcomestoshove ... Implement pushing/shoving	2015-11-07 13:26:11 +00:00
Gargaj	31dac0cb2e	don't attack if dead	2015-11-07 13:48:00 +01:00
Gargaj	ad1e24e50b	code style	2015-11-07 13:32:52 +01:00
Gargaj	2f28c2f4ff	implement pushing/shoving based on @NiLSPACE's suggestion	2015-11-07 13:29:18 +01:00
Julian Laubstein	da20a8a09b	Merge pull request #2611 from Gargaj/chickenfall ... Chickens shouldn't take fall damage [re-pull]	2015-11-06 11:26:58 +01:00
Gargaj	5bcd4b271e	chickens don't take fall damage	2015-11-06 10:22:40 +01:00