Tiger Wang
|
c4dccf8405
|
Merge remote-tracking branch 'origin/master' into fixes
Conflicts:
src/Mobs/Path.cpp
|
2015-05-03 23:59:34 +01:00 |
|
Tiger Wang
|
a509cf00ef
|
Entity improvements
•Pathfinder improvements
•Fixes #1217
•Fixes #1933
Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
|
2015-05-03 23:58:12 +01:00 |
|
Lukas Pioch
|
65ab5c74b6
|
Crafting - Allow to craft torches with charcoals
|
2015-05-03 22:27:13 +02:00 |
|
Tiger Wang
|
335879e224
|
Merge pull request #1934 from SafwatHalaby/p_IsSolidChunks
PathFinder - Fixed nullptr chunk bug
|
2015-05-03 18:53:37 +01:00 |
|
wiseoldman95
|
33ffa420a6
|
PathFinder - Fixed nullptr chunk bug
|
2015-05-03 19:43:11 +03:00 |
|
Tiger Wang
|
f96f9dae66
|
Merge pull request #1930 from SafwatHalaby/AI_Jump
AI - Improved Mob Jumping
|
2015-05-03 13:23:04 +01:00 |
|
wiseoldman95
|
d68b75a679
|
AI - Improved Mob Jumping
|
2015-05-03 14:24:24 +03:00 |
|
Mattes D
|
d757d75b6c
|
Merge pull request #1932 from SafwatHalaby/F_AssertFix
PathFinder - Fixed Howaner's bug
|
2015-05-03 11:51:09 +02:00 |
|
Mattes D
|
2f369d09b6
|
Fixed multiple mbedtls inclusion.
Ref.: #1880.
|
2015-05-03 10:01:19 +02:00 |
|
wiseoldman95
|
599ad97b65
|
PathFinder - Crash fix, chunks in parameters are now references
|
2015-05-03 10:49:06 +03:00 |
|
Mattes D
|
e6eeee84e0
|
Merge pull request #1880 from mc-server/submodules
Update submodules
|
2015-05-03 00:03:07 +02:00 |
|
STRWarrior
|
63decbe4dc
|
Fixed error in webadmin home page
|
2015-05-02 19:16:25 +02:00 |
|
Tiger Wang
|
9226bdbd4c
|
Merge pull request #1925 from SafwatHalaby/PathFinder_Optimze
Pathfinder optimization
|
2015-05-02 16:50:42 +01:00 |
|
Tiger Wang
|
3257073706
|
Merge pull request #1928 from SafwatHalaby/contrib
Added myself to CONTRIBUTORS
|
2015-05-02 16:50:24 +01:00 |
|
Tiger Wang
|
114962943b
|
Merge pull request #1927 from SafwatHalaby/AI_BetterDayLightHandling
AI - Much better burning/daylight behavior
|
2015-05-02 16:50:08 +01:00 |
|
wiseoldman95
|
31f9d111d7
|
Added myself to CONTRIBUTORS. Note: I'm formerly wiseoldman95
|
2015-05-02 18:38:19 +03:00 |
|
Tiger Wang
|
e4eb039704
|
Merge pull request #1919 from mathias-github/patch-1
Added Guardian and Rabbit to DefaultMonsters in Overworld
|
2015-05-02 16:10:51 +01:00 |
|
Tiger Wang
|
2919d08883
|
Update submodules
|
2015-05-02 15:57:49 +01:00 |
|
wiseoldman95
|
3586f25853
|
AI - Better daylight handling
|
2015-05-02 14:32:33 +03:00 |
|
wiseoldman95
|
16b6fc9b5d
|
PathFinding - Chunk querying optimization and improve cPath::IsSolid
|
2015-05-02 14:16:16 +03:00 |
|
Mattes D
|
a762e8a54a
|
CheckBasicStyle: Can check individual files or git commits.
|
2015-05-02 13:02:18 +02:00 |
|
Mattes D
|
81274b6ee9
|
APIDump: Added an "apishow" command.
Launches the webbrowser to show the locally exported API docs.
|
2015-05-02 12:26:19 +02:00 |
|
Mattes D
|
aa142757db
|
Merge pull request #1920 from wiseoldman95/SquashedPathFinder
Implemented A* Pathfinding and updated monster.cpp to use it.
|
2015-05-01 13:47:48 +02:00 |
|
wiseoldman95
|
1b0e21e0b2
|
A* Pathfinding and better monster AI
|
2015-05-01 13:18:47 +03:00 |
|
Mattes D
|
259132d17e
|
Merge pull request #1924 from mc-server/BlockAreaCountNonAir
Added cBlockArea:CountNonAirBlocks API function.
|
2015-05-01 11:49:41 +02:00 |
|
Mattes D
|
a3c4b7580b
|
Added cBlockArea:CountNonAirBlocks API function.
|
2015-04-30 23:16:33 +02:00 |
|
Mattes D
|
46bb4788cf
|
Merge pull request #1923 from mc-server/ReadWholeFileFix
Fixed bindings for cFile:ReadWholeFile().
|
2015-04-30 12:57:17 +02:00 |
|
Mattes D
|
8d4a87d2c4
|
Fixed bindings for cFile:ReadWholeFile().
Fixes #1914
|
2015-04-30 11:44:42 +02:00 |
|
Mattes D
|
4bf3b874e3
|
Merge pull request #1922 from mc-server/BlockAreaExt
cBlockArea extensions
|
2015-04-30 10:39:15 +02:00 |
|
Mattes D
|
daacbf4d7b
|
APIDump: Added documentation for cBlockArea:GetNonAirCropRelCoords.
|
2015-04-30 09:53:10 +02:00 |
|
Woazboat
|
c31092c2d5
|
Changed fabs() to std::abs()
|
2015-04-29 17:17:43 +02:00 |
|
Woazboat
|
d1ad08169e
|
braces in Tracer::mNormalTable initializer in separate lines
|
2015-04-29 17:12:45 +02:00 |
|
Mathias
|
17343d8215
|
Added Guardian and Rabbit to DefaultMonsters in Overworld
|
2015-04-29 18:07:26 +03:00 |
|
Mattes D
|
ca90f6d280
|
Added cBlockArea::msSimpleCompare merge strategy.
|
2015-04-29 15:45:48 +02:00 |
|
Mattes D
|
fc95501f68
|
Added cBlockArea:GetNonAirCropRelCoords() API function.
Fixes #1915.
|
2015-04-29 15:14:22 +02:00 |
|
jammet
|
6e3c584f07
|
Clay blocks are handled with the OreHandler
|
2015-04-29 10:14:34 +02:00 |
|
Woazboat
|
f7d88ff4e0
|
Added extra braces to initialization of Tracer::m_NormalTable
|
2015-04-29 02:21:37 +02:00 |
|
Woazboat
|
723aca2bfa
|
And another cs fix I overlooked
|
2015-04-29 01:39:08 +02:00 |
|
Woazboat
|
ca5b3e5776
|
Fixed comments according to cs
|
2015-04-29 01:37:16 +02:00 |
|
Woazboat
|
2359fc6705
|
Fix HasNonZeroLength name
now 100% more cs compliant
|
2015-04-29 00:27:15 +02:00 |
|
Woazboat
|
3d1bd544b0
|
Changed Tracer::m_NormalTable to static array
Was previously instantiated for every trace
|
2015-04-29 00:14:42 +02:00 |
|
Mattes D
|
491b75a8a4
|
Merge pull request #1913 from wiseoldman95/fixCompatibleProtocols
Updated MC versions in ProtocolRecognizer.h
|
2015-04-28 08:43:39 +02:00 |
|
wiseoldman95
|
231ba3af53
|
Updated MC versions in ProtocolRecognizer.h
|
2015-04-28 09:16:09 +03:00 |
|
Mattes D
|
3fac9beb64
|
Updated MC versions in readme.txt
|
2015-04-28 07:57:46 +02:00 |
|
Woazboat
|
2f264dba71
|
Changed Vector3 Equals function to avoid using memcmp
|
2015-04-28 02:54:45 +02:00 |
|
Woazboat
|
496e5b1000
|
Tracer signum function now returns int
|
2015-04-28 02:51:21 +02:00 |
|
Woazboat
|
797e3130d2
|
Check for zero length vector in Trace
Added hasNonZeroLength member function to Vector3
|
2015-04-28 02:47:36 +02:00 |
|
Woazboat
|
4e8b4981d8
|
convert c style casts to c++ static casts
|
2015-04-28 02:26:25 +02:00 |
|
worktycho
|
facb6e7416
|
Merge pull request #1909 from Woazboat/CodeCleanup
cSetChunkData constructor explicitly requires std::move()
|
2015-04-27 21:11:56 +01:00 |
|
Woazboat
|
e240cab523
|
Removed redundant temp iterator. std::list.erase already returns
iterator to next valid list element
|
2015-04-27 21:54:36 +02:00 |
|