flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,306 Commits 1 Branch 0 Tags 92 MiB
acedc7f6d1
Commit Graph

9306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Safwat Halaby
acedc7f6d1 compile.sh - Automatically choose master branch 2015-11-21 15:50:25 +02:00
Alexander Harkness
38a01cec75 Merge pull request #2660 from cuberite/worktycho-patch-2 
Fix musl + clang 3.6 compile error
 2015-11-20 16:53:12 +00:00
Julian Laubstein
2dcc55b6b6 Merge pull request #2663 from SafwatHalaby/minor 
Changed server description to "Cuberite - Minecraft in C++!"
 2015-11-20 09:32:26 +01:00
Safwat Halaby
f4406c047e Changed description to "Cuberite - Minecraft in C++!" 2015-11-20 09:18:44 +02:00
worktycho
dd7572925b Merge pull request #2661 from tboerger/musl-fixes 
Musl fixes
 2015-11-19 22:42:16 +00:00
Thomas Boerger
ffed489156 Include execinfo.h only on __GLIBC__ 2015-11-19 22:46:47 +01:00
Thomas Boerger
a16a9eab4f Define stacktrace functions only if __GLIBC__ is defined 2015-11-19 22:46:47 +01:00
worktycho
98d4695e58 Fix musl + clang 3.6 compile error 2015-11-19 21:32:13 +00:00
Thomas Boerger
8f3f91d3db Check for __GLIBC__ to detect correct strerror_r version 2015-11-19 22:23:47 +01:00
worktycho
3955742e2f Merge pull request #2451 from cuberite/mobchartoint 
Changed mob age from char to int
 2015-11-17 10:35:03 +00:00
Julian Laubstein
48f84cc3e9 changed mob age from char to int 2015-11-16 14:13:44 +01:00
Alexander Harkness
85a3076b19 Fixed some markdown. 2015-11-15 16:31:53 +00:00
Alexander Harkness
6bc2b9600b Merge pull request #2648 from cuberite/getting-star 
Minor documentation changes.
 2015-11-15 16:29:17 +00:00
Alexander Harkness
3802e70e7d Edited contributors. 2015-11-15 16:27:59 +00:00
worktycho
09fe9ab6a9 Merge pull request #2642 from SamOatesPlugins/master 
Improved spawn location calculations.
 2015-11-15 14:34:50 +00:00
Alexander Harkness
8969931e6f Improved compiling file. 2015-11-15 12:22:23 +00:00
Alexander Harkness
64f9974e89 Fixed typos, and improved contributing file. 2015-11-15 12:08:32 +00:00
Alexander Harkness
0ea9890e09 Fixed typo in getting-started. 2015-11-15 11:22:06 +00:00
Alexander Harkness
69d8e2fe6b Fix api docs link. 2015-11-15 11:19:48 +00:00
Alexander Harkness
770dca1b7a Update getting started to new information. 2015-11-15 11:19:03 +00:00
samoatesgames
19ea5d5423 Improved spawn location calculations. 
- Supports Overworld and Nether spawns.
 - Supports spawning under objects, but still above ground (e.g. under the leaves of a tree).
 - Protects against spawning in oceans.
 - Protects against spawning in water.
 - Uses a radial search about the origin, rather than a linear.
 - Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548)
 - Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);)
 2015-11-13 15:08:16 +00:00
Julian Laubstein
62b1d0b772 Merge pull request #2641 from cuberite/worktycho-patch-1 
Blocks outside the world are never solid
 2015-11-13 13:39:16 +01:00
worktycho
5f34097ab3 Blocks outside the world are never solid 
Fixes #2539
 2015-11-13 11:50:21 +00:00
worktycho
c001a99a68 Merge pull request #2632 from Gargaj/patch-1 
Avoid reading out of bounds
 2015-11-11 11:20:36 +00:00
Gargaj
5e840cf86f Avoid reading out of bounds 
as per https://github.com/cuberite/cuberite/pull/2630#discussion_r44377411
 2015-11-10 22:22:28 +01:00
worktycho
951569faaa Merge pull request #2634 from cuberite/vh 
Added cChunkDef::IsValidHeight()
 2015-11-10 21:19:57 +00:00
Julian Laubstein
98bac62c07 Added cChunkDef::IsValidHeight() 2015-11-10 19:44:30 +01:00
worktycho
ef1b82a33d Merge pull request #2631 from Gargaj/divby0 
Avoid division by zero
 2015-11-10 17:33:04 +00:00
Gargaj
67e6da4627 Avoid division by zero 
It won't do much because direction will still be a nullvector, but it at least avoids a CPU spike.
 2015-11-10 18:00:14 +01:00
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