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 |
|
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 |
|