1
0
Commit Graph

8521 Commits

Author SHA1 Message Date
Tri125
9f6192687f Big Magma Cube can now spawn
Following the same method as the Slime, Magma Cube can now spawn with the size of 1, 2 or 4.
2015-05-06 23:56:08 -04:00
Tri125
63af47832d Fixed the sound issue with the MagmaCube
-Name of the sound is correctly capitalized

-Get the appropriate sound depending on its size
2015-05-06 23:12:17 -04:00
Mattes D
69ec6e105f Merge pull request #1953 from mc-server/bearbin-fadwp
Properly fix the docs for FindAndDoWithPlayer.
2015-05-06 22:24:10 +02:00
Alexander Harkness
9544020477 Merge pull request #1952 from mc-server/coverity-fix
Actually empty the open list
2015-05-06 20:41:17 +01:00
Alexander Harkness
aa3450808d Properly fix the docs for FindAndDoWithPlayer.
Removed F accidentially added.

Made the two FindAndDoWithPlayers documentation consistent.
2015-05-06 19:59:43 +01:00
Alexander Harkness
68614e7224 Added info about case-sensitivity of FindAndDoWithPlayer 2015-05-06 18:39:03 +01:00
worktycho
7771091099 Actually empty the open list 2015-05-06 17:26:59 +01:00
Alexander Harkness
bd73dcedd4 Merge pull request #1946 from SafwatHalaby/lean
PathFinder - Couple of bugfixes
2015-05-06 07:38:31 +01:00
wiseoldman95
c6dd455d72 PF - Swimming bugfix 2015-05-06 09:27:47 +03:00
wiseoldman95
020e928685 PF - Fixed mobs not reaching leaning player 2015-05-06 07:31:02 +03:00
worktycho
18a268a961 Merge pull request #1943 from mc-server/revert-1917-CodeCleanup
Revert "Small code cleanup"
2015-05-05 22:08:49 +01:00
worktycho
ee939cf8c8 Revert "Small code cleanup" 2015-05-05 22:08:40 +01:00
worktycho
f3101f1d04 Merge pull request #1917 from Woazboat/CodeCleanup
Small code cleanup
2015-05-05 21:38:08 +01:00
worktycho
f71d693302 Merge pull request #1939 from SafwatHalaby/Polising
AI - More conservative use of ResetPathFinding, some polishing
2015-05-05 14:09:16 +01:00
Mattes D
c0bbb9dc7b Merge pull request #1941 from mc-server/bearbin-darkoak
Add furnacing recipies for dark oak and acacia.
2015-05-05 13:38:55 +02:00
Alexander Harkness
c0da088dbb Add furnacing recipies for dark oak and acacia.
This should fix #1899, and also acacia logs too.
2015-05-05 11:17:11 +01:00
Alexander Harkness
c87c6ef57b Merge pull request #1940 from SafwatHalaby/lua
Chmod +x CheckBasicStyle.lua
2015-05-05 10:59:38 +01:00
wiseoldman95
304bc4eca4 AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bug 2015-05-05 12:51:58 +03:00
wiseoldman95
94f882b144 Chmod +x CheckBasicStyle.lua 2015-05-05 12:49:07 +03:00
Mattes D
9ba7823252 Merge pull request #1938 from jan64/master
Change visual protocol name to include MCServer
2015-05-04 23:28:49 +02:00
Alexander Harkness
adba982257 Merge pull request #1935 from mc-server/fixes
Entity improvements
2015-05-04 19:31:53 +01:00
jan64
b1efaa55cd Change visual protocol name to include MCServer 2015-05-04 17:52:46 +02:00
Alexander Harkness
8567ca1a6c Upgraded ubuntu version.
Should make builds start working again.
2015-05-04 10:01:32 +01:00
Alexander Harkness
a479f05dd1 Merge pull request #1937 from mc-server/BuildInfoCrash
Print Build info as part of the crash information
2015-05-04 09:22:39 +01:00
worktycho
6df0e877e8 Print Build info as part of the crash information 2015-05-04 09:07:03 +01:00
Mattes D
a5852436ca Merge pull request #1936 from Seadragon91/master
Crafting - Allow to craft torches with charcoals
2015-05-04 09:06:49 +02:00
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