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

9726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
worktycho
2d408e8647 Merge pull request #2645 from Gargaj/followedarray 
Allow multiple followable items
 2015-11-23 22:57:59 +00:00
Gargaj
853e6e6882 change from single followable item to multiple 2015-11-23 22:20:31 +01:00
Julian Laubstein
5d5f5c9fba Fixed display of helpmessage 2015-11-23 18:20:37 +01:00
Julian Laubstein
9d07be62d3 Changed static_cast to FloorC 2015-11-23 18:10:58 +01:00
Alexander Harkness
68218f6ae6 Merge pull request #2683 from Gargaj/patch-1 
add Golden Carrot
 2015-11-23 16:47:33 +00:00
Gargaj
2971758df3 add Golden Carrot 
Yay!
 2015-11-23 17:39:40 +01:00
NiLSPACE
002019e9ad Merge pull request #2680 from cuberite/vhE 
Converted some height validations to use cChunkDef::IsValidHeight()
 2015-11-23 11:55:34 +01:00
Julian Laubstein
b87e0b6b15 Adjusted height validation using cChunkDef::IsValidHeight() 2015-11-23 03:17:32 +01:00
Julian Laubstein
07adddb810 Merge pull request #2678 from cuberite/ln 
Adjusted in help messages for consistency
 2015-11-23 02:48:35 +01:00
Julian Laubstein
2d8b265133 Added dash to helpstring output 2015-11-23 02:12:19 +01:00
Julian Laubstein
c32b5fcaa9 Removed dashes in help messages for consistency 2015-11-23 02:12:19 +01:00
Julian Laubstein
0bedfc58b2 Merge pull request #2679 from cuberite/vh 
Added cChunkDef::IsValidWidth()
 2015-11-23 02:09:55 +01:00
Julian Laubstein
62b41c351c Added cChunkDef::IsValidWidth() 2015-11-23 01:30:48 +01:00
Safwat Halaby
be9e353f13 Merge pull request #2676 from SafwatHalaby/revert 
Revert "Changed description to "Cuberite - Minecraft in C++!""
 2015-11-22 18:27:54 +02:00
Safwat Halaby
5fae7a0eee Revert "Changed description to "Cuberite - Minecraft in C++!"" 
This reverts commit f4406c047e.
 2015-11-22 16:30:33 +02:00
Safwat Halaby
df4b9eb4fc Merge pull request #2673 from SafwatHalaby/sh 
compile.sh is now sh-compatible. (Unix, etc.)
 2015-11-21 19:24:01 +02:00
Safwat Halaby
37921990a2 compile.sh is now sh-compatible. (Unix, etc.) 2015-11-21 18:59:02 +02:00
Safwat Halaby
628ce5e394 Merge pull request #2672 from SafwatHalaby/readme 
Readme update - organized the installation methods
 2015-11-21 18:32:39 +02:00
Safwat Halaby
c14ebd64c4 Readme update - organized the installation methods 2015-11-21 16:36:24 +02:00
Mattes D
19d38291fb Merge pull request #2671 from SafwatHalaby/compile 
compile.sh - Automatically choose master branch
 2015-11-21 14:52:01 +01:00
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