1
0
Fork 0
Commit Graph

589 Commits

Author SHA1 Message Date
Lane Kolbly 10d42a2452 Consolidated food effects into EatItem, added all fish type FoodInfos. (#3875)
* Consolidated food effects into EatItem, added all fish types.

* Changed type of NumFishInfos to satisfy clang.

* Removed unused call for a_Item in EatItem
2017-07-30 18:53:21 +01:00
Bond-009 6e8ec2fe34 Creepers explode when burned by flint and steel (#3865)
Fixed an issue where creepers didn't explode when they were burned with flint and steel
2017-07-22 22:05:09 +01:00
Bond-009 6a19841121 Added basic ocelot behavior (#3829) 2017-07-12 12:42:02 +02:00
Pablo Beltrán 7adec790e6 Sound effect horse rejects player when taming 2017-07-10 05:47:04 +02:00
Bond-009 b1628846d9 Fix horse taming (#3820)
* Horses rear when untamed and right-clicked with an item
2017-07-02 07:40:59 +02:00
Bond_009 445abe001a When right-clicking on a passive mob with 'his' spawn egg spawn a baby 2017-07-02 07:38:41 +02:00
Bond-009 a944ac3b06 Endermen take damage from rain 2017-06-30 23:53:23 +02:00
Bond-009 0c0bfe54bb Spider should attack only when the light level is lower than 11 (#3815) 2017-06-30 10:48:06 +02:00
peterbell10 360d8eade0 FastRandom rewrite (#3754) 2017-06-13 21:35:30 +02:00
Mattes D 0551d78dff Fixed tracer usage in Entity physics handling. (#3720) 2017-05-28 20:56:17 +02:00
Lukas Pioch fc49ace897 Spawn eggs works again 2017-05-22 18:10:12 +02:00
Lukas Pioch e35ac1bfb9 Clang 5.0 fixes
- Added override keyword
- Removed inherited member variables
2017-05-21 12:19:06 +02:00
Pablo Beltrán 2359611c57 Don't destroy monster when last target type is a player (#3721)
In current Cuberite version if you are pursued by monsters you just have to disconnect and connect again to get rid of them. If no other player is in your chunk monsters will get destroyed.
2017-05-21 10:29:06 +02:00
Mattes D 2c3c1f1527 Tracer replacement (#3704)
* Replaced cTracer usage with cLineBlockTracer.

* Exported new cLineBlockTracer utility functions to Lua API.
2017-05-11 13:34:36 +01:00
Bond-009 6fe863c2ad Fixed cactus detection and zombie pigman sword (#3584)
Fixes for issues #902 and #2917
2017-02-25 19:14:08 +01:00
mathiascode dae2adde65 Updated sounds and effect IDs (#3422) 2017-02-15 06:05:24 +01:00
mathiascode 4311f4a658 Added some blocks and items (#3503) 2017-02-14 11:13:55 +01:00
Mattes D cbff1378fd Fixed bindings for cBlockArea:Read and Write. (#3568)
The original bindings accepted nil as the World param, causing a crash.
2017-02-05 16:00:38 +01:00
Mattes D d17b21da55 cWolf: Fixed targetting a nullptr. 2016-11-22 17:51:53 +01:00
bibo38 cb640ffea4 Spectators added (#2852) 2016-10-12 14:38:45 +02:00
Mattes D 2622a8622a APIDump: Reformatted the docs to include type information.
Also fixed a bit of documentation in the CPP source.
2016-09-12 23:21:15 +02:00
LogicParrot 90be4e7efd Entities now bail out of ticks if destroyed (#3363) 2016-09-03 14:31:27 +03:00
Mattes D d2e8643607 Fixed type-casting-related warnings. 2016-08-24 22:26:53 +02:00
Mattes D 7549f468b3 Fixed implicit rounding warnings. 2016-08-19 14:09:10 +02:00
Mattes D 8eaa8613da CMake: Remove needless minimum version specifications. 2016-07-18 22:11:42 +02:00
Pokechu22 a4f327118b 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)
* Semistable update to 15w31a

I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written.

* Update to 15w34b protocol

Also, fix an issue with the Entity Equipment packet from the past version.  Clients are able to connect and do stuff!

* Partially update to 15w35e

Chunk data doesn't work, but the client joins.  I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d.

* Add '/blk' debug command

This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible.

* Fix CRLF normalization in CheckBasicStyle.lua

Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line.  Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't.

The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored.

* Update to 15w40b

This includes chunk serialization.  Fully functional chunk serialization for 1.9.

I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later.  The creation of a full buffer is suboptimal, but it's the easiest way to implement this code.

* Write long-by-long rather than creating a buffer

This is a bit faster and should be equivalent.  However, the code still doesn't look too good.

* Update to 15w41a protocol

This includes the new set passengers packet, which works off of the ridden entity, not the rider.  That means, among other things, that information about the previously ridden vehicle is needed when detaching.  So a new method with that info was added.

* Update to 15w45a

* 15w51b protocol

* Update to 1.9.0 protocol

Closes #3067.  There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work.  I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes).  Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks).

* Fix item pickup packet not working

That was a silly mistake, but at least it was an easy one.

* 1.9.2 protocol support

* Fix version info found in server list ping

Thus, the client reports that it can connect rather than saying that the server is out of date.  This required creating separate classes for 1.9.1 and 1.9.2, unfortunately.

* Fix build errors generated by clang

These didn't happen in MSVC.

* Add protocol19x.cpp and protocol19x.h to CMakeLists

* Ignore warnings in protocol19x that are ignored in protocol18x

* Document BLOCK_FACE and DIG_STATUS constants

* Fix BLOCK_FACE links and add separate section for DIG_STATUS

* Fix bat animation and object spawning

The causes of both of these are explained in #3135, but the gist is that both were typos.

* Implement Use Item packet

This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block.

* Handle DIG_STATUS_SWAP_ITEM_IN_HAND

* Add support for spawn eggs and potions

The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending.

* Remove spammy potion debug logging

* Fix wolf collar color metadata

The wrong type was being used, causing several clientside issues (including the screen going black).

* Fix 1.9 chunk sending in the nether

The nether and the end don't send skylight.

* Fix clang build errors

* Fix water bottles becoming mundane potions

This happened because the can become splash potion bit got set incorrectly.  Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion.

Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging.

* Copy Protocol18x as Protocol19x

Aditionally, method and class names have been swapped to clean up other diffs.  This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names).

* Make thrown potions use the correct appearence

This was caused by potions now using metadata.

* Add missing api doc for cSplashPotionEntity::GetItem

* Fix compile error in SplashPotionEntity.cpp

* Fix fix of cSplashPotionEntity API doc

* Temporarilly disable fall damage particles

These were causing issues in 1.9 due to the changed effect ID.

* Properly send a kick packet when connecting with an invalid version

This means that the client no longer waits on the server screen with no indication whatsoever.  However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping.

I also added a GetVarIntSize method to cByteBuffer.  This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way).

* Handle server list pings from unrecognized versions

This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse).

* Use cPacketizer for the disconnect packet

This also should fix clang build errors.

* Add 1.9.3 / 1.9.4 support

* Fix incorrect indentation in APIDesc
2016-05-14 20:12:42 +01:00
LogicParrot 77bf00a599 Out of world blocks are now always considered air blocks 2016-04-23 09:54:34 +03:00
LogicParrot 250e50c01e Fix issues below y = 0 2016-04-18 21:58:57 +03:00
LogicParrot 56a855d599 Manual mob burn code 2016-04-06 09:18:33 +03:00
LogicParrot a3d9bd8ba0 Fix passive mob destruction crashes 2016-03-28 18:37:43 +03:00
tonibm19 27968aa958 fixed horse bug
horse could be "controlled" without a saddle or being tamed
2016-03-01 19:52:21 +01:00
worktycho 4495dd62b9 Merge pull request #3026 from iam10K/master
Stop Tamed Wolf from following player when he is flying
2016-02-19 22:08:41 +00:00
Tyler Encke f29908ce77 Stop Wolf from following player when he is flying
Check to make sure player is not flying before allowing wolf to move to player.

Fixed isFlying to IsFlying
2016-02-19 13:07:07 -05:00
LogicParrot 83459d0d89 Proper entity destruction in non-ticking chunks 2016-02-19 07:05:22 +02:00
Julian Laubstein 6fdd7194c8 Merge pull request #2974 from LogicParrot/perl
Bulk clearing of whitespace
2016-02-06 11:37:34 +01:00
LogicParrot 2b81759bdc Merge pull request #2958 from LogicParrot/fence
Pathfinder now properly treats nonsolids above fence
2016-02-06 10:25:06 +02:00
LogicParrot ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
Alexander Harkness ac5170c7c4 Correct typo in documentation. 2016-02-05 16:45:55 +00:00
LogicParrot 6661e5d27f Prevent interspecies breeding 2016-02-04 20:44:55 +02:00
LogicParrot 1376743e47 Pathfinder now properly treats nonsolids above fence 2016-02-04 13:53:59 +02:00
LogicParrot 4aade202e0 cMonster::m_Target safety across worlds 2016-02-03 22:50:17 +02:00
Mathias 89f3dec7ac Updated old forum links 2016-01-31 02:25:03 +02:00
LogicParrot 439b3304f4 Improved tamed wolf pack cooperation and projectile reactions 2016-01-22 21:16:27 +02:00
LogicParrot d344e574de Spiders now friendly at daylight, new cChunk functions 2016-01-21 08:21:29 +02:00
LogicParrot 9c1cb488db Merge pull request #2887 from LogicParrot/water
Use IsBlockWater in cPath
2016-01-17 13:36:03 +02:00
LogicParrot 18a8caaf6d Use IsBlockWater in cPath 2016-01-17 12:52:00 +02:00
WinfieldSteve d7bc866c7c No second spawn broadcast necessary 2016-01-17 11:23:42 +01:00
LogicParrot 8c12227687 Fix crash when tamed wolf is hit by arrows 2016-01-16 16:37:37 +02:00
LogicParrot 3a24ed4b61 Fixed creeper calling TargetIsInRange with null m_Target 2016-01-12 15:26:51 +02:00
LogicParrot d4e99aedb1 Merge pull request #2859 from LogicParrot/attack2
Fix mob attack interval
2016-01-12 14:46:02 +02:00
LogicParrot 21df3cb0d8 Fix mob attack interval 2016-01-12 14:20:17 +02:00
LogicParrot e0f13f9f26 Friendly wolf attack safety checks 2016-01-12 13:27:03 +02:00
LogicParrot 359e772dee Tamed wolf assists owner (attack / defence) 2016-01-12 11:47:59 +02:00
Mattes D 80e1eb37dd Renamed leftover strings to Cuberite / Server, as needed.
Also upgraded the user setting file for MSVC to 2013.
2016-01-01 21:05:09 +01:00
Mattes D 902f428342 Fixed the monster burn code.
The old code failed when the monster was out of Y range.
2015-12-30 01:15:13 +01:00
LogicParrot fc8a117a0c Deleted cPath::BlockTypeIsFence 2015-12-27 16:13:44 +02:00
Safwat Halaby 687d1816c4 Update fences and gates list
Update fences and gates list
2015-12-25 19:19:22 +02:00
Safwat Halaby dfeced18b2 PF - "Special blocks" handling 2015-12-24 06:20:16 +02:00
Safwat Halaby 1ccf7d9c8a Chicken egg code early bailout 2015-12-23 15:57:26 +02:00
Gargaj fd2edf3ecf Baby chickens don't lay eggs 2015-12-23 15:54:07 +02:00
Safwat Halaby 8b4530740e PF - Improved mob jumping 2015-12-21 20:00:25 +02:00
Safwat Halaby b4874d213c Revert "Changed cPath to have a reset method". 2015-12-21 16:47:43 +02:00
Safwat Halaby 3c1f9e8a3a Merge pull request #2753 from cuberite/pathFix
Path fix
2015-12-16 18:39:23 +02:00
tycho 2c0ca0b4c3 Changed cPath to have a reset method.
Also reverts "Changed raw cPath to an unique_ptr, fixes memory leak"

This reverts commit 1515d37684.
2015-12-16 10:49:42 +00:00
Gargaj 68ff0edfde allow horse control (still quite buggy) 2015-12-15 21:14:27 +01:00
tycho 0fb8646198 Delete copy and move constructors from cPath
cPath is not safe to copy or move due to pointers into the std::map m_Map.
2015-12-15 19:18:58 +00:00
Lukas Pioch 1515d37684 Changed raw cPath to an unique_ptr, fixes memory leak 2015-12-15 01:16:36 +01:00
Gargaj 66e6589883 blockheight mechanism 2015-12-13 15:16:15 +01:00
Gargaj e31676fe50 snow golems are "neutral" 2015-12-13 13:13:37 +01:00
Gargaj 0eb519b35a sheep color inheritance 2015-12-13 13:04:18 +01:00
Safwat Halaby 4851f5e2c9 Remove stray "return" 2015-12-13 08:04:41 +02:00
Safwat Halaby 91aec448eb Fixed mobs attacking Creative Mode players 2015-12-13 07:52:11 +02:00
Safwat Halaby 8a5df43e6c Decoupled cMonster and path recalc logic, re-implemented recalc 2015-12-13 07:13:34 +02:00
Gargaj 62265a0850 Stop pathfinding over cobble walls
Also 1.5 blocks high, shouldn't pathfind over it.
2015-12-13 00:02:56 +01:00
Gargaj 86ea2ee50c stop creepers from exploding even if they just died 2015-12-08 22:34:32 +01:00
Gargaj 7a7cc1e66f fix wolf collars
I don't know why this had an inversion but it consistently made the wrong collar color (i.e. yellow dye made the collar blue)
2015-12-03 15:13:03 +01:00
Safwat Halaby dbda48ead4 Added documentation for breeding code 2015-11-30 12:05:38 +02:00
Gargaj 4ae3b64b07 implement breeding 2015-11-29 20:14:28 +01:00
Dave Tucker 83870f9fc0 Add enum for Sound and Particle Effects
Fixes #2603

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
2015-11-24 13:21:40 +00:00
Gargaj 853e6e6882 change from single followable item to multiple 2015-11-23 22:20:31 +01:00
Julian Laubstein 48f84cc3e9 changed mob age from char to int 2015-11-16 14:13:44 +01:00
worktycho 5f34097ab3 Blocks outside the world are never solid
Fixes #2539
2015-11-13 11:50:21 +00:00
Gargaj 4e991f4632 Add comment to Attack() return values 2015-11-09 15:51:35 +01: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
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
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
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 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
Gargaj 31dac0cb2e don't attack if dead 2015-11-07 13:48:00 +01:00
Gargaj 5bcd4b271e chickens don't take fall damage 2015-11-06 10:22:40 +01:00
bibo38 19b65ce357 Fixed failed assertation
This was caused by a monster with a negative Y-axis.
Fixes #2336
2015-11-03 08:39:18 +01:00
Mattes D 66e8190ca8 StyleCheck: Check spaces around ==, <=, >= 2015-10-08 17:43:26 +02:00
Safwat Halaby db40172b64 Partial revert of #2446 2015-09-28 08:52:08 +03:00
Safwat Halaby fc1633d6e6 Disabled squids and Guardians pathfinding, #2460 2015-09-27 19:48:37 +03:00
Mattes D 82d9ac1e1c Namechange to Cuberite 2015-09-25 10:14:17 +02:00
Tiger Wang 3b8dc45dc3 Merge pull request #2446 from cuberite/asyncpathfinder
Fixed a position bug in the pathfinder
2015-08-26 23:13:13 +01:00
Tiger Wang e254a76884 Removed unused function
* Fixes #2444
2015-08-22 19:35:56 +01:00
Tiger Wang baf3a07804 Fixed a position bug in the pathfinder 2015-08-22 17:06:08 +01:00
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