1
0
Commit Graph

3208 Commits

Author SHA1 Message Date
Tiger Wang
cee5160be8 Removed unneeded CPP files
Also removed unneeded #include in BlockStems
2013-11-29 22:25:07 +00:00
madmaxoft
78f0195d26 Implemented mesa biomes in DistortedHeightmap CompoGen. 2013-11-29 21:47:09 +01:00
madmaxoft
cbe8d1aa6d Fixed CheckerboardBiomeGen in negative coords. 2013-11-29 21:45:20 +01:00
madmaxoft
9b881a15ef DistortedHeightmap: Improved speed, prepared for mesa biomes.
This generates the rainbow-mesa as seen on the first mesa screenshot in the forum.
2013-11-29 18:42:56 +01:00
madmaxoft
3963a72046 Fixed an off-by-one error in cByteBuffer.
Could have caused random protocol errors and maybe even crashes.
2013-11-29 18:39:40 +01:00
madmaxoft
f027b71a31 Alpha-sorted BlockMetas, added red sand. 2013-11-29 18:38:27 +01:00
madmaxoft
f6df5cea87 Trees will generate in the new biomes.
Only the generic trees, the special variants haven't yet been implemented.
2013-11-28 22:08:42 +01:00
madmaxoft
057821d9b7 Added new biomes to old composition generator.
Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators.
2013-11-28 21:51:18 +01:00
madmaxoft
95ab73e4ed Added new biomes to old height generators.
Now Biomal and DistortedHeight generators will work with new biomes.
2013-11-28 21:15:50 +01:00
madmaxoft
41175b5549 BiomeVisualiser: Using the common BiomeGen creation code. 2013-11-28 20:19:10 +01:00
madmaxoft
c0a6c2b533 Moved BiomeGen creation from INI file data to BioGen.cpp.
This way it can be shared between MCServer and BiomeVisualiser.
2013-11-28 20:15:52 +01:00
madmaxoft
012840360e Moved json includes to where they are really needed. 2013-11-28 20:14:34 +01:00
madmaxoft
bdd86d7934 BiomeVisualiser: Added the TwoLevel biome generator. 2013-11-28 20:00:30 +01:00
madmaxoft
8acf0129e1 BiomeVisualiser: The biome settings are read from a file. 2013-11-28 20:00:29 +01:00
Mattes D
13dade5a83 Merge pull request #362 from mc-server/redstonefixes
Multiple bugfixes
2013-11-28 10:59:44 -08:00
Alexander Harkness
427b408fb0 Merge pull request #374 from mc-server/VS2013compilefix
Fixed VS2013 compiling
2013-11-28 10:36:00 -08:00
Tiger Wang
96759637e9 Fixed a bug with TNT waking simulators 2013-11-28 18:24:25 +00:00
Tiger Wang
f9e1be0d57 Improved TNT pickup randomisation 2013-11-28 18:22:13 +00:00
madmaxoft
c90f021ed4 Fixed RCONClient after foldermove. 2013-11-28 13:55:28 +01:00
madmaxoft
cfd9a29046 Fixed MemDumpAnalysis after foldermove. 2013-11-28 13:53:38 +01:00
madmaxoft
bb37271f30 Fixed BlockZapper after folder move. 2013-11-28 13:48:52 +01:00
madmaxoft
afd94a0b11 Fixed BiomeVisualiser after folder move. 2013-11-28 10:09:45 +01:00
madmaxoft
54c82c746e Fixed AnvilStats after folder move. 2013-11-28 10:05:39 +01:00
madmaxoft
19895dc428 ProtoProxy: Fixed after folder move. 2013-11-28 09:52:28 +01:00
Tiger Wang
994e1d7335 Made TNT pickups spawning chance 25% 2013-11-27 22:03:04 +00:00
Tiger Wang
a6630d3239 Merged master into redstonefixes 2013-11-27 21:35:13 +00:00
Tiger Wang
2ba4625835 Fixed VS2013 compiling 2013-11-27 21:10:01 +00:00
madmaxoft
bec27617a2 Voronoi-related biomegens use the new cVoronoiMap class. 2013-11-27 21:42:34 +01:00
Alexander Harkness
187a0dbaa2 Removed some useless options. 2013-11-27 17:54:23 +00:00
Alexander Harkness
596963743e Fixed a load of issues, clang autodetection works now.
This fixes issue #210.
This also removes the disableasm option, so it would be wise to remove
it from any scripts that use it.
I also removed a random line in the middle of globals.h, why was it
there?
2013-11-27 17:18:40 +00:00
Alexander Harkness
3568adafc2 Removed the -g option for release builds, as binaries were getting huge. 2013-11-27 16:59:58 +00:00
Alexander Harkness
a5425e0557 Removed the -Og option, which is rather new. 2013-11-27 16:57:28 +00:00
madmaxoft
ac793df2ab Added missing files for Voronoi map generation. 2013-11-27 14:26:28 +01:00
madmaxoft
97b03df372 Fixed Win nightbuild scripts after folder moves. 2013-11-27 14:24:36 +01:00
madmaxoft
557ebc88d7 Removed faulty .gitattributes.
They cause git to think that files have been modified although they have not, and makes it impossible to revert the files to un-changed form.
See http://stackoverflow.com/questions/5009096/files-showing-as-modified-directly-after-git-clone 's first answer.
2013-11-27 09:32:53 +01:00
Mattes D
49760db89d Merge pull request #370 from mc-server/foldermove2
Moved all the folders :D
2013-11-27 00:23:17 -08:00
madmaxoft
2113ca3844 Fixed VC2008 compilation, normalized include paths. 2013-11-27 09:17:25 +01:00
Alexander Harkness
d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Alexander Harkness
3b790bbf67 Fixed some of tiger's derpyness. 2013-11-27 07:27:19 +00:00
Alexander Harkness
83d582d083 Removed a -Ofast bit. 2013-11-27 07:19:12 +00:00
Tiger Wang
b358032fe9 Makefile fix 2013-11-26 23:15:32 +00:00
Tiger Wang
e1f3cb1879 ANOTHER compile fix
This one was broken by bear. :P
2013-11-26 22:56:35 +00:00
Tiger Wang
2ef9cf700d Hopefully fixed last of the Linux compile errors 2013-11-26 22:50:33 +00:00
Tiger Wang
3e3e63d946 Compile fix again 2013-11-26 22:45:08 +00:00
Tiger Wang
f87bb1619e Fixed Linux compile again 2013-11-26 22:43:22 +00:00
Tiger Wang
2dee812667 Possibly fixed Linux makefile 2013-11-26 22:37:44 +00:00
Tiger Wang
1c526ed52b Fixed tolua++ files 2013-11-26 22:11:40 +00:00
Tiger Wang
83ce4d4792 Fixed spawn point being generally in an ocean 2013-11-26 21:54:40 +00:00
Tiger Wang
b628cfb734 Fixed repeaters not powering from wire
This should also fix comparators (in the future).
This also updates XML comments so that they are compatible with Doxygen.
2013-11-26 21:54:07 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	VC2008/MCServer.vcproj
2013-11-26 17:21:06 +00:00