flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
Files
79e5b823547a2a51d9f4e504fc24ec539e11ac34
cuberite-2a/src
T
History
Tiger Wang 79e5b82354 Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	src/Noise/Noise.h
	src/World.h
2014-11-23 17:12:34 +00:00
..
Bindings
Use cLuaState's stack trace.
2014-11-17 18:01:56 +01:00
BlockEntities
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Blocks
Signs can be placed on wallsigns.
2014-10-23 08:07:20 +01:00
Entities
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
Generating
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
HTTPServer
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
Items
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Mobs
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
Noise
cInterpolNoise: Implemented optimized 2D generating.
2014-11-19 16:58:27 +01:00
OSSupport
Compilation fixes
2014-11-23 14:22:05 +00:00
PolarSSL++
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Protocol
Merge pull request #1565 from mc-server/MergedIniFile
2014-10-24 09:13:39 +02:00
Resources
…
Simulator
Merge pull request #1565 from mc-server/MergedIniFile
2014-10-24 09:13:39 +02:00
UI
Merged branch 'master' into c++11.
2014-10-23 08:40:39 +02:00
WorldStorage
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
AllocationPool.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
BiomeDef.cpp
Added IsBiomeVeryCold() and IsBiomeCold() functions.
2014-10-26 18:17:04 +01:00
BiomeDef.h
Added new biomegen: Grown
2014-10-26 19:58:16 +01:00
BlockArea.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
BlockArea.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
BlockID.cpp
Fixed 1.8 world item format reading.
2014-10-29 15:47:43 +01:00
BlockID.h
Fixed typo.
2014-10-27 16:46:30 +00:00
BlockInfo.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
BlockInfo.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
BlockInServerPluginInterface.h
Functions in cPluginManager get references instead of pointers.
2014-10-15 19:09:09 +02:00
BlockTracer.h
Fixed basic whitespace problems.
2014-07-17 16:33:09 +02:00
BoundingBox.cpp
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
BoundingBox.h
cBoundingBox: Added accessors.
2014-09-03 16:56:59 +02:00
BuildInfo.h.cmake
Added abilty to set build info
2014-09-10 16:07:00 +01:00
ByteBuffer.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
ByteBuffer.h
Use std::thread
2014-10-19 00:29:34 +01:00
ChatColor.cpp
Refactored cChatColor
2014-07-19 11:09:39 -07:00
ChatColor.h
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
CheckBasicStyle.lua
CheckBasicStyle ignores the Bindings.h generated file.
2014-10-13 10:33:08 +02:00
Chunk.cpp
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
Chunk.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
ChunkData.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
ChunkData.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
ChunkDataCallback.h
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
ChunkDef.h
Merged branch 'master' of git://github.com/sriehl/MCServer
2014-10-21 18:12:40 +02:00
ChunkMap.cpp
Fixed missing CS lock in cChunkMap::WakeUpSimulatorsInArea().
2014-10-31 19:25:44 +01:00
ChunkMap.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
ChunkSender.cpp
Forgotten m_SendChunksMediumPriority.empty() check.
2014-10-28 21:32:01 +01:00
ChunkSender.h
Use 3 priorities.
2014-10-23 21:19:43 +02:00
ChunkStay.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
ChunkStay.h
…
ClientHandle.cpp
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
ClientHandle.h
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
CMakeLists.txt
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
CommandOutput.cpp
Normalized comments.
2014-07-17 22:15:34 +02:00
CommandOutput.h
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
CompositeChat.cpp
Moved chat json creating to the CompositeChat class.
2014-09-13 20:27:10 +02:00
CompositeChat.h
Moved chat json creating to the CompositeChat class.
2014-09-13 20:27:10 +02:00
CraftingRecipes.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
CraftingRecipes.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Cuboid.cpp
Fixed a ToLua warning - operator = not supported.
2014-08-03 22:04:48 +02:00
Cuboid.h
Fixed a ToLua warning - operator = not supported.
2014-08-03 22:04:48 +02:00
DeadlockDetect.cpp
Suggestions
2014-10-23 23:58:01 +01:00
DeadlockDetect.h
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01:00
Defines.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Enchantments.cpp
Moved all Noise-related files into a separate folder.
2014-11-18 12:07:08 +01:00
Enchantments.h
Returned cFastRandom and cEnchantment:GetRandomEnchantmentFromVector to before
2014-10-15 14:44:07 +02:00
Endianness.h
Endianness.h: undefined ntohll before redefining
2014-07-26 03:42:42 -07:00
FastRandom.cpp
Migrated random generators to std::random
2014-10-19 14:10:18 +01:00
FastRandom.h
Missing EOL.
2014-10-21 14:21:08 +01:00
ForEachChunkProvider.h
…
FurnaceRecipe.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
FurnaceRecipe.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Globals.cpp
…
Globals.h
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
IniFile.cpp
CheckBasicStyle'd
2014-10-27 21:34:02 +00:00
IniFile.h
CheckBasicStyle'd
2014-10-27 21:34:02 +00:00
Inventory.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Inventory.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Item.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Item.h
Changed the IsEnchantable() comment again.
2014-09-02 20:17:31 +02:00
ItemGrid.cpp
Moved all Noise-related files into a separate folder.
2014-11-18 12:07:08 +01:00
ItemGrid.h
Clarified RemoveItem()'s comments.
2014-07-18 23:47:46 +02:00
LeakFinder.cpp
…
LeakFinder.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
LightingThread.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
LightingThread.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
LinearInterpolation.cpp
…
LinearInterpolation.h
…
LinearUpscale.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
LineBlockTracer.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
LineBlockTracer.h
…
Logger.cpp
Compilation fixes
2014-11-23 14:22:05 +00:00
Logger.h
Renamed Loggers
2014-08-12 16:05:04 +01:00
LoggerListeners.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
LoggerListeners.h
Fixed windows compilation and style issues.
2014-08-12 22:43:04 +02:00
main.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Map.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Map.h
Fixed spaces around single-line comments.
2014-07-17 19:13:23 +02:00
MapManager.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
MapManager.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Matrix4.h
Fixed a ToLua warning - operator = not supported.
2014-08-03 22:04:48 +02:00
MCServer.vcproj.user
…
MemoryLeak.h
…
MobCensus.cpp
Fixed spaces around single-line comments.
2014-07-17 19:13:23 +02:00
MobCensus.h
…
MobFamilyCollecter.cpp
…
MobFamilyCollecter.h
Fixed spaces around single-line comments.
2014-07-17 19:13:23 +02:00
MobProximityCounter.cpp
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
MobProximityCounter.h
Code style: Fixed braces on separate lines.
2014-07-19 15:23:40 +02:00
MobSpawner.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
MobSpawner.h
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
MonsterConfig.cpp
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
MonsterConfig.h
…
ProbabDistrib.cpp
Migrated random generators to std::random
2014-10-19 14:10:18 +01:00
ProbabDistrib.h
…
RankManager.cpp
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
RankManager.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
RCONServer.cpp
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
RCONServer.h
…
Root.cpp
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
Root.h
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
Scoreboard.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Scoreboard.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Server.cpp
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
Server.h
cMojangAPI: Don't update data if server is in offline mode.
2014-10-17 13:57:18 +02:00
SetChunkData.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
SetChunkData.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
StackWalker.cpp
…
StackWalker.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Statistics.cpp
Code style: Fixed braces on separate lines.
2014-07-19 15:23:40 +02:00
Statistics.h
Fixed spaces around single-line comments.
2014-07-17 19:13:23 +02:00
StringCompression.cpp
Anvil: switched inflate to stream mode.
2014-09-03 19:36:53 +02:00
StringCompression.h
Anvil: switched inflate to stream mode.
2014-09-03 19:36:53 +02:00
StringUtils.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
StringUtils.h
Bug fix
2014-09-27 22:13:37 +01:00
Tracer.cpp
A few compiler warning fixes
2014-09-22 18:23:56 -04:00
Tracer.h
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
Vector3.h
First implementation for the LargeOakTree
2014-11-13 10:44:36 +01:00
VoronoiMap.cpp
Voronoi biomegen: Added JitterSize and OddRowOffset.
2014-09-17 23:24:22 +02:00
VoronoiMap.h
Moved all Noise-related files into a separate folder.
2014-11-18 12:07:08 +01:00
WebAdmin.cpp
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
WebAdmin.h
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
World.cpp
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
World.h
Merge remote-tracking branch 'origin/master' into c++11
2014-11-23 17:12:34 +00:00
XMLParser.h
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00