summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* README now has HTTPS links.1.7EOLAlexander Harkness2016-07-201-3/+3
* Added newsletter, HTTPS links.Alexander Harkness2016-07-201-2/+5
* Added Robert Cringely to BACKERSAlexander Harkness2016-07-201-0/+1
* Fix endianness issue with ODROID-C2 Boards (#3268)Alexander Harkness2016-07-201-1/+1
* Merge pull request #3204 from cuberite/BindingsGenLuaMattes D2016-07-1964-403/+2061
|\
| * CMake: Silenced CMP0054 policy warning.Mattes D2016-07-181-0/+4
| * CMake: Remove needless minimum version specifications.Mattes D2016-07-1832-64/+0
| * Use system Lua, if available, to generate bindings.Mattes D2016-07-184-23/+72
| * APIDump: Added explicit IsStatic flag to static functions.Mattes D2016-07-186-106/+110
| * Updated API documentation.Mattes D2016-07-1819-154/+381
| * Vector3: Removed useless NormalizeCopy overload from LuaAPI.Mattes D2016-07-181-1/+7
| * DiffAPIDesc: Support optional params in desc.Mattes D2016-07-181-12/+12
| * LuaAPI: Fixed bindings for cChunkDesc:GetBlockTypeMetaMattes D2016-07-183-2/+39
| * Bindings: Added a script to generate a diff between APIDesc and ToLua.Mattes D2016-07-182-3/+553
| * Bindings: Don't generate docs for private symbols, mark static symbols.Mattes D2016-07-181-13/+35
| * APIDump: Changed not to use globals, added more doxycomments.Mattes D2016-07-182-42/+64
| * Bindings: Output description is valid Lua file.Mattes D2016-07-181-3/+7
| * Bindings: Extract unexported DoxyComments.Mattes D2016-07-181-15/+134
| * Bindings: Extract DoxyCommentsMattes D2016-07-181-18/+187
| * Added a Pure-Lua implementation for bindings generation.Mattes D2016-07-184-2/+511
|/
* Fixes for boat entities (#3265)beeduck2016-07-187-7/+186
* Update README.md (#3266)Julian Laubstein2016-07-181-1/+1
* Merge pull request #3261 from Seadragon91/patch-1Mattes D2016-07-122-2/+3
|\
| * Changed Hopper to wtHopper and adjusted .gitignore.Lukas Pioch2016-07-122-2/+3
|/
* Merge pull request #3259 from cuberite/FixJsonBoolMattes D2016-07-102-4/+16
|\
| * Fixed Lua Json serializing a bool.Mattes D2016-07-102-4/+16
|/
* removed cast from BlockTrapdoor.h (#3256)gaurav sehgal2016-07-073-4/+9
* Added Server OS section pr template (#3254)Julian Laubstein2016-07-061-0/+1
* Merge pull request #3252 from Altenius/fixpistonMattes D2016-07-061-5/+9
|\
| * Fixed piston destroying other pistonsAltenius2016-07-061-5/+9
|/
* Merge pull request #3250 from Altenius/masterLukas Pioch2016-07-061-1/+1
|\
| * Fixed falling block spawningAltenius2016-07-051-1/+1
|/
* Merge pull request #3247 from cuberite/FixBindingsDependenciesMattes D2016-07-023-2/+122
|\
| * Bindings: Added missing dependencies.Mattes D2016-07-021-0/+12
| * CircleCI: Check for missing Bindings dependenciesMattes D2016-07-022-2/+110
|/
* Merge pull request #3246 from cuberite/revert_redstone_handlerMattes D2016-07-022-93/+31
|\
| * Revert "Made redstone handlers static"Lukas Pioch2016-07-012-93/+31
|/
* Merge pull request #3244 from cuberite/minecart_chestMattes D2016-07-011-0/+1
|\
| * Close chest window if minecart is destroyedLukas Pioch2016-06-301-0/+1
|/
* Merge pull request #3232 from cuberite/LuaCallbackMattes D2016-06-3030-2282/+1614
|\
| * Converted cLuaState::cCallbackPtr into a UniquePtr.Mattes D2016-06-279-24/+39
| * Removed dead code related to callbacks.Mattes D2016-06-274-43/+3
| * cPluginManager: Use a callback for command handler registration.Mattes D2016-06-278-209/+167
| * LuaState: Implemented proper locking for cCallback.Mattes D2016-06-2711-115/+151
| * Changed cLuaWindow callbacks to use cLuaState::cCallback.Mattes D2016-06-277-183/+243
| * Removed the cPluginLua::cResettable class.Mattes D2016-06-272-82/+1
| * Changed world tasks to use cLuaState::cCallback.Mattes D2016-06-272-69/+40
| * Changed plugin hook registrations to use cLuaState::cCallback.Mattes D2016-06-275-1008/+190
| * Removed cWebPlugin, WebAdmin uses cLuaState::cCallback.Mattes D2016-06-2714-630/+637
| * Added cLuaState::cCallback for representing (resettable) Lua callbacks.Mattes D2016-06-272-7/+231
|/
* Self tests (#3242)Mattes D2016-06-265-6/+114
* Merge pull request #3240 from cuberite/grownvisualizerNiLSPACE2016-06-243-1/+253
|\
| * added Grown visualizer to the Generator documentationNiLSPACE2016-06-243-1/+253
|/
* Added ltdTM to BACKERSAlexander Harkness2016-06-231-0/+1
* Merge pull request #3228 from cuberite/SeparateSelfTestsMattes D2016-06-1942-532/+996
|\
| * cNetwork: Fixed possible hang when terminating immediately after init.Mattes D2016-06-182-2/+27
| * SelfTests: More logging for EnumInterfaces.Mattes D2016-06-181-2/+3
| * Flush immediately after each line when running tests.Mattes D2016-06-181-54/+55
| * SelfTests: Print a quick message on test start.Mattes D2016-06-1813-1/+45
| * SelfTests: Removed the unneeded cSelfTests class.Mattes D2016-06-188-161/+0
| * SelfTests: Fixed HTTPMessageParser tests for out-of-source builds.Mattes D2016-06-181-5/+5
| * SelfTests: Fixed missing override keyword in EchoServer.Mattes D2016-06-181-1/+1
| * SelfTests: Moved BoundingBox test to a separate project.Mattes D2016-06-184-66/+125
| * SelfTests: Moved SchematicFileSerializer test into a separate project.Mattes D2016-06-185-36/+330
| * SelfTests: Moved cCompositeChat test to a separate project.Mattes D2016-06-185-89/+180
| * SelfTests: Moved ByteBuffer test to a separate project.Mattes D2016-06-184-68/+129
| * SelfTests: Organized into solution folders.Mattes D2016-06-185-22/+40
| * Moved NetworkInterfaceEnum test to a separate test project.Mattes D2016-06-183-28/+59
|/
* Merge pull request #3224 from QUSpilPrgm/masterMattes D2016-06-166-9/+42
|\
| * - Add a activation flag to droppers and dispensers. Previously droppers and dispensers shot items with every block update.QUSpilPrgm2016-06-156-9/+42
|/
* Merge pull request #3227 from cuberite/NormalizeVectorApiMattes D2016-06-124-9/+82
|\
| * Normalized Vector3 API to use the same capitalization as all else.Mattes D2016-06-104-9/+82
|/
* Merge pull request #3225 from cuberite/FixAutoAPIMattes D2016-06-058-12/+180
|\
| * Bindings: Fixed cBoundingBox API.Mattes D2016-06-056-12/+164
| * Bindings: Add a const-ptr variant to all stack getter functionsMattes D2016-06-052-0/+16
|/
* Merge pull request #3219 from QUSpilPrgm/masterMattes D2016-06-0410-110/+335
|\
| * Makes tall grass and large flowers bonemealableQUSpilPrgm2016-06-036-12/+132
| * Update Dispensers and let them act more like in VanillaQUSpilPrgm2016-06-0310-106/+211
|/
* Debuggers: Added the forgotten Inject.lua file.Mattes D2016-06-021-0/+57
* Fixed fall damageTiger Wang2016-06-024-44/+17
* LuaState: Inter-plugin calls now support simple tables. (#3220)Mattes D2016-05-315-55/+204
* Merge pull request #3078 from cuberite/AddTerrainGenDocsMattes D2016-05-2942-175/+1150
|\
| * Docs: Added TOC and GrownBiomes to generator docs.Mattes D2016-05-2934-174/+308
| * Added GrownBiomeGenVisualiser.Mattes D2016-05-298-1/+842
|/
* Added GetTeamNames to cScoreboard (#3217)PlasmaPower2016-05-296-0/+64
* Fixed remaining issue from #3199 (#3207)Alexander Harkness2016-05-291-0/+2
* Don't let redstone blocks power adjacent blocks. (#3214)QUSpilPrgm2016-05-282-3/+2
* Made redstone handlers staticTiger Wang2016-05-282-31/+93
* Fixed wooden slabs only burning for 15 ticks. (#3212)Samantha Neubeck2016-05-241-1/+1
* Add JimSVMI83 to backers file.Alexander Harkness2016-05-211-0/+1
* Some 1.9 Crafting Recipes and Items. (#3199)Alexander Harkness2016-05-203-140/+224
* Added Utking to backers file.Alexander Harkness2016-05-161-0/+1
* Added "Chissled Stone Bricks" recipe (#3192)LogicParrot2016-05-151-0/+1
* Added needed information to Issue template (#3188)Julian Laubstein2016-05-151-0/+5
* 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)Pokechu222016-05-1435-101/+5374
* Fixed death on teleportation or leaving Minecart (#3181)LogicParrot2016-05-034-6/+32
* Fix crash on world travel (#3180)LogicParrot2016-05-031-1/+1
* Fix Crash on stopping the server (#3176)LogicParrot2016-05-013-2/+14
* Proper minecart DoSetSpeed Override (#3174)LogicParrot2016-04-301-1/+1
* Updated the Core submodule (#3172)LogicParrot2016-04-301-0/+0
* Disable Enderman Spawn (Issue #3108) (#3170)benf5162016-04-301-2/+2
* Merge pull request #3165 from LogicParrot/chunkLayer2LogicParrot2016-04-242-62/+61
|\
| * ChunkLayers now stored in std::mapLogicParrot2016-04-242-62/+61
|/
* Merge pull request #3164 from LogicParrot/clientHandle3LogicParrot2016-04-241-2/+3
|\
| * Fixed some logout crashesLogicParrot2016-04-241-2/+3
|/
* Merge pull request #3163 from cuberite/revert-3153-chunkLayerLogicParrot2016-04-242-54/+62
|\
| * Revert "ChunkLayers now stored in std::map"LogicParrot2016-04-242-54/+62
|/
* Merge pull request #3153 from LogicParrot/chunkLayerLogicParrot2016-04-242-62/+54
|\
| * ChunkLayers now stored in std::mapLogicParrot2016-04-232-62/+54
|/
* Merge pull request #3160 from LogicParrot/clientHandleThreadLogicParrot2016-04-231-2/+13
|\
| * ClientHandle destruction thread safetyLogicParrot2016-04-231-2/+13
|/
* Merge pull request #3090 from LogicParrot/outOfWorldLogicParrot2016-04-234-63/+33
|\
| * Out of world blocks are now always considered air blocksLogicParrot2016-04-234-63/+33
|/
* Updated readme to inform that clang 3.4 is minimum required version. (#3158)taylor242016-04-231-1/+1
* Merge pull request #3149 from LogicParrot/metaLogicParrot2016-04-2316-91/+54
|\
| * Reduced unnecessary block updatesLogicParrot2016-04-2216-91/+54
|/
* Merge pull request #3048 from Woazboat/minecartsLogicParrot2016-04-221-10/+56
|\
| * Fix minecart block collision on curved railsWoazboat2016-04-221-10/+56
|/
* Merge pull request #3156 from LogicParrot/hashFixLogicParrot2016-04-221-6/+4
|\
| * Updated vector hashing bit operationsLogicParrot2016-04-221-6/+4
|/
* Merge pull request #3150 from LogicParrot/worldTweaksLogicParrot2016-04-193-17/+16
|\
| * Auto clean bad world linkagesLogicParrot2016-04-193-17/+16
|/
* Proper fix for #3136 (#3143)Alexander Harkness2016-04-191-17/+11
* Merge pull request #3148 from LogicParrot/pathFinderFixLogicParrot2016-04-184-11/+21
|\
| * Fix issues below y = 0LogicParrot2016-04-184-11/+21
|/
* Merge pull request #3146 from LogicParrot/snowFixLogicParrot2016-04-161-2/+4
|\
| * Prevented snow from killing grassLogicParrot2016-04-161-2/+4
|/
* Merge pull request #3129 from LogicParrot/quietMetaLogicParrot2016-04-1610-26/+39
|\
| * Updated cChunk::SetMeta, fixed grass growth, reduced markDirty/setMeta usageLogicParrot2016-04-1610-26/+39
|/
* Merge pull request #3144 from cuberite/issue-templateJulian Laubstein2016-04-161-0/+7
|\
| * Create ISSUE_TEMPLATEJulian Laubstein2016-04-161-0/+7
|/
* Merge pull request #3037 from marvinkopf/minecartLogicParrot2016-04-152-41/+54
|\
| * Add speed limit enforcement for minecartsMarvin Kopf2016-04-152-41/+54
|/
* Merge pull request #3140 from cuberite/revert-3137-issue3136LogicParrot2016-04-143-14/+27
|\
| * Revert "Issue3136"LogicParrot2016-04-143-14/+27
|/
* Merge pull request #3139 from LogicParrot/freezeFixLogicParrot2016-04-132-39/+42
|\
| * Fix occasional freeze bugLogicParrot2016-04-132-39/+42
|/
* Merge pull request #3137 from cuberite/issue3136Alexander Harkness2016-04-133-27/+14
|\
| * Fixed port override code.Alexander Harkness2016-04-123-27/+14
|/
* Merge pull request #3133 from LogicParrot/readme10LogicParrot2016-04-071-2/+3
|\
| * Added more links to READMELogicParrot2016-04-071-2/+3
|/
* Merge pull request #3132 from LogicParrot/readmeAlexander Harkness2016-04-071-1/+7
|\
| * Rewrite README.md's contribution sectionLogicParrot2016-04-071-1/+7
|/
* Merge pull request #3128 from LogicParrot/typoAlexander Harkness2016-04-061-1/+1
|\
| * Readme typo fixLogicParrot2016-04-061-1/+1
|/
* Merge pull request #3126 from cuberite/revert-3100-mobTick2LogicParrot2016-04-062-40/+56
|\
| * Revert "Move mob tick code to cChunk"LogicParrot2016-04-062-40/+56
|/
* Merge pull request #3100 from LogicParrot/mobTick2LogicParrot2016-04-062-56/+40
|\
| * Move mob tick code to cChunkLogicParrot2016-04-062-56/+40
|/
* Merge pull request #3102 from LogicParrot/burnLogicParrot2016-04-061-7/+34
|\
| * Manual mob burn codeLogicParrot2016-04-061-7/+34
|/
* Merge pull request #3125 from LogicParrot/noFall3LogicParrot2016-04-062-5/+5
|\
| * Minor improvements to player freezeLogicParrot2016-04-052-5/+5
|/
* Merge pull request #3124 from LogicParrot/noFall2LogicParrot2016-04-058-76/+99
|\
| * Improved player freeze codeLogicParrot2016-04-058-76/+99
|/
* Merge pull request #3121 from LogicParrot/loopsLogicParrot2016-04-041-1/+1
|\
| * Prevent Nether teleportation loopsLogicParrot2016-04-041-1/+1
|/
* Merge pull request #3097 from LogicParrot/noFallLogicParrot2016-04-045-29/+138
|\
| * Players never fall through unloaded chunks or end up inside solids on teleportLogicParrot2016-03-315-29/+138
|/
* Merge pull request #3118 from LogicParrot/fixWorldLogicParrot2016-03-311-1/+1
|\
| * Fix adding players to worldLogicParrot2016-03-311-1/+1
|/
* Merge pull request #3116 from LogicParrot/bedFixLogicParrot2016-03-311-2/+4
|\
| * Player death crashfixLogicParrot2016-03-311-2/+4
|/
* Merge pull request #3105 from LogicParrot/chunkStabilityLogicParrot2016-03-313-32/+19
|\
| * Entities are never lostLogicParrot2016-03-303-32/+19
|/
* Merge pull request #3109 from LogicParrot/moveToNewWorldAlexander Harkness2016-03-303-6/+24
|\
| * MoveToWorld defaults to spawnpointLogicParrot2016-03-303-6/+24
|/
* Merge pull request #3091 from LogicParrot/bedLogicParrot2016-03-303-5/+48
|\
| * Bed's world is now savedLogicParrot2016-03-293-5/+48
|/
* Merge pull request #3096 from mathias-github/iconsJulian Laubstein2016-03-2910-4/+2
|\
| * Updated icons and logoMathias2016-03-2810-4/+2
|/
* Merge pull request #3099 from LogicParrot/passiveLogicParrot2016-03-281-0/+1
|\
| * Fix passive mob destruction crashesLogicParrot2016-03-281-0/+1
|/
* Merge pull request #3093 from mathias-github/patch-2Alexander Harkness2016-03-261-0/+1
|\
| * Added donator to listMathias2016-03-251-0/+1
|/
* Merge pull request #2994 from LogicParrot/mobTickLogicParrot2016-03-231-18/+41
|\
| * Rewrite mob tick codeLogicParrot2016-03-231-18/+41
|/
* Merge pull request #3086 from cuberite/revert-2872-LuaCallbackMattes D2016-03-2122-1314/+1951
|\
| * Revert "Lua callback"Mattes D2016-03-2122-1314/+1951
|/
* Merge pull request #3084 from cuberite/seadragon91-patch-1Mattes D2016-03-192-5/+5
|\
| * Fixed misuse of comma.Lukas Pioch2016-03-182-5/+5
|/
* Fixed leaping potion not giving jump boostBlitz Rakete2016-03-181-0/+1
* Merge pull request #2872 from cuberite/LuaCallbackMattes D2016-03-1722-1951/+1314
|\
| * Changed cLuaWindow callbacks to use cLuaState::cCallback.Mattes D2016-03-177-182/+242
| * Removed the cPluginLua::cResettable class.Mattes D2016-03-172-82/+1
| * Changed world tasks to use cLuaState::cCallback.Mattes D2016-03-172-69/+40
| * Changed plugin hook registrations to use cLuaState::cCallback.Mattes D2016-03-175-1008/+190
| * Removed cWebPlugin, WebAdmin uses cLuaState::cCallback.Mattes D2016-03-1714-630/+637
| * Added cLuaState::cCallback for representing (resettable) Lua callbacks.Mattes D2016-03-172-7/+231
|/
* Merge pull request #3081 from Arthur2e5/masterMattes D2016-03-171-44/+54
|\
| * Shallow clone to the correct branchMingye Wang (Arthur2e5)2016-03-161-1/+1
| * Sanity check (quoting, etc.) for compile.shMingye Wang (Arthur2e5)2016-03-161-18/+21
| * compile: some portability-related tweaksMingye Wang (Arthur2e5)2016-03-161-25/+32
|/
* Merge pull request #3079 from mathias-github/patch-1Alexander Harkness2016-03-141-1/+1
|\
| * Fixed melon block recipeMathias2016-03-141-1/+1
|/
* Merge pull request #3076 from cuberite/FixHttpAuthFlagJulian Laubstein2016-03-111-1/+2
|\
| * HTTP: Added missing HasAuth flag initialization.Mattes D2016-03-111-1/+2
|/
* Merge pull request #3069 from cuberite/FixHttpHeaderParsingMattes D2016-03-031-0/+1
|\
| * HTTP: Fixed header parsing.Mattes D2016-03-031-0/+1
|/
* Merge pull request #3068 from cuberite/FinishHttpResponseJulian Laubstein2016-03-031-0/+1
|\
| * WebAdmin: Finish HTTP responses.Mattes D2016-03-031-0/+1
|/
* Merge pull request #3060 from tonibm19/masterMattes D2016-03-011-1/+4
|\
| * fixed horse bugtonibm192016-03-011-1/+4
|/
* Merge pull request #3031 from cuberite/RenameHttpClassesMattes D2016-03-0141-902/+1973
|\
| * HTTP: Fixed typos and bad leftovers.Mattes D2016-03-013-3/+4
| * Renamed HTTPResponse to HTTPOutgoingResponse.Mattes D2016-03-016-14/+13
| * WebAdmin uses the new HTTP parser framework.Mattes D2016-03-0123-883/+912
| * HTTP: Fixed response parser, unified API.Mattes D2016-03-016-22/+35
| * Fixed HTTP parsing when in insecure mode.Mattes D2016-03-011-2/+6
| * Added unit test for parsing HTTP request.Mattes D2016-03-017-0/+230
| * Renamed HTTPServer folder to HTTP.Mattes D2016-03-0131-140/+407
| * Added HTTPResponseParser.Mattes D2016-03-016-0/+508
| * Moved cHTTPRequest to a separate file, renamed to cHTTPRequestParser.Mattes D2016-03-0113-325/+347
| * Renamed the HTTP classes to indicate they're for server.Mattes D2016-03-019-77/+75
|/
* Merge pull request #3057 from tonibm19/masterMattes D2016-03-011-0/+5
|\
| * Mobs no longer spawn at the top of the nether.tonibm192016-03-011-0/+5
* | Merge pull request #3040 from Woazboat/masterAlexander Harkness2016-02-271-0/+8
|\ \ | |/ |/|
| * Added more information about contributing to CuberiteWoazboat2016-02-261-0/+8
|/
* Merge pull request #3052 from cuberite/FixIntGensMattes D2016-02-244-23/+20
|\
| * Fixed LinearUpscale's bounds checking.Mattes D2016-02-241-4/+4
| * Made ProtIntGen's max size compile-time-configurable.Mattes D2016-02-241-1/+13
| * Removed old and wrong code from Globals.h.Mattes D2016-02-241-16/+1
| * Fixed includes in IntGen.Mattes D2016-02-241-2/+2
|/
* Merge pull request #3044 from LogicParrot/chunkRemoveLogicParrot2016-02-231-1/+1
|\
| * Fixed removing entities from parent chunksLogicParrot2016-02-221-1/+1
|/
* Merge pull request #2897 from cuberite/FlushLuaSslMattes D2016-02-211-2/+10
|\
| * LuaTCPLink: Report data received via SSL just before connection closed.Mattes D2016-02-211-2/+10
|/
* Merge pull request #3035 from marvinkopf/hotfix-parentchunkTiger Wang2016-02-211-2/+8
|\
| * Add check if entity is in chunk before changing tick statusMarvin Kopf2016-02-211-2/+8
|/
* Merge pull request #3032 from cuberite/3030-fixAlexander Harkness2016-02-201-9/+1
|\
| * Fix #3030Alexander Harkness2016-02-201-9/+1
|/
* Merge pull request #3026 from iam10K/masterworktycho2016-02-191-4/+12
|\
| * Stop Wolf from following player when he is flyingTyler Encke2016-02-191-4/+12
* | Merge pull request #3029 from mathias-github/masterAlexander Harkness2016-02-191-0/+1
|\ \
| * | Added BACKERS to list of files in Windows buildMathias2016-02-191-0/+1
* | | Merge pull request #3027 from LogicParrot/readmesJulian Laubstein2016-02-192-0/+30
|\ \ \ | |/ / |/| |
| * | Added testing instructionsLogicParrot2016-02-192-0/+30
|/ /
* | Merge pull request #2986 from LogicParrot/entityDestroy_approach4LogicParrot2016-02-1918-179/+266
|\ \
| * | Proper entity destruction in non-ticking chunksLogicParrot2016-02-1918-179/+266
|/ /
* | Merge pull request #3020 from cuberite/ice_blockJulian Laubstein2016-02-181-1/+5
|\|
| * Don't remove water after ice block has been destroyedLukas Pioch2016-02-181-1/+5
|/
* Merge pull request #3009 from marvinkopf/pushingLogicParrot2016-02-172-27/+11
|\
| * Fix minecart entity collisionMarvin Kopf2016-02-162-27/+11
|/
* Merge pull request #3010 from LogicParrot/stringFixLogicParrot2016-02-161-2/+2
|\
| * Fix unicode handling in StringUtils::TrimStringLogicParrot2016-02-161-2/+2
|/
* Merge pull request #2985 from marvinkopf/poweredrailTiger Wang2016-02-092-1/+10
|\
| * Update RedstoneSimulator to delete unused cached PowerDataMarvin Kopf2016-02-092-1/+10
* | Merge pull request #2996 from LogicParrot/message2LogicParrot2016-02-092-1/+2
|\ \
| * | Write to console when autofixing linkagesLogicParrot2016-02-091-0/+1
| * | Add forum link to linkage error messageLogicParrot2016-02-091-1/+1
|/ /
* | Merge pull request #2995 from LogicParrot/messageLogicParrot2016-02-081-2/+2
|\ \
| * | Improve world linkage error messageLogicParrot2016-02-081-2/+2
|/ /
* | Merge pull request #2989 from LogicParrot/blockBreakLogicParrot2016-02-081-0/+2
|\ \
| * | Prevent player from falling when block breaking is deniedLogicParrot2016-02-081-0/+2
* | | Merge pull request #2992 from LogicParrot/posixLogicParrot2016-02-081-1/+1
|\ \ \ | |/ / |/| |
| * | Remove nproc to allow BSD compilationLogicParrot2016-02-081-1/+1
|/ /
* | Merge pull request #2990 from LogicParrot/defaultWorldLogicParrot2016-02-081-1/+2
|\ \
| * | Add DefaultWorld to newly generated INILogicParrot2016-02-081-1/+2
* | | Merge pull request #2962 from LogicParrot/createAndInitializeLogicParrot2016-02-085-45/+14
|\ \ \ | |/ / |/| |
| * | remove cWorld::createAndInitializeWorldLogicParrot2016-02-085-45/+14
|/ /
* | Merge pull request #2961 from LogicParrot/enforceLogicParrot2016-02-083-3/+50
|\ \
| * | Prevent server from starting if there's bad world linkageLogicParrot2016-02-053-3/+50
* | | Merge pull request #2953 from LogicParrot/worldRebuildLogicParrot2016-02-082-3/+71
|\ \ \
| * | | Proper world linkages and dimension types for newly created world.ini'sLogicParrot2016-02-062-3/+71
* | | | Merge pull request #2969 from LogicParrot/iniLogicParrot2016-02-071-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Ignore trailing and leading spaces in INI values# Please enter the commit message for your changes. Lines startingLogicParrot2016-02-052-21/+21
| | |/ | |/|
* | | Merge pull request #2981 from Drahoslav7/masterTiger Wang2016-02-071-2/+3
|\ \ \
| * | | Fix Pickups of BlockFlowerDrahoslav Bednář2016-02-061-2/+3
* | | | Merge pull request #2978 from cuberite/checkerLogicParrot2016-02-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Style checker - Prevent whitespace-only linesLogicParrot2016-02-061-1/+1
|/ / /
* | | Merge pull request #2974 from LogicParrot/perlJulian Laubstein2016-02-06406-4497/+4497
|\ \ \
| * | | Bulk clearing of whitespaceLogicParrot2016-02-05406-4497/+4497
| | |/ | |/|
* | | Merge pull request #2958 from LogicParrot/fenceLogicParrot2016-02-061-11/+15
|\ \ \ | |/ / |/| |
| * | Pathfinder now properly treats nonsolids above fenceLogicParrot2016-02-041-11/+15
* | | Merge pull request #2972 from marvinkopf/PlayerAutoCompleteLogicParrot2016-02-051-1/+1
|\ \ \
| * | | Tab completion for player names now case insensitive.Marvin Kopf2016-02-051-1/+1
* | | | Merge pull request #2954 from kevinr/implement-acacia-block-heightLogicParrot2016-02-052-1/+13
|\ \ \ \ | |/ / / |/| | |
| * | | add self to CONTRIBUTORSKevin Riggle2016-02-041-0/+1
| * | | implement height logic for Acacia blocksKevin Riggle2016-02-041-1/+12
* | | | Correct typo in documentation.Alexander Harkness2016-02-051-1/+1
| |_|/ |/| |
* | | Merge pull request #2960 from LogicParrot/interspeciesJulian Laubstein2016-02-041-11/+25
|\ \ \
| * | | Prevent interspecies breedingLogicParrot2016-02-041-11/+25
| | |/ | |/|
* | | Merge pull request #2942 from mathias-github/masterJulian Laubstein2016-02-048-143/+14
|\ \ \
| * | | Minor updateMathias2016-02-028-143/+14
* | | | Merge pull request #2955 from LogicParrot/worldBackwardsLogicParrot2016-02-041-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix unexpected world creation introduced by #2821LogicParrot2016-02-041-1/+1
|/ / /
* | | Merge pull request #2939 from LogicParrot/m_TargetLogicParrot2016-02-0417-83/+294
|\ \ \ | |_|/ |/| |
| * | cMonster::m_Target safety across worldsLogicParrot2016-02-0317-83/+294
|/ /
* | Merge pull request #2941 from LogicParrot/chunkBug2LogicParrot2016-02-034-8/+57
|\ \ | |/ |/|
| * Fixed cChunk::m_Entities corruption upon world travelLogicParrot2016-02-024-8/+57
* | Merge pull request #2903 from marvinkopf/FixTabAutoCompleteLogicParrot2016-02-021-1/+21
|\ \
| * | Fix TabAutoCompleteMarvin Kopf2016-02-021-1/+21
| |/
* | Merge pull request #2908 from marvinkopf/FixMineCartSpeedLogicParrot2016-02-023-0/+22
|\ \ | |/ |/|
| * Fix cPawn pushingMarvin Kopf2016-02-023-0/+22
|/
* Merge pull request #2936 from mathias-github/masterJulian Laubstein2016-01-3119-35/+35
|\
| * Updated old forum linksMathias2016-01-3119-35/+35
|/
* Merge pull request #2913 from mathias-github/masterAlexander Harkness2016-01-307-7/+7
|\
| * MCServer to CuberiteMathias2016-01-297-7/+7
|/
* Merge pull request #2910 from LogicParrot/posixLogicParrot2016-01-291-1/+1
|\
| * compile.sh - posix-compatible program existence checkingLogicParrot2016-01-291-1/+1
|/
* Merge pull request #2909 from mathias-github/readmeJulian Laubstein2016-01-283-17/+12
|\
| * Front-end updateMathias2016-01-283-17/+12
|/
* Merge pull request #2907 from cuberite/LuaNoSslVerifyMattes D2016-01-242-4/+4
|\
| * LuaTcpSsl: Disabled cert verification due to missing CA chain.Mattes D2016-01-242-4/+4
|/
* Merge pull request #2899 from cuberite/FixHttpParsingMattes D2016-01-221-2/+6
|\
| * Fixed HTTP parsing when in insecure mode.Mattes D2016-01-221-2/+6
|/
* Merge pull request #2882 from LogicParrot/wolfSpread2LogicParrot2016-01-2213-83/+214
|\
| * Improved tamed wolf pack cooperation and projectile reactionsLogicParrot2016-01-2213-83/+214
|/
* Merge pull request #2894 from LogicParrot/spiderLogicParrot2016-01-2213-163/+221
|\
| * Spiders now friendly at daylight, new cChunk functionsLogicParrot2016-01-2113-163/+221
* | Merge pull request #2901 from birkett/servicefixJulian Laubstein2016-01-222-10/+6
|\ \
| * | Fix running as a service.Anthony Birkett2016-01-212-10/+6
|/ /
* | Merge pull request #2895 from LogicParrot/readmeLogicParrot2016-01-181-1/+1
|\ \ | |/ |/|
| * Readme update - compile.sh works for *nixLogicParrot2016-01-181-1/+1
|/
* Merge pull request #2884 from LogicParrot/sortLogicParrot2016-01-184-404/+404
|\
| * Alphabetically sorted configuration filesLogicParrot2016-01-174-404/+404
* | Merge pull request #2871 from cuberite/seadragon91-patch1worktycho2016-01-172-2/+2
|\ \
| * | Fixed race conditionsLukas Pioch2016-01-172-2/+2
|/ /
* | Merge pull request #2887 from LogicParrot/waterLogicParrot2016-01-171-1/+1
|\ \
| * | Use IsBlockWater in cPathLogicParrot2016-01-171-1/+1
| |/
* | Merge pull request #2885 from SteveWinfield/masterLogicParrot2016-01-173-3/+0
|\ \ | |/ |/|
| * No second spawn broadcast necessaryWinfieldSteve2016-01-173-3/+0
|/
* Merge pull request #2881 from LogicParrot/knockbackLogicParrot2016-01-171-0/+4
|\
| * Fixed wrong knockback direction after explosion damageLogicParrot2016-01-161-0/+4
* | Merge pull request #2883 from jammet/patch-8worktycho2016-01-171-0/+1
|\ \ | |/ |/|
| * Update crafting.txtjammet2016-01-171-0/+1
|/
* Merge pull request #2877 from LogicParrot/spawn2LogicParrot2016-01-162-183/+184
|\
| * Fixed non-natural spawning near player (egg, breeding, etc.)LogicParrot2016-01-162-183/+184
* | Merge pull request #2878 from LogicParrot/wolf2LogicParrot2016-01-167-61/+79
|\ \ | |/ |/|
| * Fix crash when tamed wolf is hit by arrowsLogicParrot2016-01-167-61/+79
|/
* Merge pull request #2875 from LogicParrot/fallDamageLogicParrot2016-01-161-1/+5
|\
| * Fix fall damage crash when tamed wolves neabryLogicParrot2016-01-161-1/+5
* | Merge pull request #2869 from LogicParrot/typosLogicParrot2016-01-131-35/+42
|\|
| * compile.sh - 70 columns print limitLogicParrot2016-01-131-35/+42
* | Merge pull request #2868 from bibo38/namelengthMattes D2016-01-132-0/+8
|\ \ | |/ |/|
| * Limited the username length to 16 characters.bibo382016-01-132-0/+8
* | Merge pull request #2867 from LogicParrot/compile2LogicParrot2016-01-131-0/+3
|\ \ | |/ |/|
| * compile.sh - added updating noteLogicParrot2016-01-131-0/+3
|/
* Merge pull request #2864 from LogicParrot/compileLogicParrot2016-01-121-26/+52
|\
| * Made compile.sh more genericLogicParrot2016-01-121-26/+52
|/
* Merge pull request #2863 from LogicParrot/spawnLogicParrot2016-01-121-54/+63
|\
| * Do not spawn mobs too close to playerLogicParrot2016-01-121-54/+63
|/
* Merge pull request #2862 from LogicParrot/creeperLogicParrot2016-01-121-2/+2
|\
| * Fixed creeper calling TargetIsInRange with null m_TargetLogicParrot2016-01-121-2/+2
* | Merge pull request #2861 from LogicParrot/hotfixMattes D2016-01-121-29/+31
|\ \ | |/ |/|
| * Fixed crash introduced by #2821LogicParrot2016-01-121-29/+31
|/
* Merge pull request #2859 from LogicParrot/attack2LogicParrot2016-01-127-24/+28
|\
| * Fix mob attack intervalLogicParrot2016-01-127-24/+28
* | Merge pull request #2860 from LogicParrot/wolfChecksLogicParrot2016-01-121-1/+14
|\ \ | |/ |/|
| * Friendly wolf attack safety checksLogicParrot2016-01-121-1/+14
|/
* Merge pull request #2857 from LogicParrot/wolfLogicParrot2016-01-1211-149/+292
|\
| * Tamed wolf assists owner (attack / defence)LogicParrot2016-01-1211-149/+292
* | Merge pull request #2853 from cuberite/DetailedBlockAreaLoggingMattes D2016-01-121-4/+12
|\ \
| * | Added detailed logging to cBlockArea::Read() bad Y coords.Mattes D2016-01-121-4/+12
|/ /
* | Merge pull request #2849 from cuberite/export_getseedMattes D2016-01-123-0/+5
|\ \
| * | Exported GetSeed to lua and added file extension opendb to .gitignore.Lukas Pioch2016-01-123-0/+5
|/ /
* | Merge pull request #2821 from LogicParrot/world2LogicParrot2016-01-122-3/+49
|\ \
| * | Fix pre - #2815 default world linkage configsSafwat Halaby2015-12-252-3/+49
* | | Merge pull request #2855 from bibo38/mobheadsworktycho2016-01-127-19/+130
|\ \ \ | |_|/ |/| |
| * | Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8bibo382016-01-117-19/+130
* | | Merge pull request #2848 from Nakkar/masterAlexander Harkness2016-01-111-3/+5
|\ \ \ | |/ / |/| |
| * | Fixed issue #2218Austin Martin2016-01-111-3/+5
|/ /
* | Added "core.help" permission to Default rank.Mattes D2016-01-101-0/+1
* | Merge pull request #2851 from bibo38/decompressfixMattes D2016-01-101-13/+18
|\ \
| * | Fixed not working packet decompressionbibo382016-01-101-13/+18
|/ /
* | Merge pull request #2847 from cuberite/FixClangWarningsworktycho2016-01-077-33/+50
|\ \
| * | Fixed Clang warnings.Mattes D2016-01-067-33/+50
|/ /
* | Merge pull request #2844 from mathias-github/silktouchMattes D2016-01-052-2/+29
|\ \
| * | Fixed typoMathias2016-01-031-1/+1
| * | More blocks that can't be mined with silktouchMathias2016-01-031-1/+28
|/ /
* | Merge pull request #2842 from ameuret/typo-ammountMattes D2016-01-032-4/+4
|\ \
| * | Fix typo (ammount)Arnaud Meuret2016-01-022-4/+4
|/ /
* | Merge pull request #2840 from cuberite/RenameToCuberiteJulian Laubstein2016-01-0254-257/+112
|\ \
| * | Updated plugins with the rename to Cuberite.Mattes D2016-01-013-0/+0
| * | Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-0151-257/+112
|/ /
* | Merge pull request #2838 from cuberite/clang-3.8-ignore-flagworktycho2015-12-301-0/+6
|\ \
| * | Clang-3.8: Added ignore flag for double promotionLukas Pioch2015-12-301-0/+6
|/ /
* | Merge pull request #2836 from cuberite/FixDefaultWorldGenParamsMattes D2015-12-301-1/+1
|\ \
| * | Fixed default Nether generator params.Mattes D2015-12-301-1/+1
|/ /
* | Merge pull request #2831 from cuberite/BlockingSslClientSocketFixMattes D2015-12-303-11/+24
|\ \
| * | Fixed problems in cBlockingSslClientSocket.Mattes D2015-12-303-11/+24
|/ /
* | Merge pull request #2837 from cuberite/FixMonsterBurnJulian Laubstein2015-12-301-3/+15
|\ \
| * | Fixed the monster burn code.Mattes D2015-12-301-3/+15
|/ /
* | Debuggers plugin: Added "uuid" console command.Mattes D2015-12-282-0/+37
* | Removed excessive logging in redstone simulator.Mattes D2015-12-281-7/+0
* | Merge pull request #2829 from LogicParrot/fences2Julian Laubstein2015-12-273-34/+13
|\ \
| * | Deleted cPath::BlockTypeIsFenceLogicParrot2015-12-273-34/+13
|/ /
* | Merge pull request #2825 from Gargaj/snowlayersAlexander Harkness2015-12-271-1/+1
|\ \
| * | fix crafting recipe for snow layersGargaj2015-12-261-1/+1
* | | Merge pull request #2828 from LogicParrot/contribLogicParrot2015-12-271-1/+1
|\ \ \
| * | | Update CONTRIBUTORSLogicParrot2015-12-271-1/+1
|/ / /
* | | Merge pull request #2814 from SafwatHalaby/chunk2Safwat Halaby2015-12-263-1/+116
|\ \ \
| * | | Freeze player until chunk is loadedSafwat Halaby2015-12-253-1/+116
| | |/ | |/|
* | | Merge pull request #2820 from cuberite/UrlParserworktycho2015-12-268-4/+515
|\ \ \
| * | | Added the cUrlParser class, exported to Lua API.Mattes D2015-12-258-4/+515
* | | | Merge pull request #2789 from cuberite/apidump-analyticsMattes D2015-12-268-57/+6780
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added analytics to APIDumpAlexander Harkness2015-12-268-57/+6780
|/ / /
* | | Added ProtoProxy and MCADefrag binaries to .gitignoreJulian Laubstein2015-12-261-0/+2
* | | Merge pull request #2822 from SafwatHalaby/fenceSafwat Halaby2015-12-251-2/+9
|\ \ \ | |/ / |/| |
| * | Update fences and gates listSafwat Halaby2015-12-251-2/+9
|/ /
* | Merge pull request #2795 from SafwatHalaby/doorsSafwat Halaby2015-12-2510-215/+396
|\ \ | |/ |/|
| * PF - "Special blocks" handlingSafwat Halaby2015-12-2414-219/+400
* | Merge pull request #2815 from SafwatHalaby/worldSafwat Halaby2015-12-252-4/+18
|\ \
| * | Nether and End in settings.ini by default, and created at startupSafwat Halaby2015-12-252-4/+18
|/ /
* | Merge pull request #2816 from SafwatHalaby/redstoneSafwat Halaby2015-12-2417-20/+20
|\ \
| * | Silenced the Redstone Simulator console spamSafwat Halaby2015-12-2417-20/+20
| |/
* | Merge pull request #2801 from cuberite/ExposeJsonMattes D2015-12-248-48/+500
|\ \ | |/ |/|
| * Added a Json parser and serializer to Lua API.Mattes D2015-12-248-48/+500
|/
* Merge pull request #2811 from cuberite/isblockfenceSafwat Halaby2015-12-241-0/+24
|\
| * Added IsBlockFence method to definesJulian Laubstein2015-12-241-0/+24
|/
* Merge pull request #2808 from cuberite/freebsd32fixworktycho2015-12-231-0/+1
|\
| * Fixed builds on FreeBSD 32bitJulian Laubstein2015-12-231-0/+1
|/
* Merge pull request #2807 from cuberite/UpdateLibEventworktycho2015-12-231-0/+0
|\
| * Updated LibEvent.Mattes D2015-12-231-0/+0
|/
* Merge pull request #2806 from SafwatHalaby/gargraj-chickenSafwat Halaby2015-12-231-0/+5
|\
| * Chicken egg code early bailoutSafwat Halaby2015-12-231-19/+21
| * Baby chickens don't lay eggsGargaj2015-12-231-16/+19
* | Fixed return value description in doxycomment.Mattes D2015-12-231-1/+1
* | Merge pull request #2802 from mathias-github/masterMattes D2015-12-233-42/+412
|\ \
| * | Added 1.7 item namesMathias2015-12-223-42/+412
|/ /
* | Merge pull request #2800 from cuberite/rconbuild-fixJulian Laubstein2015-12-224-83/+34
|\ \
| * | Removed offending tr1 references.Alexander Harkness2015-12-224-83/+34
| |/
* | Merge pull request #2790 from Gargaj/waterbottleSafwat Halaby2015-12-223-0/+98
|\ \ | |/ |/|
| * add handling of water bottleGargaj2015-12-223-0/+98
|/
* Merge pull request #2796 from cuberite/MojangCertAlexander Harkness2015-12-222-2/+25
|\
| * Added GeoTrust Root Certificateworktycho2015-12-221-1/+24
| * Ignore == if followed by \worktycho2015-12-221-1/+1
|/
* Merge pull request #2788 from SafwatHalaby/jumpSafwat Halaby2015-12-223-81/+151
|\
| * PF - Improved mob jumpingSafwat Halaby2015-12-213-81/+151
* | Merge pull request #2791 from then0rTh/masterSafwat Halaby2015-12-211-1/+1
|\ \ | |/ |/|
| * cTeam:GetName returning wrong namethen0rTh2015-12-211-1/+1
|/
* Merge pull request #2786 from SafwatHalaby/revertSafwat Halaby2015-12-214-103/+38
|\
| * Revert "Changed cPath to have a reset method".Safwat Halaby2015-12-214-103/+38
|/
* Merge pull request #2783 from cuberite/seadragon91-patch-spawnpoint-fixMattes D2015-12-201-3/+4
|\
| * Fixed spawn point. Wrong number for divisions and wrong highest spawn point.Lukas Pioch2015-12-201-3/+4
|/
* Merge pull request #2780 from cuberite/SpawnRaceLukas Pioch2015-12-202-2/+4
|\
| * Fix race conditiontycho2015-12-202-2/+4
|/
* Merge pull request #2779 from cuberite/seadragon91-patch-clang-3.7worktycho2015-12-195-7/+7
|\
| * Fixes for clang-3.7Lukas Pioch2015-12-195-7/+7
|/
* HTTPS NewsletterAlexander Harkness2015-12-191-1/+1
* Merge pull request #2542 from Haxi52/pinkstoneTiger Wang2015-12-1955-3122/+2337
|\
| * Reorganised the redstone simulatorTiger Wang2015-12-1855-3122/+2337
* | Merge pull request #2776 from cuberite/AtomicBoolIsthreadLukas Pioch2015-12-191-1/+2
|\ \
| * | Use atomic bool for isthread terminatetycho2015-12-191-1/+2
|/ /
* | Merge pull request #2778 from cuberite/httpschangesAlexander Harkness2015-12-1922-1785/+1742
|\ \
| * | Added HTTPS links wherever they are supported.Alexander Harkness2015-12-1922-1785/+1742
|/ /
* | Merge pull request #2774 from cuberite/worktycho-patch-1Lukas Pioch2015-12-181-1/+1
|\ \
| * | Fix off by two error in ReadStringworktycho2015-12-181-1/+1
|/ /
* | Merge pull request #2769 from cuberite/FastNBTAssertsAlexander Harkness2015-12-181-2/+6
|\ \
| * | Check for invalid tags when reading a compound tagtycho2015-12-181-2/+6
|/ /
* | Merge pull request #2759 from cuberite/ExplosionAPIMattes D2015-12-1811-144/+243
|\ \ | |/ |/|
| * Revised the explosion-related Lua API and docs.Mattes D2015-12-1811-144/+243
|/
* Merge pull request #2770 from cuberite/RemoveChunkDataCollectorMattes D2015-12-181-20/+0
|\
| * Removed unused class cChunkDataCollector.Mattes D2015-12-181-20/+0
|/
* Merge pull request #2758 from cuberite/FastNBTFixMattes D2015-12-181-5/+1
|\
| * Fixed String Parsing crash bugtycho2015-12-181-5/+1
|/
* Merge pull request #2755 from cuberite/coverageMattes D2015-12-183-0/+5
|\
| * Working coverage buildtycho2015-12-183-0/+5
|/
* Merge pull request #2751 from cuberite/PieceStructuresFixMattes D2015-12-172-5/+5
|\
| * PieceStructures generator: Fixed wrong merge conflict resolution.Mattes D2015-12-172-5/+5
|/
* Merge pull request #2761 from cuberite/fixed_warningsLukas Pioch2015-12-179-19/+10
|\
| * Moved variables into scope, removed unused variables and fixed variablesLukas Pioch2015-12-179-19/+10
|/
* Merge pull request #2753 from cuberite/pathFixSafwat Halaby2015-12-164-37/+109
|\
| * Changed cPath to have a reset method.tycho2015-12-164-38/+103
| * Delete copy and move constructors from cPathtycho2015-12-151-0/+7
* | Merge pull request #2754 from Gargaj/horsefixworktycho2015-12-153-2/+29
|\ \ | |/ |/|
| * allow horse control (still quite buggy)Gargaj2015-12-153-2/+29
|/
* Merge pull request #2750 from cuberite/wrngLukas Pioch2015-12-151-1/+1
|\
| * Fixed warning regarding an uninitialized valueJulian Laubstein2015-12-151-1/+1
|/
* Merge pull request #2749 from cuberite/wrngworktycho2015-12-151-1/+1
|\
| * Fixed warning regarding an uninitialized valueJulian Laubstein2015-12-151-1/+1
|/
* Merge pull request #2748 from cuberite/fix_memory_leakSafwat Halaby2015-12-152-9/+9
|\
| * Changed raw cPath to an unique_ptr, fixes memory leakLukas Pioch2015-12-152-9/+9
|/
* Merge pull request #2638 from Gargaj/masterworktycho2015-12-1416-128/+294
|\
| * blockheight mechanismGargaj2015-12-1316-128/+294
* | Merge pull request #2744 from cuberite/HopperMetaStripworktycho2015-12-131-0/+6
|\ \ | |/ |/|
| * Strip meta from hopper on converting to pickupJulian Laubstein2015-12-131-0/+6
|/
* Merge pull request #2743 from SafwatHalaby/wartSafwat Halaby2015-12-131-1/+5
|\
| * Set overgrown wart age to 3Safwat Halaby2015-12-131-1/+5
|/
* Merge pull request #2708 from Gargaj/onuseSafwat Halaby2015-12-1355-77/+120
|\
| * allow use failures to propagate from the entity/block to the playerGargaj2015-12-1355-77/+120
|/
* Merge pull request #2737 from Gargaj/snowgolemSafwat Halaby2015-12-131-5/+5
|\
| * snow golems are "neutral"Gargaj2015-12-131-5/+5
|/
* Merge pull request #2738 from Gargaj/mobinheritanceSafwat Halaby2015-12-134-1/+64
|\
| * sheep color inheritanceGargaj2015-12-134-1/+64
|/
* Merge pull request #2741 from SafwatHalaby/mTarget2Safwat Halaby2015-12-131-1/+0
|\
| * Remove stray "return"Safwat Halaby2015-12-131-1/+0
|/
* Merge pull request #2740 from SafwatHalaby/mTargetSafwat Halaby2015-12-132-11/+15
|\
| * Fixed mobs attacking Creative Mode playersSafwat Halaby2015-12-132-11/+15
|/
* Merge pull request #2668 from SafwatHalaby/decouple2Safwat Halaby2015-12-138-335/+486
|\
| * Decoupled cMonster and path recalc logic, re-implemented recalcSafwat Halaby2015-12-138-335/+486
|/
* Merge pull request #2739 from Gargaj/patch-6Safwat Halaby2015-12-131-0/+1
|\
| * Stop pathfinding over cobble wallsGargaj2015-12-131-0/+1
|/
* Merge pull request #2735 from SafwatHalaby/mathias2Safwat Halaby2015-12-121-15/+19
|\
| * Fixed a few crafting recipesMathias2015-12-121-15/+19
|/
* Merge pull request #2732 from Gargaj/patch-5Safwat Halaby2015-12-121-2/+2
|\
| * Nether wart only ages to 3Gargaj2015-12-121-2/+2
|/
* Merge pull request #2721 from bmintz/patch-1worktycho2015-12-111-0/+2
|\
| * Merge branch 'master' into patch-1Benjamin Mintz2015-12-110-0/+0
| |\ | |/ |/|
* | Merge pull request #2727 from Gargaj/patch-4Alexander Harkness2015-12-102-1/+2
|\ \
| * | Test for correct coordinates when fishingGargaj2015-12-102-1/+2
|/ /
| * Test for correct coordinates when fishingGargaj2015-12-112-1/+2
| * Put the entire compile.sh script in a code block for securityBenjamin Mintz2015-12-111-0/+2
|/
* Merge pull request #2720 from cuberite/OreNestsFixJulian Laubstein2015-12-091-2/+2
|\
| * Fixed opposite condition in OreNests finisher.Mattes D2015-12-091-2/+2
|/
* Merge pull request #2706 from Gargaj/deadcreeperMattes D2015-12-091-1/+1
|\
| * stop creepers from exploding even if they just diedGargaj2015-12-081-1/+1
|/
* Small spelling issues fixedJulian Laubstein2015-12-081-3/+3
* Merge pull request #2713 from Gargaj/patch-2Mattes D2015-12-061-1/+1
|\
| * Tilling dirt should send block updateGargaj2015-12-061-1/+1
|/
* Merge pull request #2714 from Gargaj/patch-3Safwat Halaby2015-12-061-5/+5
|\
| * Spawn chickens from eggs as babiesGargaj2015-12-051-5/+5
|/
* Merge pull request #2694 from SafwatHalaby/documentationworktycho2015-12-042-5/+34
|\
| * Update COMPILING.mdSafwat Halaby2015-12-032-5/+34
|/
* Merge pull request #2704 from Gargaj/patch-1Mattes D2015-12-031-2/+2
|\
| * fix wolf collarsGargaj2015-12-031-2/+2
|/
* Merge pull request #2707 from Gargaj/rabbitstewMattes D2015-12-034-56/+25
|\
| * Merge mushroom soup into generic food handlerGargaj2015-12-034-56/+25
* | Merge pull request #2711 from cuberite/FixFreeBSDBuildJulian Laubstein2015-12-031-8/+1
|\ \ | |/ |/|
| * Use C++11 auto instead of per-platform types.Mattes D2015-12-031-8/+1
|/
* Merge pull request #2699 from SafwatHalaby/breedDocsMattes D2015-12-032-5/+25
|\
| * Added documentation for breeding codeSafwat Halaby2015-11-302-5/+25
* | Merge pull request #2422 from cuberite/PieceStructuresGenMattes D2015-12-0358-12062/+18116
|\ \ | |/ |/|
| * Changed Nether defaults to use PieceStructures.Mattes D2015-12-011-1/+1
| * Added more details to the cubeset format documentation.Mattes D2015-12-012-6/+35
| * Added PieceStructures generator.Mattes D2015-12-0156-12057/+18082
|/
* Merge pull request #2696 from Gargaj/breedingSafwat Halaby2015-11-3011-19/+209
|\
| * implement breedingGargaj2015-11-2911-19/+209
|/
* Updated DumpInfo pluginNiLSPACE2015-11-291-2/+2
* Merge pull request #2693 from cuberite/NormalizeOrePocketConfigNamesMattes D2015-11-281-2/+2
|\
| * Normalized OrePockets generator config names.Mattes D2015-11-271-2/+2
|/
* Merge pull request #2670 from cuberite/OrePocketsJulian Laubstein2015-11-256-267/+649
|\
| * OrePockets finisher is now configurable.Mattes D2015-11-254-26/+127
| * Added OrePockets and DirtPockets finish gens.Mattes D2015-11-255-267/+548
|/
* Merge pull request #2687 from Gargaj/signfixworktycho2015-11-241-1/+6
|\
| * fix escaped characters in signs (fixes #1736, fixes #2170)Gargaj2015-11-241-1/+6
|/
* Merge pull request #2688 from bendl/masterAlexander Harkness2015-11-241-1/+1
|\
| * Fixed 'Install on DigitalOcean' link in README.mdBen Lancaster2015-11-241-1/+1
|/
* Merge pull request #2685 from dave-tucker/fxenumJulian Laubstein2015-11-2431-56/+124
|\
| * Add enum for Sound and Particle EffectsDave Tucker2015-11-2431-56/+124
|/
* Merge pull request #2645 from Gargaj/followedarrayworktycho2015-11-2311-12/+67
|\
| * change from single followable item to multipleGargaj2015-11-2311-12/+67
|/
* Fixed display of helpmessageJulian Laubstein2015-11-231-1/+1
* Changed static_cast to FloorCJulian Laubstein2015-11-231-1/+1
* Merge pull request #2683 from Gargaj/patch-1Alexander Harkness2015-11-231-0/+1
|\
| * add Golden CarrotGargaj2015-11-231-0/+1
|/
* Merge pull request #2680 from cuberite/vhENiLSPACE2015-11-233-11/+11
|\
| * Adjusted height validation using cChunkDef::IsValidHeight()Julian Laubstein2015-11-233-11/+11
|/
* Merge pull request #2678 from cuberite/lnJulian Laubstein2015-11-231-9/+9
|\
| * Added dash to helpstring outputJulian Laubstein2015-11-231-1/+1
| * Removed dashes in help messages for consistencyJulian Laubstein2015-11-231-8/+8
|/
* Merge pull request #2679 from cuberite/vhJulian Laubstein2015-11-231-1/+6
|\
| * Added cChunkDef::IsValidWidth()Julian Laubstein2015-11-231-1/+6
|/
* Merge pull request #2676 from SafwatHalaby/revertSafwat Halaby2015-11-221-1/+1
|\
| * Revert "Changed description to "Cuberite - Minecraft in C++!""Safwat Halaby2015-11-221-1/+1
|/
* Merge pull request #2673 from SafwatHalaby/shSafwat Halaby2015-11-212-33/+31
|\
| * compile.sh is now sh-compatible. (Unix, etc.)Safwat Halaby2015-11-212-33/+31
|/
* Merge pull request #2672 from SafwatHalaby/readmeSafwat Halaby2015-11-211-10/+18
|\
| * Readme update - organized the installation methodsSafwat Halaby2015-11-211-10/+18
|/
* Merge pull request #2671 from SafwatHalaby/compileMattes D2015-11-211-0/+11
|\
| * compile.sh - Automatically choose master branchSafwat Halaby2015-11-211-0/+11
|/
* Merge pull request #2660 from cuberite/worktycho-patch-2Alexander Harkness2015-11-201-0/+3
|\
| * Fix musl + clang 3.6 compile errorworktycho2015-11-191-0/+3
* | Merge pull request #2663 from SafwatHalaby/minorJulian Laubstein2015-11-201-1/+1
|\ \
| * | Changed description to "Cuberite - Minecraft in C++!"Safwat Halaby2015-11-201-1/+1
|/ /
* | Merge pull request #2661 from tboerger/musl-fixesworktycho2015-11-192-7/+11
|\ \ | |/ |/|
| * Include execinfo.h only on __GLIBC__Thomas Boerger2015-11-191-1/+3
| * Define stacktrace functions only if __GLIBC__ is definedThomas Boerger2015-11-191-5/+7
| * Check for __GLIBC__ to detect correct strerror_r versionThomas Boerger2015-11-191-1/+1
|/
* Merge pull request #2451 from cuberite/mobchartointworktycho2015-11-174-41/+92
|\
| * changed mob age from char to intJulian Laubstein2015-11-164-41/+92
|/
* Fixed some markdown.Alexander Harkness2015-11-151-2/+2
* Merge pull request #2648 from cuberite/getting-starAlexander Harkness2015-11-153-43/+65
|\
| * Edited contributors.Alexander Harkness2015-11-151-1/+2
| * Improved compiling file.Alexander Harkness2015-11-151-28/+51
| * Fixed typos, and improved contributing file.Alexander Harkness2015-11-151-14/+12
* | Merge pull request #2642 from SamOatesPlugins/masterworktycho2015-11-153-72/+175
|\ \ | |/ |/|
| * Improved spawn location calculations.samoatesgames2015-11-133-72/+175
* | Fixed typo in getting-started.Alexander Harkness2015-11-151-1/+1
* | Fix api docs link.Alexander Harkness2015-11-151-1/+1
* | Update getting started to new information.Alexander Harkness2015-11-151-24/+10
|/
* Merge pull request #2641 from cuberite/worktycho-patch-1Julian Laubstein2015-11-131-0/+4
|\
| * Blocks outside the world are never solidworktycho2015-11-131-0/+4
|/
* Merge pull request #2632 from Gargaj/patch-1worktycho2015-11-111-4/+14
|\
| * Avoid reading out of boundsGargaj2015-11-101-4/+14
|/
* Merge pull request #2634 from cuberite/vhworktycho2015-11-101-0/+6
|\
| * Added cChunkDef::IsValidHeight()Julian Laubstein2015-11-101-0/+6
|/
* Merge pull request #2631 from Gargaj/divby0worktycho2015-11-101-1/+1
|\
| * Avoid division by zeroGargaj2015-11-101-1/+1
|/
* Merge pull request #2633 from cuberite/IncludeBrewingRecipesJulian Laubstein2015-11-101-0/+1
|\
| * Added brewing.txt to list of files packed with the windows build.Mattes D2015-11-101-0/+1
|/
* Merge pull request #2630 from Gargaj/shallowwaterJulian Laubstein2015-11-101-3/+11
|\
| * fix shallow water + add future code for liquid fall dampeningGargaj2015-11-101-3/+11
|/
* Merge pull request #2629 from Gargaj/slabfixworktycho2015-11-091-3/+27
|\
| * remove slab from inventory when using it on another slab (fixes #2610)Gargaj2015-11-091-3/+27
|/
* Merge pull request #2628 from Gargaj/creeperdeflateAlexander Harkness2015-11-092-2/+2
|\
| * idle/deflating creeper should be -1Gargaj2015-11-092-2/+2
|/
* Merge pull request #2627 from Gargaj/patch-1Lukas Pioch2015-11-091-0/+4
|\
| * Add comment to Attack() return valuesGargaj2015-11-091-0/+4
|/
* Merge pull request #2625 from Gargaj/chilloutyoworktycho2015-11-093-1/+8
|\
| * neutral mobs shouldn't chase the player unless aggro'dGargaj2015-11-083-1/+8
|/
* Merge pull request #2626 from cuberite/worktycho-patch-1Julian Laubstein2015-11-081-1/+1
|\
| * Fix memory leakworktycho2015-11-081-1/+1
|/
* Merge pull request #2615 from Gargaj/cavespider-attackworktycho2015-11-0816-27/+48
|\
| * fix cavespider poisoning even if attack is in cooldownGargaj2015-11-0816-27/+48
* | Merge pull request #2616 from Gargaj/patch-1Julian Laubstein2015-11-081-0/+2
|\ \
| * | Fix chicken flyingGargaj2015-11-081-0/+2
|/ /
* | Merge pull request #2619 from cuberite/worktycho-patch-1Alexander Harkness2015-11-081-1/+4
|\ \
| * | Use .travis.yml to whitelist coverity_scan for push builds.worktycho2015-11-081-1/+4
|/ /
* | Merge pull request #2620 from Gargaj/pressureplatesndJulian Laubstein2015-11-081-0/+9
|\ \ | |/ |/|
| * add sound to stone pressure platesGargaj2015-11-081-0/+9
|/
* Merge pull request #2624 from Gargaj/patch-2worktycho2015-11-071-3/+6
|\
| * Only send creeper updates when there is a changeGargaj2015-11-071-3/+6
|/
* Merge pull request #2609 from bibo38/slimeblockworktycho2015-11-076-129/+238
|\
| * Refactored code to use vectors in the cPistonHandler classbibo382015-11-073-52/+42
| * Added some code improvementsbibo382015-11-072-22/+42
| * Renamed GetDirectionVec into VectorFromMetaData to improve code readability.bibo382015-11-072-6/+6
| * Commented the GetDirectionVec methodbibo382015-11-071-0/+3
| * Fixed the style problems and added some commentsbibo382015-11-072-6/+18
| * Removed unused CanPull methodbibo382015-11-071-11/+0
| * Extracted block moving code into a seperate methodbibo382015-11-072-77/+52
| * Replaced the usage of pistonMeta with a direction vector to allow better meta value abstractionbibo382015-11-072-73/+63
| * Fixed pulling/pushing of breakable blocks, which are not required to be movedbibo382015-11-071-3/+20
| * Implemented the basic slime block pullingbibo382015-11-071-17/+62
| * Implemented the SlimeBlock into the CanPush method to allow slimeblocks to work correctly when pushedbibo382015-11-071-15/+26
| * Piston extension now works with the new recursive CanPushBlock method.bibo382015-11-071-36/+41
| * Added the CanPushBlock method for the piston push check.bibo382015-11-072-24/+41
| * Implemented the slime block dropping behaviour.bibo382015-11-073-0/+35
* | Merge pull request #2621 from Gargaj/pressureplatepowerworktycho2015-11-071-4/+4
|\ \ | |/ |/|
| * Merge branch 'pressureplatepower' of github.com:Gargaj/cuberite into pressureplatepowerGargaj2015-11-070-0/+0
| |\
| | * fix pressure plate power levelsGargaj2015-11-071-4/+4
| * | fix pressure plate power levelsGargaj2015-11-071-4/+4
|/ /
* | Merge pull request #2618 from Gargaj/deadmeansdeadworktycho2015-11-071-1/+1
|\ \
| * | don't attack if deadGargaj2015-11-071-1/+1
* | | Merge pull request #2617 from Gargaj/pushcomestoshoveworktycho2015-11-071-0/+36
|\ \ \ | |/ / |/| |
| * | code styleGargaj2015-11-071-3/+3
| * | implement pushing/shoving based on @NiLSPACE's suggestionGargaj2015-11-071-0/+36
|/ /
* | Merge pull request #2611 from Gargaj/chickenfallJulian Laubstein2015-11-062-0/+6
|\ \ | |/ |/|
| * chickens don't take fall damageGargaj2015-11-062-0/+6
|/
* Added ignore=dirty to new submodulesJulian Laubstein2015-11-051-1/+8
* Merge pull request #2593 from cuberite/endereggJulian Laubstein2015-11-052-92/+103
|\
| * Destroy an ender crystal, damage a dragon when hit by an egg.Alexander Harkness2015-11-052-92/+103
* | Merge pull request #2607 from cuberite/IgnoreLibArtefactsMattes D2015-11-057-0/+0
|\ \
| * | Ignore MSVC build artefacts in submodularised libraries.Mattes D2015-11-057-0/+0
|/ /
* | Merge pull request #2606 from cuberite/MSVCWarningsMattes D2015-11-051-3/+1
|\ \
| * | MSVC: Reviewed warnings, disabled a useless one, re-enabled an old one.Mattes D2015-11-051-3/+1
|/ /
* | Merge pull request #2605 from cuberite/SubmoduleChangeJulian Laubstein2015-11-05194-212340/+51
|\ \
| * | Outsourced all libraries into submodulesJulian Laubstein2015-11-04194-212340/+51
* | | Merge pull request #2601 from Gargaj/patch-1Mattes D2015-11-041-1/+1
|\ \ \ | |/ / |/| |
| * | Fix being set on fire while directly being under lavaGargaj2015-11-041-1/+1
|/ /
* | Merge pull request #2597 from cuberite/faviconChangeAlexander Harkness2015-11-041-0/+0
|\ \
| * | Changed server favicon to more commonly used oneJulian Laubstein2015-11-031-0/+0
|/ /
* | Merge pull request #2497 from Seadragon91/brewingJulian Laubstein2015-11-0340-9/+1858
|\ \
| * | Implemented brewingLukas Pioch2015-11-0340-9/+1858
|/ /
* | Merge pull request #2595 from cengizIO/masterMattes D2015-11-031-9/+11
|\ \
| * | Use an unreserved qualifier for thread local storageCengiz Can2015-11-031-9/+11
|/ /
* | Merge pull request #2464 from bibo38/assertfixMattes D2015-11-031-20/+23
|\ \
| * | Fixed failed assertationbibo382015-11-031-20/+23
|/ /
* | Merge pull request #2591 from cuberite/chunkprepare-deadlockworktycho2015-11-031-1/+4
|\ \
| * \ Merge branch 'master' into chunkprepare-deadlockAlexander Harkness2015-11-021-1/+1
| |\ \
| * | | Fix deadlock, resolves #2521Alexander Harkness2015-11-021-1/+4
| | |/ | |/|
* | | Examined a fix for #2588Tiger Wang2015-11-021-0/+6
| |/ |/|
* | Merge pull request #2594 from cuberite/bearbin-patch-1Alexander Harkness2015-11-021-1/+1
|\ \ | |/ |/|
| * Fix shell location.Alexander Harkness2015-11-021-1/+1
|/
* Merge pull request #2587 from cuberite/bountysource-not-gratipayAlexander Harkness2015-11-011-2/+2
|\
| * Removed mentions of Gratipay, replaced with Bountysource.Alexander Harkness2015-11-011-2/+2
|/
* Merge pull request #2586 from bibo38/drownpotionworktycho2015-11-012-0/+16
|\
| * Implemented the Water Breathing Potion functionality.bibo382015-11-012-0/+16
|/
* Fixed typo that slipped through #2584Alexander Harkness2015-10-311-1/+1
* Fixed help text again, another part had changed.Alexander Harkness2015-10-311-1/+1
* Fixed outdated help text in easyinstall.Alexander Harkness2015-10-311-1/+1
* Fixed typo in description.Alexander Harkness2015-10-311-1/+1
* Merge pull request #2584 from bibo38/firepotionAlexander Harkness2015-10-316-8/+37
|\
| * Implemented the FireResistence potion effects.bibo382015-10-316-8/+37
|/
* Merge pull request #2549 from cuberite/TouchGroundAlexander Harkness2015-10-311-3/+3
|\
| * Debug mode: Fixed assertion, if player below y < 0Lukas Pioch2015-10-311-3/+3
|/
* Merge pull request #2581 from bibo38/clangfixLukas Pioch2015-10-301-1/+1
|\
| * Changed for-loop iterator in File.cpp to a reference type to reduce object copying and fix the clang build.bibo382015-10-301-1/+1
|/
* Merge pull request #2567 from cuberite/cave_spiderLukas Pioch2015-10-291-0/+11
|\
| * Added cave spider to MobSpawnerLukas Pioch2015-10-291-0/+11
|/
* Merge pull request #2578 from cuberite/revert-2574-pressure-plate-fixMattes D2015-10-291-45/+14
|\
| * Revert "Pressure plate fix"Mattes D2015-10-291-45/+14
|/
* Merge pull request #2574 from Schwertspize/pressure-plate-fixAlexander Harkness2015-10-281-14/+45
|\
| * fixed pressure plate bugsSchwertspize2015-10-281-14/+45
|/
* Merge pull request #2576 from Schwertspize/patch-1Alexander Harkness2015-10-281-2/+3
|\
| * Added myself to list, ran it through `sort -f`Schwertspize2015-10-281-2/+3
|/
* Merge pull request #2575 from Schwertspize/patch-1Alexander Harkness2015-10-281-1/+0
|\
| * remove contentless bullet pointSchwertspize2015-10-281-1/+0
|/
* Fix wrong teleport permission. (solves #2369)Alexander Harkness2015-10-281-4/+4
* Merge pull request #2566 from cuberite/update_submodulesMattes D2015-10-272-0/+0
|\
| * Updated Core and ProtectionAreasLukas Pioch2015-10-272-0/+0
|/
* Merge pull request #2564 from cuberite/update_jsoncpp_no_jsoncppMattes D2015-10-264-12/+12
|\
| * Update Loops required for JsonCPPLukas Pioch2015-10-264-12/+12
|/
* Debuggers: Added a plugin channel test with funny chars in data.Mattes D2015-10-212-0/+17
* Fixed a crash when sending messages too early after connection.Mattes D2015-10-211-1/+12
* Merge pull request #2517 from cuberite/ReTypingOfBlocksMattes D2015-10-151-7/+12
|\
| * ReTyped block idsJulian Laubstein2015-10-151-7/+12
|/
* Merge pull request #2544 from cuberite/worktycho-patch-1NiLSPACE2015-10-121-1/+0
|\
| * Removed unused typedefworktycho2015-10-121-1/+0
|/
* Merge pull request #2543 from Seadragon91/pluginmanager_hooksNiLSPACE2015-10-121-0/+3
|\
| * Added missing hooks to cPluginManagerLukas Pioch2015-10-121-0/+3
|/
* APIDump: Added a missing endline to the NewlyUndocumented output file.Mattes D2015-10-111-0/+1
* Merge pull request #2537 from cuberite/NetworkSslClientTestMattes D2015-10-112-0/+60
|\
| * Added 'net sclient' command to NetworkTest plugin.Mattes D2015-10-092-0/+60
|/
* Merge pull request #2535 from cuberite/FixGitQueriesworktycho2015-10-091-0/+3
|\
| * Added WORKING_DIRECTORY specification to git queries used in CMake.Mattes D2015-10-091-0/+3
|/
* Merge pull request #2534 from cuberite/FixHTTPSServerMattes D2015-10-081-0/+2
|\
| * Fixed a possible crash in HTTPS server.Mattes D2015-10-081-0/+2
|/
* Merge pull request #2532 from cuberite/CheckSpaceComparisonsMattes D2015-10-082-5/+13
|\
| * StyleCheck: Check spaces around ==, <=, >=Mattes D2015-10-082-5/+13
|/
* Merge pull request #2533 from cuberite/LuaTLSClientCertFixMattes D2015-10-081-12/+2
|\
| * Fixed bindings for cTCPLink:StartTLSClient().Mattes D2015-10-081-12/+2
|/
* Merge pull request #2528 from OdnetninI/masterTiger Wang2015-10-051-0/+1
|\
| * Spectator Mode doesn't fly[FIX]OdnetninI2015-10-051-0/+1
* | Merge pull request #2527 from cuberite/FixPrefabHitBoxMattes D2015-10-053-94/+100
|\ \ | |/ |/|
| * Updated PlainsVillage prefabs.Mattes D2015-10-051-94/+96
| * Generator: Fixed missing hitbox assignment.Mattes D2015-10-052-0/+4
|/
* Merge pull request #2525 from cuberite/StreamPerfMattes D2015-10-052-8/+8
|\
| * Improved the data structure for storing loaded chunkstycho2015-10-052-8/+8
|/
* Merge pull request #2522 from cuberite/FixLoaderGenRaceConditionworktycho2015-10-0410-65/+45
|\
| * Fixed a race condition between chunk loader and generator.Mattes D2015-10-0410-65/+45
|/
* Merge pull request #2519 from cuberite/RemoveStyleCheckFromTravisMattes D2015-10-022-6/+0
|\
| * Removed the BasicStyleCheck from Travis builds.Mattes D2015-10-022-6/+0
|/
* Merge pull request #2509 from cuberite/UTF16TypesMattes D2015-10-026-55/+17
|\
| * Improved types of utf 16 stringstycho2015-10-024-17/+17
| * Remove a pair of unused broken functionstycho2015-10-022-38/+0
|/
* Merge pull request #2511 from cuberite/BottomLayerSpawnworktycho2015-10-011-0/+6
|\
| * The bottom layer cannot hold a valid spawn pointworktycho2015-10-011-0/+6
|/
* Merge pull request #2518 from cuberite/UpdateSQLiteCppMattes D2015-10-011-0/+0
|\
| * Updated the SQLiteCpp library.Mattes D2015-10-011-0/+0
* | Merge pull request #2515 from Seadragon91/compiling_fileJulian Laubstein2015-10-011-36/+18
|\ \ | |/ |/|
| * Updated COMPILING.mdLukas Pioch2015-10-011-36/+18
|/
* Merge pull request #2512 from cuberite/AppveyorFixworktycho2015-09-291-1/+0
|\
| * Let appveyor decide what OS to useMattes D2015-09-291-1/+0
|/
* Merge pull request #2508 from cuberite/LogLuaMemoryStatsworktycho2015-09-293-0/+118
|\
| * Added LuaState tracker and memory stats logging.Mattes D2015-09-283-0/+118
|/
* Merge pull request #2507 from cuberite/LuaStrictStringsworktycho2015-09-281-1/+4
|\
| * Made Lua API check strings strictly.Mattes D2015-09-281-1/+4
|/
* Merge pull request #2498 from cuberite/UnicodeOnWindowsTiger Wang2015-09-284-12/+15
|\
| * Added the _UNICODE flag on WindowsTiger Wang2015-09-264-12/+15
* | Merge pull request #2504 from SafwatHalaby/revertTiger Wang2015-09-282-7/+53
|\ \
| * | Partial revert of #2446Safwat Halaby2015-09-282-7/+53
|/ /
* | Merge pull request #2505 from cuberite/SettableWeatherworktycho2015-09-282-4/+49
|\ \
| * | Added weather intervals to world.ini settings.Mattes D2015-09-282-4/+49
|/ /
* | Merge pull request #2502 from SafwatHalaby/seaMonstersSafwat Halaby2015-09-272-2/+2
|\ \
| * | Disabled squids and Guardians pathfinding, #2460Safwat Halaby2015-09-272-2/+2
|/ /
* | Merge pull request #2465 from electromatter/masterworktycho2015-09-271-0/+14
|\ \
| * \ Merge branch 'master' into masterelectromatter2015-09-2238-1006/+394
| |\ \
| * | | added bungeecord support for protocol18xEric Chai2015-09-061-0/+14
* | | | Merge pull request #2501 from cuberite/APIDumpCheckMattes D2015-09-274-11/+122
|\ \ \ \
| * | | | CI builds fail on newly undocumented API.Mattes D2015-09-271-2/+13
| * | | | APIDump: Added an apicheck command.Mattes D2015-09-273-9/+109
|/ / / /
* | | | Merge pull request #2500 from cuberite/FileApiExtendMattes D2015-09-278-108/+616
|\ \ \ \
| * | | | Extended and fixed the cFile API.Mattes D2015-09-268-108/+616
|/ / / /
* | | | Merge pull request #2496 from SafwatHalaby/compileCommitIdSafwat Halaby2015-09-261-3/+3
|\ \ \ \
| * | | | Fix compile.sh console commit version, see #2493Safwat Halaby2015-09-261-3/+3
|/ / / /
* | | | Merge pull request #2463 from cuberite/fixesTiger Wang2015-09-254-298/+55
|\ \ \ \ | |_|_|/ |/| | |
| * | | Prepared ScheduleTask for threading refactorTiger Wang2015-09-254-298/+55
|/ / /
* | | Merge pull request #2495 from Seadragon91/clang-3.7worktycho2015-09-258-20/+20
|\ \ \
| * | | Maked it compileable for clang-3.7Lukas Pioch2015-09-258-20/+20
|/ / /
* | | Merge pull request #2491 from cuberite/FixLilypadPopoutMattes D2015-09-251-0/+16
|\ \ \
| * | | Lilypads drop when not on source water.Mattes D2015-09-251-0/+16
|/ / /
* | | Merge pull request #2492 from SafwatHalaby/compileShSafwat Halaby2015-09-251-4/+8
|\ \ \
| * | | Compile.sh namechange to cuberiteSafwat Halaby2015-09-2522-42/+46
* | | | Merge pull request #2490 from cuberite/cuberiteMattes D2015-09-2521-38/+38
|\ \ \ \ | |/ / / |/| | |
| * | | Namechange to CuberiteMattes D2015-09-2521-38/+38
|/ / /
* | | Merge pull request #2478 from cuberite/FixArmBuildMattes D2015-09-251-9/+13
|\ \ \
| * | | Fixed flags for ARM native debug build.Mattes D2015-09-251-9/+13
|/ / /
* | | fixed casttycho2015-09-241-1/+1
* | | Add new "ForEach" function: ForEachLoadedChunk.tycho2015-09-246-1/+99
| |/ |/|
* | Merge pull request #2488 from cuberite/ChatFlagworktycho2015-09-218-227/+32
|\ \
| * | Refactored cProtocol Chat handlingtycho2015-09-218-227/+32
|/ /
* | Merge pull request #2487 from cuberite/sigpipeMattes D2015-09-191-0/+4
|\ \
| * | Ignore Sigpipetycho2015-09-191-0/+4
|/ /
* | Merge pull request #2486 from cuberite/clientPerformanceTiger Wang2015-09-192-4/+6
|\ \
| * | Fixed wrong assumtion regarding RemoveClienttycho2015-09-192-4/+6
|/ /
* | Merge pull request #2484 from cuberite/clientPerformanceworktycho2015-09-191-1/+1
|\ \
| * | Fixed erasetycho2015-09-191-1/+1
|/ /
* | Merge pull request #2479 from cuberite/clientPerformanceMattes D2015-09-192-82/+71
|\ \
| * | Removed a significant performance issue.tycho2015-09-182-82/+71
|/ /
* | Merge pull request #2480 from cuberite/CircleCiCheckBasicStyleworktycho2015-09-1711-523/+69
|\ \
| * | Added CircleCI for stylechecking.Mattes D2015-09-1711-523/+69
|/ /
* | Merge pull request #2457 from cuberite/logMattes D2015-09-1611-135/+175
|\ \
| * | Increase robustness of the logging subsystemtycho2015-09-1511-135/+175
|/ /
* | Merge pull request #2473 from cuberite/APIDumpRenameMattes D2015-09-142-6/+6
|\ \
| * | APIDump: Fixed ZBS integration filenames after project rename.Mattes D2015-09-142-6/+6
|/ /
* | Merge pull request #2474 from Erbelding/masterMattes D2015-09-141-1/+1
|\ \
| * | Fixed flint drop rates from 1/30 to 1/10 to match the wiki.David Erbelding2015-09-141-1/+1
|/ /
* | Fixed Lua output folders for Windows builds.Mattes D2015-09-083-32/+32
* | Added gallery web previews to ignore list.Mattes D2015-09-071-0/+2
|/
* Fixed pack-list for buildservers.Mattes D2015-09-062-13/+13
* Merge pull request #2437 from cuberite/outputChangeMattes D2015-09-06167-183/+71
|\
| * Renamed output directory to ServerMattes D2015-09-05167-183/+71
|/
* Merge pull request #2459 from cuberite/fixesTiger Wang2015-09-021-1/+0
|\
| * Fixes #2485Tiger Wang2015-09-021-1/+0
|/
* Merge pull request #2447 from mjhanninen/fix-freebsd-signal-includeTiger Wang2015-09-021-5/+7
|\
| * Include signal.h jointly for POSIX systemsMatti Hanninen2015-08-271-5/+7
|/
* Merge pull request #2446 from cuberite/asyncpathfinderTiger Wang2015-08-274-101/+25
|\
| * Fixed a position bug in the pathfinderTiger Wang2015-08-224-101/+25
* | Small fix for cEventTiger Wang2015-08-272-8/+13
* | Merge pull request #2450 from nicodinh/patch-1Mattes D2015-08-251-1/+1
|\ \
| * | Update cRankManager::SetRankVisualsAZARI Nicolas2015-08-251-1/+1
* | | Merge pull request #2449 from theoduino/masterTiger Wang2015-08-241-1/+1
|\ \ \ | |/ / |/| |
| * | Fix clang compile errorTheo Tosini2015-08-241-1/+1
|/ /
* | Merge pull request #2441 from mjhanninen/fix-osx-build-due-cc-flagTiger Wang2015-08-221-1/+0
|\ \
| * | Revert Clang compiler flag that breaks OS X buildMatti Hänninen2015-08-221-1/+0
|/ /
* / Removed unused functionTiger Wang2015-08-222-23/+0
|/
* Cast UINT to WORD to appease warningTiger Wang2015-08-221-6/+5
* Merge pull request #2427 from cuberite/fixesTiger Wang2015-08-227-197/+239
|\
| * Fixed and improved restartingTiger Wang2015-08-207-197/+239
* | Merge pull request #2443 from mjhanninen/fix-osx-build-due-warningsTiger Wang2015-08-221-1/+1
|\ \
| * | Namespace qualify std::abs, use explicit castMatti Hänninen2015-08-211-1/+1
|/ /
* | Merge pull request #2380 from cuberite/travisTiger Wang2015-08-206-15/+25
|\ \
| * | Use container-based infrastructure for TravisTiger Wang2015-08-206-15/+25
| |/
* | Merge pull request #2379 from cuberite/hungerTiger Wang2015-08-208-317/+162
|\ \ | |/ |/|
| * Fixed food drain bugsTiger Wang2015-08-208-317/+162
|/
* Merge pull request #2391 from SamJBarney/CropGrowthFixSamuel Barney2015-08-1911-30/+256
|\
| * * Logic for handling plant growth has been centralized into cBlockPlant, and all growable plants now inherit from it.Samuel Barney2015-08-1911-30/+256
|/
* Merge pull request #2439 from cuberite/AppveyorYmlMattes D2015-08-181-0/+14
|\
| * Added Appveyor yml settings file.Mattes D2015-08-181-0/+14
|/
* Merge pull request #2433 from cuberite/WarningFixTrialMattes D2015-08-189-39/+70
|\
| * Some warning fixesJulian Laubstein2015-08-189-39/+70
|/
* Merge pull request #2436 from cuberite/UpdateCompileScriptJulian Laubstein2015-08-161-19/+16
|\
| * Updated compile.shJulian Laubstein2015-08-161-19/+16
* | Merge pull request #2435 from artur9010/patch-3Julian Laubstein2015-08-161-1/+1
|\ \
| * | Update app.ymlArtur2015-08-151-1/+1
|/ /
* | Merge pull request #2430 from cuberite/APIDumpFixJulian Laubstein2015-08-141-0/+255
|\ \
| * | Readded plugin articleJulian Laubstein2015-08-141-0/+255
|/ /
* | Merge branch 'bearbot-testing'Tiger Wang2015-08-131-2/+2
* | Merge pull request #2426 from cuberite/APIDumpNameChangeFixJulian Laubstein2015-08-1312-275/+20
|\ \ | |/ |/|
| * Fixed a few missing MCServers in APIDumpJulian Laubstein2015-08-1312-275/+20
|/
* Merge pull request #2417 from mjhanninen/fix-clang-warningsJulian Laubstein2015-08-1218-145/+153
|\
| * Fix old style casts and implicit conversionsMatti Hänninen2015-08-1218-145/+153
|/
* Merge pull request #2425 from cuberite/APIDumpNameChangeMattes D2015-08-1234-209/+204
|\
| * Updated APIDump to follow the namechangeJulian Laubstein2015-08-1134-209/+204
|/
* Merge pull request #2423 from cuberite/JsonCppCheckMattes D2015-08-111-0/+3
|\
| * Added check for JsonCpp submodule presence.Mattes D2015-08-111-0/+3
|/
* Merge pull request #2424 from cuberite/CompileMSVC2015worktycho2015-08-103-6/+7
|\
| * Checked LeakFinder in MSVC2015, enabled support for it.Mattes D2015-08-102-6/+7
| * Fixed SQLiteCpp MSVC2015 compilation.Mattes D2015-08-101-0/+0
|/
* Merge pull request #2421 from cuberite/StackWalkerWarningIgnoreMattes D2015-08-101-0/+1
|\
| * MSVC: Ignore the deprecation warning in 3rd party StackWalker.Mattes D2015-08-091-0/+1
|/
* Merge pull request #2420 from cuberite/FlushLogJulian Laubstein2015-08-081-0/+7
|\
| * Flush log file when a warning or error message is output.Mattes D2015-08-081-0/+7
|/
* Refactored code to use cLuaStateSamuel Barney2015-08-072-34/+29
* Merge pull request #2415 from nichwall/masterTiger Wang2015-08-021-1/+6
|\
| * Fixed Iron DoorNicholas W2015-08-011-1/+6
|/
* Merge pull request #2412 from cuberite/UnifyCommentsJulian Laubstein2015-07-31114-850/+869
|\
| * Unified the doxy-comment format.Mattes D2015-07-31114-850/+869
|/
* Merge pull request #2400 from cuberite/OffloadBadChunksJulian Laubstein2015-07-314-82/+153
|\
| * Chunks that fail to load are offloaded to extra files.Mattes D2015-07-312-61/+107
| * Added reason parameter to load failures.Mattes D2015-07-311-13/+13
| * Moved AString reading hack to cFile.Mattes D2015-07-313-24/+49
|/
* Merge pull request #2371 from SamJBarney/WarningFixJulian Laubstein2015-07-29117-1119/+1103
|\
| * Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-29117-1119/+1103
|/
* Merge pull request #2376 from mjhanninen/fix-freebsd-buildMattes D2015-07-291-0/+1
|\
| * Fix FreeBSD build broken by strict compiler checkMatti Hänninen2015-07-201-0/+1
* | WebAdmin: Changed MCServer to CuberiteArtur2015-07-292-11/+11
* | Merge pull request #2388 from zackp30/armv7-cmakeMattes D2015-07-291-0/+4
|\ \
| * | Fix compilation on ARMv7.Fixes #2387.Zack Piper2015-07-241-0/+4
* | | Merge pull request #2394 from cuberite/FixCustomRecipesAlexander Harkness2015-07-261-0/+8
|\ \ \
| * | | Fixed custom recipes result clientside bug.Mattes D2015-07-261-0/+8
|/ / /
* | | Merge pull request #2393 from jammet/patch-8Mattes D2015-07-261-1/+1
|\ \ \ | |/ / |/| |
| * | Update crafting.txtjammet2015-07-261-1/+1
|/ /
* | Merge pull request #2383 from cuberite/GoogleTestFixJulian Laubstein2015-07-231-1/+4
|\ \
| * | Fixed cNetworkSingleton's HasTerminated flag.Mattes D2015-07-231-1/+4
|/ /
* | Merge pull request #2375 from jammet/patch-8Mattes D2015-07-231-2/+2
|\ \ | |/ |/|
| * Update crafting.txtjammet2015-07-191-2/+2
|/
* Merge pull request #2372 from jammet/patch-7Alexander Harkness2015-07-191-1/+1
|\
| * Update crafting.txtjammet2015-07-191-1/+1
|/
* Merge pull request #2362 from scribblemaniac/fix-redstoneTiger Wang2015-07-181-2/+4
|\
| * Fixed redstone issuescribblemaniac2015-07-171-2/+4
* | Merge pull request #2365 from bibo38/coreupdateTiger Wang2015-07-181-0/+0
|\ \
| * | Updated the Core submodule reference to the latest commit.bibo382015-07-171-0/+0
* | | Added documentation for GetLargeTreeAdjustmentSamuel Barney2015-07-171-0/+1
* | | Merge pull request #2295 from bibo38/rabbitcolorsJulian Laubstein2015-07-175-54/+109
|\ \ \ | |/ / |/| |
| * | Added Rabbit Metadata values.bibo382015-07-175-54/+109
|/ /
* | Merge pull request #2363 from scribblemaniac/improve-spider-aiTiger Wang2015-07-163-1/+44
|\ \
| * | Improved spider AIscribblemaniac2015-07-163-1/+44
| |/
* | Merge pull request #2364 from hallucino/ageable-mobsTiger Wang2015-07-1614-18/+28
|\ \
| * | Spawn baby mobshallucino2015-07-1614-18/+28
* | | Merge pull request #2360 from bibo38/waterfixJulian Laubstein2015-07-161-3/+6
|\ \ \ | |/ / |/| |
| * | Now Water sources will also be created on top of existing water sources.bibo382015-07-151-3/+6
* | | Merge pull request #2348 from bibo38/customnameTiger Wang2015-07-152-10/+27
|\ \ \
| * | | Added CustomName and Health to sended Metadata of Monsters.bibo382015-07-152-10/+27
| |/ /
* | | Merge pull request #2353 from SamJBarney/DyedArmorJulian Laubstein2015-07-1510-6/+420
|\ \ \ | |_|/ |/| |
| * | Leather Armor can now be dyed.Samuel Barney2015-07-1510-6/+420
* | | Merge pull request #2350 from SamJBarney/PeonySnowFixJulian Laubstein2015-07-151-1/+7
|\ \ \
| * | | Fixed tall grass trying to be placed in cold biomes.Samuel Barney2015-07-151-1/+7
* | | | Merge pull request #2349 from cuberite/mapsTiger Wang2015-07-15104-925/+933
|\ \ \ \
| * | | | Improved mapsTiger Wang2015-07-14104-925/+933
* | | | | Merge pull request #2036 from cuberite/sign-metamirrorAlexander Harkness2015-07-151-2/+2
|\ \ \ \ \
| * | | | | Fixed bad logic.Alexander Harkness2015-05-161-1/+1
| * | | | | Should Fix sign flipping.Alexander Harkness2015-05-161-2/+2
* | | | | | Merge pull request #2340 from hallucino/ageable-mobsNiLSPACE2015-07-155-28/+156
|\ \ \ \ \ \
| * | | | | | Support ageable mobsHallucino2015-07-145-28/+156
| | |_|_|_|/ | |/| | | |
* | | | | | Updated submodulesTiger Wang2015-07-154-0/+0
* | | | | | Merge pull request #2356 from LO1ZB/ImproveHungerJulian Laubstein2015-07-141-11/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix food drain on movement.LO1ZB2015-07-141-11/+10
* | | | | | Merge pull request #2352 from mmdk95/masterTiger Wang2015-07-141-0/+4
|\ \ \ \ \ \
| * | | | | | Fix duping doors (#1327)mmdk952015-07-141-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2346 from SamJBarney/TreeGrowthUpdateJulian Laubstein2015-07-144-14/+246
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Sapling Growth UpdateSamuel Barney2015-07-134-14/+246
| |/ / / /
* | | | | Merge pull request #2351 from SamJBarney/TorchStairFixworktycho2015-07-141-0/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Torches can now be placed on top of upside down stairs.Samuel Barney2015-07-141-0/+16
|/ / / /
* | | | Merge pull request #2347 from SamJBarney/ClampFixJulian Laubstein2015-07-141-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Switched from using std::max(std::min()) to using ClampSamuel Barney2015-07-131-2/+2
|/ / /
* | | Merge pull request #2344 from bibo38/make_ptrJulian Laubstein2015-07-134-73/+73
|\ \ \
| * | | Changing the shared_ptr/unique_ptr constructors to the make_shared/make_unique functionsbibo382015-07-124-73/+73
| |/ /
* | | Merge pull request #2339 from mmdk95/masterTiger Wang2015-07-121-2/+2
|\ \ \ | |/ / |/| |
| * | Fixed DropSpenser sound #2333mmdk952015-07-121-2/+2
|/ /
* | Merge pull request #2330 from cuberite/libraryupdateJulian Laubstein2015-07-1247-7017/+577
|\ \
| * | Added JsonCPP library location to search pathsTiger Wang2015-07-123-4/+13
| * | Updated and submodularised JsonCPPTiger Wang2015-07-1022-6527/+13
| * | Updated luaexpatTiger Wang2015-07-102-7/+31
| * | Updated expatTiger Wang2015-07-106-352/+296
| * | Updated zlibTiger Wang2015-07-1017-130/+227
* | | Merge pull request #2328 from SamJBarney/masterTiger Wang2015-07-107-88/+88
|\ \ \ | |/ / |/| |
| * | Fixed misplaced parensSamuel Barney2015-07-092-5/+5
| * | Fixes compilation failures on MacOSX 10.10Samuel Barney2015-07-097-88/+88
|/ /
* | Network: Fixed ServerHandle's address formatting.Mattes D2015-07-071-2/+2
* | (Ender) Chests are obstructed by opaque blocks.Nounours Heureux2015-07-072-15/+13
* | Fixed warnings generated by 64-bit MSVC.Mattes D2015-07-078-32/+32
* | Merge pull request #2319 from SamJBarney/masterJulian Laubstein2015-07-061-13/+85
|\ \
| * | Squashed Bonemeal Plant Growth UpdateSamuel Barney2015-07-061-13/+85
|/ /
* | Merge pull request #2224 from cuberite/ChunkQueueCollapsingworktycho2015-07-0416-330/+251
|\ \
| * | Fixed minor errors in Tycho's codeTiger Wang2015-06-227-92/+83
| * | Reinstate "Chunk queue collapsing"Tiger Wang2015-06-1012-261/+191
* | | Merge pull request #2312 from SamJBarney/masterworktycho2015-07-032-7/+10
|\ \ \
| * | | Moved grabbing the light value to after the transparency check.Samuel Barney2015-07-031-3/+4
| * | | Added missing parensSamuel Barney2015-07-031-1/+1
| * | | Grass now only dies if it has an opaque block above it.Samuel Barney2015-07-031-4/+7
| * | | Farmland is now listed as an opaque block.Samuel Barney2015-07-031-2/+1
|/ / /
* | | Merge pull request #2306 from cuberite/FixNeighborChangedLoopworktycho2015-07-017-46/+65
|\ \ \
| * | | Added neighbor specification in the OnNeighborChanged() block callback.Mattes D2015-07-017-46/+65
|/ / /
* | | APIDump: Fixed a forgotten comma.Mattes D2015-06-301-1/+1
* | | Added the Prefabs folder to the files packed by build.Mattes D2015-06-301-0/+1
* | | Merge pull request #2303 from cuberite/RemoveObsoleteScriptworktycho2015-06-303-97/+1
|\ \ \
| * | | Removed the MakeLuaAPI script.Mattes D2015-06-303-97/+1
* | | | Merge pull request #2304 from cuberite/FixBlockAreaHeightworktycho2015-06-302-2/+8
|\ \ \ \ | |/ / / |/| | |
| * | | BlockArea: Fixed a crash with areas higher than chunk height.Mattes D2015-06-302-2/+8
|/ / /
* | | Fixed typos in the readme.Mattes D2015-06-301-1/+1
* | | Merge pull request #2239 from cuberite/PortalSizeMattes D2015-06-285-0/+56
|\ \ \
| * | | Added a size check for portals.STRWarrior2015-06-285-0/+56
|/ / /
* | | use atomic for state, to avoid torn readstycho2015-06-271-2/+2
* | | Merge pull request #2294 from bibo38/horsefixworktycho2015-06-261-3/+3
|\ \ \
| * | | Now Horses spawn with correct data values.bibo382015-06-261-3/+3
|/ / /
* | | Merge pull request #2241 from lkolbly/masterworktycho2015-06-266-21/+40
|\ \ \
| * | | Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld.Lane Kolbly2015-06-136-21/+40
* | | | Merge pull request #2282 from Haxi52/button-fixesworktycho2015-06-255-10/+58
|\ \ \ \
| * | | | Buttons no longer click on when already on. Buttons now play sound when clicking off.Hax522015-06-245-10/+58
* | | | | Merge pull request #2290 from bibo38/mousefixMattes D2015-06-252-2/+2
|\ \ \ \ \
| * | | | | Fixed Middle-Click Button in the ClickWindow-Packet.bibo382015-06-252-2/+2
* | | | | | Merge pull request #2291 from bibo38/doorfixworktycho2015-06-251-1/+0
|\ \ \ \ \ \
| * | | | | | Doors now get placed on the server-side.bibo382015-06-251-1/+0
|/ / / / / /
* | | | | | Merge pull request #2288 from cuberite/melonFixMattes D2015-06-241-0/+3
|\ \ \ \ \ \
| * | | | | | Call Neighbour changed handlers when a melon is createdtycho2015-06-231-0/+3
* | | | | | | Merge pull request #2289 from cuberite/HangingFixworktycho2015-06-241-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Added a forgotten break in cHangingEntity constructor.Mattes D2015-06-241-0/+1
|/ / / / / /
* | | | | | Merge pull request #2284 from cuberite/FixBiomeGenworktycho2015-06-232-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Generate biomes when pregenerating heights through CompositedHeiGen.Mattes D2015-06-232-3/+6
* | | | | | Merge pull request #2285 from cuberite/MelonFixworktycho2015-06-232-7/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed melon metadata when growing from stem.Mattes D2015-06-231-6/+9
| * | | | | Fixed right-click with bonemeal.Mattes D2015-06-231-1/+1
|/ / / / /
* | | | | Merge pull request #2280 from SamJBarney/masterworktycho2015-06-229-64/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rebased version of CodeSamuel Barney2015-06-229-64/+17
|/ / / /
* | | | Merge pull request #2274 from cuberite/ItemsRemovalFixMattes D2015-06-217-85/+156
|\ \ \ \
| * | | | Refactored block placement workflow.Mattes D2015-06-217-85/+156
|/ / / /
* | | | Merge pull request #2267 from cuberite/InfoDumpFixMattes D2015-06-211-2/+2
|\ \ \ \
| * | | | Fixed InfoDump.lua when there are no commands in plugin.Mattes D2015-06-201-2/+2
* | | | | Merge pull request #2269 from cuberite/CustomVillagesworktycho2015-06-2124-17244/+18032
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added basic support for loading village prefabs from files.Mattes D2015-06-2024-17244/+18032
|/ / / /
* | | | Merge pull request #2255 from cuberite/LoadablePiecesworktycho2015-06-1925-76/+1785
|\ \ \ \
| * | | | Added cubeset file format docs.Mattes D2015-06-192-0/+308
| * | | | Externalized cPrefabPiecePool self-test.Mattes D2015-06-1918-57/+708
| * | | | PrefabPiecePool: Added loading from cubeset file.Mattes D2015-06-184-3/+589
| * | | | LuaState: Added support for config-style usage.Mattes D2015-06-173-43/+207
* | | | | Check the return value of InflateStringTiger Wang2015-06-181-2/+1
|/ / / /
* | | | Fixes #2245Tiger Wang2015-06-171-1/+1
* | | | Merge pull request #2253 from jammet/patch-7Alexander Harkness2015-06-161-0/+2
|\ \ \ \
| * | | | Update crafting.txtjammet2015-06-161-0/+2
|/ / / /
* | | | Merge pull request #2252 from jammet/patch-7Alexander Harkness2015-06-161-0/+1
|\ \ \ \
| * | | | Update crafting.txtjammet2015-06-161-0/+1
|/ / / /
* | | | Merge pull request #2249 from cuberite/old-chunk-serializerMattes D2015-06-162-62/+0
|\ \ \ \
| * | | | Removed version 29 serilizationtycho2015-06-162-62/+0
* | | | | Merge pull request #2248 from cuberite/clang3.6Alexander Harkness2015-06-151-1/+1
|\| | | |
| * | | | Fixed overridetycho2015-06-151-1/+1
|/ / / /
* | | | Merge pull request #2244 from martindev2/#2092-TNT-FireTiger Wang2015-06-141-0/+5
|\ \ \ \
| * | | | implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on topMartin McArthur2015-06-141-0/+5
* | | | | Fixed tigers format stringworktycho2015-06-141-2/+2
|/ / / /
* / / / Fixed log files' timestampsTiger Wang2015-06-143-12/+12
|/ / /
* | | Merge pull request #2237 from lkolbly/masterworktycho2015-06-131-1/+1
|\ \ \
| * | | Fixed typo in BlockDoor.hLane Kolbly2015-06-131-1/+1
* | | | Merge pull request #2240 from cuberite/UpdatedPrefabsNiLSPACE2015-06-136-488/+465
|\ \ \ \
| * | | | Updated prefabs from the Gallery server.Mattes D2015-06-136-488/+465
* | | | | Merge pull request #2193 from nounoursheureux/masterAlexander Harkness2015-06-139-11/+96
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added documentation for HOOK_KILLEDNounours Heureux2015-06-132-1/+23
| * | | | Added HOOK_KILLEDNounours Heureux2015-06-139-12/+75
|/ / / /
* / / / NetherPortalScanner: Fixed type conversion warnings.Mattes D2015-06-131-2/+2
|/ / /
* | | If defined, not just if.Alexander Harkness2015-06-121-1/+1
* | | Fixed build error on LinuxAlexander Harkness2015-06-121-1/+1
* | | Merge pull request #2231 from cuberite/SelfTestRegisteringAlexander Harkness2015-06-1211-33/+198
|\ \ \
| * | | SelfTests are registered and executed after logging framework init.Mattes D2015-06-1111-33/+198
| |/ /
* | | Update gratipayAlexander Harkness2015-06-111-2/+2
* | | Merge pull request #2229 from cuberite/readme-namechangeAlexander Harkness2015-06-114-27/+27
|\ \ \
| * | | Update GETTING-STARTED.mdAlexander Harkness2015-06-111-8/+8
| * | | Update CONTRIBUTORSAlexander Harkness2015-06-111-2/+2
| * | | Update LICENSEAlexander Harkness2015-06-111-3/+3
| * | | Name change updates.Alexander Harkness2015-06-111-14/+14
|/ / /
* | | Update README.mdAlexander Harkness2015-06-111-1/+1
* | | More name change.Alexander Harkness2015-06-111-2/+2
* | | More name changes.Alexander Harkness2015-06-111-1/+1
|/ /
* | Merge pull request #2162 from lkolbly/masterMattes D2015-06-109-20/+432
|\ \
| * | Implemented nether portal scanning code.Lane Kolbly2015-06-109-20/+432
* | | Update build download links.Alexander Harkness2015-06-091-3/+3
* | | Merge pull request #2144 from mc-server/comparatorsAlexander Harkness2015-06-0910-662/+806
|\ \ \ | |/ / |/| |
| * | Added moar commentsTiger Wang2015-06-072-13/+13
| * | Vector hasher is now a separate classTiger Wang2015-06-073-12/+30
| * | Use emplace to construct structuresTiger Wang2015-06-062-54/+61
| * | Improved link unpowering speedTiger Wang2015-06-061-48/+41
| * | Changed appropriate containers to unordered_mapTiger Wang2015-06-065-203/+92
| * | Improved link power behaviourTiger Wang2015-06-062-163/+119
| * | Improved wires and repeatersTiger Wang2015-06-062-73/+152
| * | Fixed wire consuming much resourcesTiger Wang2015-06-061-7/+17
| * | Redstone wire and trapdoor fixesTiger Wang2015-06-064-311/+323
| * | Provides improvements to redstone wireTiger Wang2015-06-062-94/+70
| * | ComparatorsTiger Wang2015-06-067-83/+287
* | | Merge pull request #2221 from mc-server/AreaCountBlocksJulian Laubstein2015-06-083-0/+73
|\ \ \
| * | | cBlockArea: Added CountSpecificBlocks() API function.Mattes D2015-06-083-0/+73
|/ / /
* | | Merge pull request #2212 from mc-server/revert-2179-ChunkQueueCollapsingAlexander Harkness2015-06-0712-191/+261
|\ \ \
| * | | Revert "Chunk queue collapsing"worktycho2015-06-0712-191/+261
|/ / /
* | | Merge pull request #2210 from nounoursheureux/bucket-craftAlexander Harkness2015-06-071-1/+8
|\ \ \
| * | | Fixed styleNounours Heureux2015-06-071-1/+1
| * | | Cake crafting now give back the bucketNounours Heureux2015-06-071-1/+8
* | | | Merge pull request #2211 from jan64/masterAlexander Harkness2015-06-071-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix incorrent experience sending for 1.7 clientsjan642015-06-071-2/+2
* | | | Merge pull request #2153 from mc-server/gcc5Alexander Harkness2015-06-062-0/+1
|\ \ \ \
| * | | | Disable column metadatatycho2015-06-061-0/+1
| * | | | Update SQLitetycho2015-05-281-0/+0
* | | | | Merge pull request #2179 from mc-server/ChunkQueueCollapsingTiger Wang2015-06-0612-261/+191
|\ \ \ \ \
| * | | | | Fix iteratingtycho2015-06-051-3/+1
| * | | | | Made the list of chunks to stream an unordered_settycho2015-06-054-25/+22
| * | | | | Rewrote ChunkSending queue for significantly improved performancetycho2015-06-055-189/+102
| * | | | | Moved Chunk Broadcasts over to the regular queuetycho2015-06-058-116/+138
* | | | | | Merge pull request #2205 from birkett/masterworktycho2015-06-057-17/+58
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Daemon support on Linux.Anthony Birkett2015-06-057-17/+58
* | | | | | Merge pull request #2206 from mc-server/APIDumpTimeStampworktycho2015-06-056-18/+119
|\ \ \ \ \ \
| * | | | | | CMake: Added buildinfo workaround for src packs / systems without git.Mattes D2015-06-051-0/+7
| * | | | | | Added Build info to the cRoot API.Mattes D2015-06-053-8/+65
| * | | | | | Provide some BuildInfo even for non-CI builds.Mattes D2015-06-052-2/+26
| * | | | | | APIDump: Added timestamp to all generated HTML pages.Mattes D2015-06-042-9/+22
* | | | | | | Merge pull request #2207 from mc-server/LineBlockTracerFixAlexander Harkness2015-06-051-6/+13
|\ \ \ \ \ \ \
| * | | | | | | Fixed overshoot in cLineBlockTracer.Mattes D2015-06-051-6/+13
|/ / / / / / /
* | | | | | | Merge pull request #2069 from HaoTNN/masterMattes D2015-06-054-15/+41
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'HaoTNN2015-06-0315-108/+362
| |\ \ \ \ \ \ \
| * | | | | | | | Fixes multiple furnace issues, including from loading world storageHaoTNN2015-06-034-16/+41
| * | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerHaoTNN2015-06-03235-1353/+2504
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'HaoTNN2015-05-2343-135/+229
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'HaoTNN2015-05-1939-137/+1209
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes lit furnace issue in #2051haotnn2015-05-191-0/+1
* | | | | | | | | | | | Debuggers: Added a LineBlockTracer console test command.Mattes D2015-06-042-0/+117
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #2203 from jan64/masterworktycho2015-06-043-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Added SendSystemMessage / SendAboveActionBarMessage to the docsjan642015-06-032-0/+3
| * | | | | | | | | | Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clientsjan642015-06-031-1/+11
* | | | | | | | | | | Merge pull request #2188 from cengizIO/masterworktycho2015-06-048-135/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Skip unknown cflag for Apple clang & remove cSemaphoreCengiz Can2015-06-048-135/+12
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2202 from mc-server/CmakeCleanupMattes D2015-06-031-1/+15
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | CMake: Removed unused legacy LibEvent target.Mattes D2015-06-031-1/+1
| * | | | | | | | | CMake: Put projects into solution folders in MSVC.Mattes D2015-06-031-0/+14
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2199 from jan64/masterMattes D2015-06-0312-12/+283
|\| | | | | | | |
| * | | | | | | | Added system and above action bar chat messagesjan642015-06-0212-12/+283
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #2190 from mc-server/CrashDumpArgsMattes D2015-06-033-96/+79
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Added cmdline params for crashdump detailness.Mattes D2015-06-023-96/+79
|/ / / / / / /
* | | | | | | Merge pull request #2182 from birkett/masterMattes D2015-06-023-11/+11
|\ \ \ \ \ \ \
| * | | | | | | Use the new style command line parameters for Windows Service support.Anthony Birkett2015-06-013-11/+11
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #2189 from mc-server/MSVCWarningFixesMattes D2015-06-0213-4/+92
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed warnings in MSVC.Mattes D2015-06-0213-4/+92
|/ / / / / /
* | | | | | Merge pull request #2172 from mc-server/LightingCallbacksMattes D2015-06-0111-53/+61
|\ \ \ \ \ \
| * | | | | | Made cLightingThread own its callbackstycho2015-05-3011-53/+61
* | | | | | | Merge pull request #2178 from jammet/patch-7Alexander Harkness2015-06-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update crafting.txtjammet2015-05-311-6/+1
| * | | | | | | Fix Daylightsensor recipejammet2015-05-311-1/+6
* | | | | | | | Merge pull request #2180 from mc-server/CraftingFixMattes D2015-05-311-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed crafting recipe matching.Mattes D2015-05-311-0/+3
|/ / / / / / / /
* / / / / / / / ManualBindings: Fixed DoWithXYZ and ForEachInChunk signatures.Mattes D2015-05-311-4/+6
|/ / / / / / /
* | | | | | | Merge pull request #2173 from mc-server/CleanCmakeAlexander Harkness2015-05-301-8/+2
|\ \ \ \ \ \ \
| * | | | | | | Moved shared cmake flags to the CMAKE_C_FLAGS vartycho2015-05-301-8/+2
* | | | | | | | Merge branch 'master' of github.com:mc-server/MCServertycho2015-05-302-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Updated MagicCarpet submodule. Fixes #2155Alexander Harkness2015-05-301-0/+0
| * | | | | | | Fixed wrong indent.Alexander Harkness2015-05-301-1/+1
* | | | | | | | Fixed minor cast warningtycho2015-05-301-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #2171 from SafwatHalaby/fenceAlexander Harkness2015-05-301-1/+7
|\ \ \ \ \ \ \
| * | | | | | | PF - Handle all fencetypesSafwatHalaby2015-05-301-1/+7
* | | | | | | | Merge pull request #2163 from mc-server/SimplifySpawnworktycho2015-05-304-136/+156
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Clean up Spawn Preparetycho2015-05-304-136/+156
* | | | | | | | Merge pull request #2169 from linnemannr/masterworktycho2015-05-304-2/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix FreeBSD/clang errors caused by -Werrorlinnemannr2015-05-304-2/+20
* | | | | | | | | Merge pull request #2167 from SafwatHalaby/diagsworktycho2015-05-301-5/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | PF - Fixed diagonal cuttingSafwatHalaby2015-05-301-5/+12
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2166 from SafwatHalaby/squidSafwat Halaby2015-05-302-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Disabled squid and Guardian PathfindingSafwatHalaby2015-05-302-2/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #2165 from SafwatHalaby/creeperAlexander Harkness2015-05-301-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fixed creeper explosionsSafwatHalaby2015-05-301-1/+1
|/ / / / / / /
* / / / / / / Fix Destroy() calling behaviourTiger Wang2015-05-301-1/+2
|/ / / / / /
* | | | | | Fixed reversed logic in StringToDimension.Lane Kolbly2015-05-301-1/+1
* | | | | | Merge pull request #2070 from mc-server/PreventNewWarningsJulian Laubstein2015-05-29195-807/+1111
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into PreventNewWarningstycho2015-05-299-32/+43
| |\ \ \ \ \ \
| * | | | | | | Fix commentstycho2015-05-2820-64/+82
| * | | | | | | Merge branch 'master' into PreventNewWarningstycho2015-05-2830-118/+483
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Fix warnings in cPathtycho2015-05-241-9/+9
| * | | | | | | Merge branch 'master' into PreventNewWarningstycho2015-05-2412-197/+497
| |\ \ \ \ \ \ \
| * | | | | | | | Fix other clang 3.6 committycho2015-05-242-2/+8
| * | | | | | | | Fix bearbins commentstycho2015-05-241-14/+10
| * | | | | | | | Fix clang 3.6 flags to only be used in clang 3.6tycho2015-05-242-11/+18
| * | | | | | | | Fix commentstycho2015-05-246-63/+73
| * | | | | | | | Disable -Werror for warnings in tests.tycho2015-05-245-16/+7
| * | | | | | | | Disable -Werror for warnings in tools.tycho2015-05-242-2/+4
| * | | | | | | | Made -Weverything an error.tycho2015-05-24110-270/+376
| * | | | | | | | Merge branch 'master' into PreventNewWarningstycho2015-05-2319-42/+46
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into PreventNewWarningstycho2015-05-234-30/+38
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix teststycho2015-05-233-2/+9
| * | | | | | | | | | Disable warnings in MCADefrag, ProtoProxy and teststycho2015-05-232-3/+6
| * | | | | | | | | | Added pthread as a link flag.tycho2015-05-231-1/+2
| * | | | | | | | | | Merge branch 'master' into PreventNewWarningstycho2015-05-2321-61/+143
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix teststycho2015-05-191-0/+7
| * | | | | | | | | | | Merge branch 'master' into PreventNewWarningstycho2015-05-192-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make -Werror disabling file onlytycho2015-05-1963-96/+201
| * | | | | | | | | | | | Added LuaState support for all integral typestycho2015-05-199-69/+72
| * | | | | | | | | | | | Fixed some more warningstycho2015-05-194-37/+37
| * | | | | | | | | | | | Finish fixing windowstycho2015-05-191-2/+2
| * | | | | | | | | | | | More fixed warningstycho2015-05-196-28/+40
| * | | | | | | | | | | | Properly fix cFile Warningstycho2015-05-192-11/+11
| * | | | | | | | | | | | Fixed compile and a few more warningstycho2015-05-199-15/+33
| * | | | | | | | | | | | Merge branch 'master' into PreventNewWarningstycho2015-05-1936-136/+1207
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed a lot of warningstycho2015-05-1930-273/+286
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2157 from beeduck/Issue2106Mattes D2015-05-293-5/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'Issue2106' of https://github.com/beeduck/MCServer into Issue2106b33duck2015-05-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fixed the way connecting clients receive player lists and broadcast chat to worldsb33duck2015-05-283-4/+14
| * | | | | | | | | | | | | Fix for the way connecting clients receive player lists and broadcast chatb33duck2015-05-293-5/+26
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / Fixed Info.lua documentationSTRWarrior2015-05-281-4/+4
|/ / / / / / / / / / / /
* | | | | | | | | | | | Updated DumpInfo plugin.STRWarrior2015-05-281-8/+10
* | | | | | | | | | | | Merge pull request #2154 from SafwatHalaby/skeletonworktycho2015-05-285-19/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | AI - Sane SkeletonSafwatHalaby2015-05-285-19/+32
* | | | | | | | | | | | | Merge pull request #2156 from SafwatHalaby/exitSafwat Halaby2015-05-281-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Removed stray "exit" from compile.shSafwatHalaby2015-05-281-1/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2152 from mc-server/fixesMattes D2015-05-281-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Potential crash fixesTiger Wang2015-05-281-6/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2151 from SafwatHalaby/wolfAlexander Harkness2015-05-281-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | AI - Tweaked wolf speed and teleport thresholdSafwatHalaby2015-05-281-1/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2148 from SafwatHalaby/easyworktycho2015-05-271-2/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | AI - Saner LivestockSafwatHalaby2015-05-271-2/+11
* | | | | | | | | | | | Merge pull request #2061 from mc-server/fixesAlexander Harkness2015-05-278-28/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixes #2041Tiger Wang2015-05-241-3/+3
| * | | | | | | | | | | Fixes #2003Tiger Wang2015-05-182-9/+7
| * | | | | | | | | | | Fixes #2052Tiger Wang2015-05-186-16/+33
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #2143 from jammet/patch-6Alexander Harkness2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Corrected Cookie recipejammet2015-05-261-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2136 from mc-server/clientDestroyRaceMattes D2015-05-261-2/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed ClientHandle not getting properly removed from the worldtycho2015-05-261-2/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1848 from scottwillmoore/ImplementTitleCommandMattes D2015-05-269-0/+317
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement backend for /title commandScott Moore2015-04-139-0/+317
* | | | | | | | | | | | Merge pull request #2138 from Seadragon91/server_uptimeMattes D2015-05-263-80/+82
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added method to get the uptime of the server in seconds. Implements #1650.Lukas Pioch2015-05-263-80/+82
* | | | | | | | | | | | | Merge pull request #2139 from mathias-github/patch-3Julian Laubstein2015-05-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update CONTRIBUTORSMathias2015-05-251-0/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #2140 from mc-server/Plugins-dupingAlexander Harkness2015-05-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Only add default plugins if there are not any pluginsworktycho2015-05-251-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2135 from linnemannr/masterAlexander Harkness2015-05-255-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Support building on FreeBSDlinnemannr2015-05-255-2/+16
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2114 from cengizIO/masterAlexander Harkness2015-05-241-18/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix #2105 - Add gcc to CI compilersCengiz Can2015-05-241-18/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2091 from Rakete1111/masterworktycho2015-05-241-0/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes #2059Blitz Rakete2015-05-211-0/+14
* | | | | | | | | | | | Merge pull request #2130 from SafwatHalaby/easyInstallworktycho2015-05-242-1/+204
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Easy compile scriptSafwatHalaby2015-05-242-1/+204
* | | | | | | | | | | | | Merge pull request #2122 from SafwatHalaby/boundingworktycho2015-05-243-26/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Pathfinder - Bounding boxes and some tweaksSafwatHalaby2015-05-233-26/+114
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Update CONTRIBUTORSAlexander Harkness2015-05-241-2/+2
* | | | | | | | | | | | | Merge pull request #2129 from Seadragon91/masterAlexander Harkness2015-05-242-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add Seadragon91 to contributorsLukas Pioch2015-05-241-0/+1
| * | | | | | | | | | | | | Fixed item nameLukas Pioch2015-05-241-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #2118 from mc-server/login-gamemodeSafwat Halaby2015-05-242-148/+154
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix gamemode not changing properly.Alexander Harkness2015-05-232-148/+154
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2128 from mc-server/wolf-fixSafwat Halaby2015-05-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Wolves don't spawn in rivers.Alexander Harkness2015-05-241-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2107 from mc-server/cow-waterspawnSafwat Halaby2015-05-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Cows and rabbits no longer spawn over water.Alexander Harkness2015-05-231-1/+1
* | | | | | | | | | | | Merge pull request #2117 from Seadragon91/clang_errorsworktycho2015-05-2319-42/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-2319-42/+46
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2116 from mc-server/CMakeCacheOptionsAlexander Harkness2015-05-231-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add build_tools and Self_test as cache options, so that CLion can detect themtycho2015-05-231-0/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2065 from mc-server/OldArgsMattes D2015-05-231-29/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Moved no buffering command line argument to tclaptycho2015-05-201-5/+8
| * | | | | | | | | | | Move commlog arguments over to TCLAPtycho2015-05-201-25/+18
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2103 from beeduck/Issue1980Alexander Harkness2015-05-231-0/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed players head visible when in spectator modeb33duck2015-05-221-0/+9
* | | | | | | | | | | | Merge pull request #2110 from mc-server/coverity-fixAlexander Harkness2015-05-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed wrong copy/pasteworktycho2015-05-231-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2108 from mc-server/tgh-booleanAlexander Harkness2015-05-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | TryGetHeight returns a boolAlexander Harkness2015-05-231-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2101 from mc-server/EquifaxCertsAlexander Harkness2015-05-232-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Close Ssl Socket on destroyTiger Wang2015-05-232-1/+5
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2104 from beeduck/Issue2053Alexander Harkness2015-05-231-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added a fix for players falling through the world when connecting in spectator modeb33duck2015-05-231-0/+7
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2100 from SafwatHalaby/creeperAlexander Harkness2015-05-231-2/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed creeper not exploding when 1 block higher than playerSafwatHalaby2015-05-231-2/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2086 from Seadragon91/masterMattes D2015-05-219-19/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Renamed hook HOOK_ENTITY_CHANGE_WORLDLukas Pioch2015-05-219-19/+20
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2085 from mc-server/EquifaxCertsJulian Laubstein2015-05-213-7/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added Equifax root CA.Mattes D2015-05-213-7/+40
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2030 from beeduck/masterworktycho2015-05-213-3/+19
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Added beeduck to contributorsb33duck2015-05-211-0/+1
| * | | | | | | | Added open/close and sound effects for all door typesb33duck2015-05-211-3/+17
| * | | | | | | | Added thunder sound effect to CastThunderbolt()b33duck2015-05-211-0/+1
* | | | | | | | | Merge pull request #2084 from mc-server/patch-2050Alexander Harkness2015-05-211-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added missing fencetypes to torchhandlerJulian Laubstein2015-05-201-0/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2073 from SafwatHalaby/randworktycho2015-05-203-10/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Path recalculation improvementsSafwatHalaby2015-05-203-10/+17
|/ / / / / / / /
* | | | | | | | Merge pull request #2074 from SafwatHalaby/rmUniqueworktycho2015-05-202-19/+26
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | newlinesSafwatHalaby2015-05-191-0/+9
| * | | | | | | Removed UniquePTR from PathFinderSafwatHalaby2015-05-192-19/+17
* | | | | | | | Merge pull request #2076 from mc-server/Cert-disableAlexander Harkness2015-05-191-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Don't verify certificateworktycho2015-05-191-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:mc-server/MCServerAlexander Harkness2015-05-19191-2946/+4028
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #2057 from Seadragon91/masterAlexander Harkness2015-05-191-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix the health of animalsLukas Pioch2015-05-181-0/+1
| * | | | | | | Merge pull request #2019 from mc-server/OverrideArgsAlexander Harkness2015-05-1925-124/+1012
| |\ \ \ \ \ \ \
| | * | | | | | | Add support for setting ports through command linetycho2015-05-182-2/+24
| | * | | | | | | Fix max slots logic to only override if acctually present.tycho2015-05-181-4/+9
| | * | | | | | | Added deoxy commentstycho2015-05-161-1/+16
| | * | | | | | | Fix service Mainworktycho2015-05-161-1/+1
| | * | | | | | | Move make_unique into a namespace to avoid ADL issuestycho2015-05-164-11/+15
| | * | | | | | | Initial implementation of IniFile overloadingtycho2015-05-1622-116/+955
| | * | | | | | | Added TCLAPtycho2015-05-162-0/+3
| * | | | | | | | Removed tip4commit, it's not used anymore.Alexander Harkness2015-05-191-3/+1
| * | | | | | | | Merge pull request #2060 from mc-server/more-leafimproveAlexander Harkness2015-05-191-8/+20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Improved leaves a bit more.Alexander Harkness2015-05-181-8/+20
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Manual merge of #2066Alexander Harkness2015-05-191-1/+1
| * | | | | | | | Improved contributorAlexander Harkness2015-05-191-0/+1
| * | | | | | | | Merge pull request #2064 from Seadragon91/hook_entity_change_worldAlexander Harkness2015-05-199-0/+172
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Added OnEntityChangeWorld.lua and OnEntityChangedWorld.lua hooks to APIDumpLukas Pioch2015-05-192-0/+57
| | * | | | | | | Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLDLukas Pioch2015-05-187-0/+115
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2015-05-1815-174/+315
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #2049 from mc-server/sapling-probabilitySafwat Halaby2015-05-181-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Fix sapling probability.Alexander Harkness2015-05-171-1/+1
| | * | | | | | APIDump: Removed an unneeded global variable.Mattes D2015-05-171-1/+1
| | * | | | | | Merge pull request #2037 from SafwatHalaby/aproxSafwat Halaby2015-05-175-55/+193
| | |\ \ \ \ \ \
| | | * | | | | | Pathfinder - approximated paths when original destination unreachableSafwatHalaby2015-05-175-55/+193
| | * | | | | | | properly this time?Alexander Harkness2015-05-171-1/+1
| | * | | | | | | Fixed typo.Alexander Harkness2015-05-171-1/+1
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #2040 from mc-server/RandomAlexander Harkness2015-05-171-5/+21
| | |\ \ \ \ \ \
| | | * | | | | | Fix FastRandom seedingworktycho2015-05-171-5/+21
| | |/ / / / / /
| | * | | | | | Should disable coveralls.Alexander Harkness2015-05-171-7/+7
| | * | | | | | Merge pull request #2038 from mc-server/InventoryFixAlexander Harkness2015-05-171-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Fixed inventory handling.Mattes D2015-05-161-2/+2
| | |/ / / / / /
| | * | | | | | Merge pull request #2033 from mc-server/BreakIntoDebuggerSafwat Halaby2015-05-162-0/+29
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Lua: Break into ZBS debugger on API errors.Mattes D2015-05-162-0/+29
| | | |/ / / /
| | * | | | | Merge pull request #2029 from mc-server/bedPatchMattes D2015-05-161-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Bed uses bottom two bits for direction not threeworktycho2015-05-161-2/+2
| | | | |/ / | | | |/| |
| | * / | | PathFinder uses UniquePtr for cell map.SafwatHalaby2015-05-162-8/+3
| | |/ / /
| | * | | Newsletter, content tweak.Alexander Harkness2015-05-151-1/+3
| | * | | Merge pull request #2024 from mc-server/revert-2023-smartPointersworktycho2015-05-152-3/+8
| | |\ \ \
| | | * | | Revert "PathFinder - smart pointers"worktycho2015-05-152-3/+8
| | |/ / /
| | * | | Merge pull request #2023 from SafwatHalaby/smartPointersworktycho2015-05-152-8/+3
| | |\ \ \
| | | * | | uniquePTRSafwatHalaby2015-05-152-8/+3
| | | |/ /
| | * | | Unify shields.Alexander Harkness2015-05-151-1/+1
| | * | | Removed tip4commit.Alexander Harkness2015-05-151-1/+1
| | |/ /
| | * | Merge pull request #2022 from mc-server/ForEachCommandAPIFixworktycho2015-05-141-93/+54
| | |\ \
| | | * | Fixed cPluginManager:ForEachCommand() and ForEachConsoleCommand()Mattes D2015-05-141-93/+54
| | |/ /
| * / / Updated the defaults for the overworld world generatorSTRWarrior2015-05-171-1/+1
| |/ /
| * | Merge pull request #2018 from mc-server/ProbDifMattes D2015-05-141-0/+1
| |\ \
| | * | Fixed possible crash in cProbabDistribSTRWarrior2015-05-141-0/+1
| * | | Merge pull request #2010 from TwiddleStick/patch-2Mattes D2015-05-141-2/+2
| |\ \ \
| | * | | Update World.cppMartin Fahy2015-05-141-2/+2
| * | | | Merge pull request #2006 from mc-server/ManualBindingsWorldMattes D2015-05-147-1217/+1253
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Moved cWorld manual bindings out into a separate file.Mattes D2015-05-137-1217/+1253
| * | | | Merge pull request #2007 from mc-server/AllCommandsThroughHookMattes D2015-05-133-5/+11
| |\ \ \ \
| | * | | | Fixed chat message manipulation by plugins.Mattes D2015-05-131-1/+1
| | * | | | All in-game commands go through the OnExecuteCommand hook.Mattes D2015-05-132-4/+10
| | |/ / /
| * | | | Merge pull request #2008 from mc-server/InfoDumpLinksMattes D2015-05-131-5/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | InfoDump: Added DownloadLocation to forum post generator.Mattes D2015-05-131-1/+4
| | * | | InfoDump: Added support for links.Mattes D2015-05-131-4/+12
| |/ / /
| * | | Merge pull request #2001 from mc-server/BindingsCleanupMattes D2015-05-1213-972/+207
| |\ \ \
| | * | | CIBuild: Added action labelsMattes D2015-05-121-0/+4
| | * | | ToLua now generates cLuaState::Push() and GetStackValue()Mattes D2015-05-1211-498/+195
| | * | | ToLua: Fixed LuaJit compatibility.Mattes D2015-05-111-0/+8
| | * | | AllToLua: Removed unneeded virtual method hooks.Mattes D2015-05-111-481/+7
| * | | | Fixed creative click-outsideTiger Wang2015-05-121-1/+1
| * | | | Improved hoppersTiger Wang2015-05-112-27/+16
| |/ / /
| * | | Merge pull request #2000 from mc-server/CommandHandlingMattes D2015-05-1116-73/+173
| |\ \ \
| | * | | APIDump: Added linkification to hook return values.Mattes D2015-05-101-1/+1
| | * | | OnExecuteCommand hook can override the command result (crXXX).Mattes D2015-05-108-20/+40
| | * | | Exported cPluginManager:ExecuteConsoleCommand() to Lua API.Mattes D2015-05-105-16/+77
| | * | | Call HOOK_EXECUTE_COMMAND even for unknown console commands.Mattes D2015-05-103-3/+14
| | * | | StringUtils: Fixed StringSplitWithQuotes().Mattes D2015-05-101-0/+7
| | * | | InfoReg: Fixed EntireCommand handling for MultiCommandHandler().Mattes D2015-05-101-34/+34
| | * | | Added the EntireCommand parameter to HOOK_EXECUTE_COMMAND.Mattes D2015-05-106-10/+11
| |/ / /
| * | | Merge pull request #1977 from mc-server/warningsTiger Wang2015-05-108-26/+41
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master' into warningsTiger Wang2015-05-10120-306/+361
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1985 from SafwatHalaby/lessPathCalcsMattes D2015-05-101-1/+1
| |\ \ \ \
| | * | | | PF - Less calcs per tickwiseoldman952015-05-101-1/+1
| |/ / / /
| * | | | Merge pull request #1954 from mc-server/MoreStyleCheckMattes D2015-05-09112-288/+324
| |\ \ \ \
| | * | | | Added check against "Type const &" and "Type const *".Mattes D2015-05-091-0/+4
| | * | | | CheckBasicStyle: checks spaces around * and &.Mattes D2015-05-0942-104/+115
| | * | | | More style checking.Mattes D2015-05-0978-186/+207
| |/ / / /
| * | | | Rabbit and cooked rabbit now stackablejammet2015-05-091-1/+3
| * | | | Merge pull request #1956 from Tri125/masterMattes D2015-05-095-6/+20
| |\ \ \ \
| | * | | | GetSizeName of cSlime and cMagmaCube is now staticTristan2015-05-094-4/+4
| | * | | | Big Magma Cube can now spawnTri1252015-05-072-2/+2
| | * | | | Fixed the sound issue with the MagmaCubeTri1252015-05-072-2/+16
| * | | | | Fixed remaing pragmasworktycho2015-05-091-3/+3
| * | | | | clang diagnostic not diagnosticsworktycho2015-05-091-3/+3
| * | | | | Merge pull request #1968 from SafwatHalaby/patch-2Safwat Halaby2015-05-091-2/+2
| |\ \ \ \ \
| | * | | | | Update Contributing.MDSafwat Halaby2015-05-081-2/+2
| * | | | | | Merge pull request #1973 from Tri125/QuartzStackAlexander Harkness2015-05-091-0/+1
| |\ \ \ \ \ \
| | * | | | | | Fixed #1893Tri1252015-05-071-0/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #1972 from Woazboat/CodeCleanup_refactoredworktycho2015-05-091-4/+4
| |\ \ \ \ \ \
| | * | | | | | Fixed compiler warning overrides in Vector3.hWoazboat2015-05-091-4/+4
| * | | | | | | Merge pull request #1971 from mc-server/worktycho-patch-1NiLSPACE2015-05-091-2/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Move chunk position accesses after the chunk validity checksworktycho2015-05-091-2/+4
| |/ / / / / / /
| | | | | * | | Fixed some warnings and logic errors in Monster.cppTiger Wang2015-05-101-5/+7
| | | | | * | | Fixed some Visual Studio warningsTiger Wang2015-05-098-25/+38
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #1945 from Woazboat/CodeCleanup_refactoredMattes D2015-05-084-43/+88
| |\| | | | | | | |_|/ / / | |/| | | |
| | * | | | Added float comparison warning overrides to Vector3::hasNonZeroLengthWoazboat2015-05-081-7/+16
| | * | | | Ignoring Clang warnings for strict float comparison in Vector::Equals()Woazboat2015-05-081-1/+11
| | * | | | Changed Vector3 Equals function to avoid using memcmpWoazboat2015-05-081-5/+1
| | * | | | Tracer::signum function now returns intWoazboat2015-05-083-25/+29
| | * | | | Check for zero length vector in TraceWoazboat2015-05-082-4/+15
| | * | | | Changed Tracer::m_NormalTable to static arrayWoazboat2015-05-082-8/+23
| * | | | | Fix build URLs, now .tar.gzAlexander Harkness2015-05-081-3/+3
| * | | | | Merge pull request #1957 from SafwatHalaby/patch-1Alexander Harkness2015-05-081-7/+36
| |\ \ \ \ \
| | * | | | | Added pre-commit hook to CONTRIBUTING.mdSafwat Halaby2015-05-081-7/+36
| * | | | | | Merge pull request #1967 from jammet/patch-4Alexander Harkness2015-05-081-1/+1
| |\ \ \ \ \ \
| | * | | | | | Corrected hopper recipejammet2015-05-081-1/+1
| |/ / / / / /
| * | | | | | Fixed syntax errorAlexander Harkness2015-05-081-0/+1
| * | | | | | Merge pull request #1966 from SafwatHalaby/SpacesAlexander Harkness2015-05-082-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Spaces in cPathwiseoldman952015-05-082-0/+2
| |/ / / / /
| * | | | | Merge pull request #1960 from mc-server/FixInterPluginCallsMattes D2015-05-084-27/+22
| |\ \ \ \ \
| | * | | | | Fixed inter-plugin calls.Mattes D2015-05-073-27/+19
| | * | | | | Added Lua C API checks in Debug builds.Mattes D2015-05-071-0/+3
| |/ / / / /
| * | | | | Merge pull request #1949 from SafwatHalaby/burnworktycho2015-05-073-35/+93
| |\ \ \ \ \
| | * | | | | AI - Safer WouldBurnAt()wiseoldman952015-05-061-3/+8
| | * | | | | AI - Better shade coverwiseoldman952015-05-061-1/+9
| | * | | | | (duplicate) AI - Livestock escape fixed, water jumping fixedwiseoldman952015-05-063-34/+79
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #1951 from mc-server/BroadcastRefactorMattes D2015-05-0722-19/+310
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Added support for additional data in the ParticleEffect Packettycho2015-05-0722-19/+310
| | |/ / /
| * | | | Merge pull request #1953 from mc-server/bearbin-fadwpMattes D2015-05-061-3/+3
| |\ \ \ \
| | * | | | Properly fix the docs for FindAndDoWithPlayer.Alexander Harkness2015-05-061-3/+3
| * | | | | Merge pull request #1952 from mc-server/coverity-fixAlexander Harkness2015-05-061-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Actually empty the open listworktycho2015-05-061-1/+1
| | |/ / /
* | / / / Updated Core.Alexander Harkness2015-05-191-0/+0
|/ / / /
* / / / Added info about case-sensitivity of FindAndDoWithPlayerAlexander Harkness2015-05-061-4/+3
|/ / /
* | | Merge pull request #1946 from SafwatHalaby/leanAlexander Harkness2015-05-062-6/+13
|\ \ \
| * | | PF - Swimming bugfixwiseoldman952015-05-061-3/+3
| * | | PF - Fixed mobs not reaching leaning playerwiseoldman952015-05-062-3/+10
* | | | Merge pull request #1943 from mc-server/revert-1917-CodeCleanupworktycho2015-05-054-62/+45
|\ \ \ \
| * | | | Revert "Small code cleanup"worktycho2015-05-054-62/+45
|/ / / /
* | | | Merge pull request #1917 from Woazboat/CodeCleanupworktycho2015-05-054-45/+62
|\ \ \ \ | |/ / / |/| | |
| * | | Changed fabs() to std::abs()Woazboat2015-04-291-4/+4
| * | | braces in Tracer::mNormalTable initializer in separate linesWoazboat2015-04-291-2/+4
| * | | Added extra braces to initialization of Tracer::m_NormalTableWoazboat2015-04-291-2/+2
| * | | And another cs fix I overlookedWoazboat2015-04-291-1/+1
| * | | Fixed comments according to csWoazboat2015-04-291-11/+11
| * | | Fix HasNonZeroLength nameWoazboat2015-04-292-3/+3
| * | | Changed Tracer::m_NormalTable to static arrayWoazboat2015-04-292-7/+14
| * | | Changed Vector3 Equals function to avoid using memcmpWoazboat2015-04-281-5/+1
| * | | Tracer signum function now returns intWoazboat2015-04-282-7/+10
| * | | Check for zero length vector in TraceWoazboat2015-04-282-4/+15
| * | | convert c style casts to c++ static castsWoazboat2015-04-282-15/+16
| |/ /
| * | Removed redundant temp iterator. std::list.erase already returnsWoazboat2015-04-271-4/+1
* | | Merge pull request #1939 from SafwatHalaby/Polisingworktycho2015-05-052-26/+47
|\ \ \
| * | | AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bugwiseoldman952015-05-052-26/+47
* | | | Merge pull request #1941 from mc-server/bearbin-darkoakMattes D2015-05-051-0/+2
|\ \ \ \
| * | | | Add furnacing recipies for dark oak and acacia.Alexander Harkness2015-05-051-0/+2
|/ / / /
* | | | Merge pull request #1940 from SafwatHalaby/luaAlexander Harkness2015-05-051-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Chmod +x CheckBasicStyle.luawiseoldman952015-05-051-0/+0
|/ / /
* | | Merge pull request #1938 from jan64/masterMattes D2015-05-042-3/+3
|\ \ \
| * | | Change visual protocol name to include MCServerjan642015-05-042-3/+3
* | | | Merge pull request #1935 from mc-server/fixesAlexander Harkness2015-05-048-265/+224
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/master' into fixesTiger Wang2015-05-040-0/+0
| |\ \ \
| * | | | Entity improvementsTiger Wang2015-05-048-265/+224
* | | | | Upgraded ubuntu version.Alexander Harkness2015-05-041-1/+1
* | | | | Merge pull request #1937 from mc-server/BuildInfoCrashAlexander Harkness2015-05-041-0/+9
|\ \ \ \ \
| * | | | | Print Build info as part of the crash informationworktycho2015-05-041-0/+9
|/ / / / /
* | | | | Merge pull request #1936 from Seadragon91/masterMattes D2015-05-041-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Crafting - Allow to craft torches with charcoalsLukas Pioch2015-05-031-1/+1
|/ / / /
* | | | Merge pull request #1934 from SafwatHalaby/p_IsSolidChunksTiger Wang2015-05-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | PathFinder - Fixed nullptr chunk bugwiseoldman952015-05-031-1/+1
* | | | Merge pull request #1930 from SafwatHalaby/AI_JumpTiger Wang2015-05-032-5/+16
|\ \ \ \
| * | | | AI - Improved Mob Jumpingwiseoldman952015-05-032-5/+16
| |/ / /
* | | | Merge pull request #1932 from SafwatHalaby/F_AssertFixMattes D2015-05-033-10/+8
|\ \ \ \
| * | | | PathFinder - Crash fix, chunks in parameters are now referenceswiseoldman952015-05-033-10/+8
| |/ / /
* | | | Fixed multiple mbedtls inclusion.Mattes D2015-05-032-6/+7
* | | | Merge pull request #1880 from mc-server/submodulesMattes D2015-05-038-4/+4
|\ \ \ \
| * | | | Update submodulesTiger Wang2015-05-028-4/+4
* | | | | Fixed error in webadmin home pageSTRWarrior2015-05-021-1/+1
| |/ / / |/| | |
* | | | Merge pull request #1925 from SafwatHalaby/PathFinder_OptimzeTiger Wang2015-05-024-66/+38
|\ \ \ \
| * | | | PathFinding - Chunk querying optimization and improve cPath::IsSolidwiseoldman952015-05-024-66/+38
* | | | | Merge pull request #1928 from SafwatHalaby/contribTiger Wang2015-05-021-0/+1
|\ \ \ \ \
| * | | | | Added myself to CONTRIBUTORS. Note: I'm formerly wiseoldman95wiseoldman952015-05-021-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #1927 from SafwatHalaby/AI_BetterDayLightHandlingTiger Wang2015-05-026-63/+22
|\ \ \ \ \
| * | | | | AI - Better daylight handlingwiseoldman952015-05-026-63/+22
| | |/ / / | |/| | |
* | | | | Merge pull request #1919 from mathias-github/patch-1Tiger Wang2015-05-021-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added Guardian and Rabbit to DefaultMonsters in OverworldMathias2015-04-291-1/+1
* | | | | CheckBasicStyle: Can check individual files or git commits.Mattes D2015-05-021-2/+101
* | | | | APIDump: Added an "apishow" command.Mattes D2015-05-021-0/+10
| |/ / / |/| | |
* | | | Merge pull request #1920 from wiseoldman95/SquashedPathFinderMattes D2015-05-0113-175/+736
|\ \ \ \
| * | | | A* Pathfinding and better monster AIwiseoldman952015-05-0113-175/+736
|/ / / /
* | | | Merge pull request #1924 from mc-server/BlockAreaCountNonAirMattes D2015-05-013-1/+37
|\ \ \ \
| * | | | Added cBlockArea:CountNonAirBlocks API function.Mattes D2015-04-303-1/+37
|/ / / /
* | | | Merge pull request #1923 from mc-server/ReadWholeFileFixMattes D2015-04-302-8/+44
|\ \ \ \
| * | | | Fixed bindings for cFile:ReadWholeFile().Mattes D2015-04-302-8/+44
|/ / / /
* | | | Merge pull request #1922 from mc-server/BlockAreaExtMattes D2015-04-306-10/+242
|\ \ \ \ | |/ / / |/| | |
| * | | APIDump: Added documentation for cBlockArea:GetNonAirCropRelCoords.Mattes D2015-04-301-0/+1
| * | | Added cBlockArea::msSimpleCompare merge strategy.Mattes D2015-04-293-9/+95
| * | | Added cBlockArea:GetNonAirCropRelCoords() API function.Mattes D2015-04-295-1/+146
* | | | Clay blocks are handled with the OreHandlerjammet2015-04-291-0/+1
* | | | Merge pull request #1913 from wiseoldman95/fixCompatibleProtocolsMattes D2015-04-281-1/+1
|\ \ \ \
| * | | | Updated MC versions in ProtocolRecognizer.hwiseoldman952015-04-281-1/+1
* | | | | Updated MC versions in readme.txtMattes D2015-04-281-2/+2
|/ / / /
* | | | Merge pull request #1909 from Woazboat/CodeCleanupworktycho2015-04-274-10/+12
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | cSetChunkData constructor explicitly requires std::move() instead ofWoazboat2015-04-274-10/+12
* | | Fix explosions trying to write to unread blockareaTiger Wang2015-04-261-3/+5
* | | Update contributing.md with C++11worktycho2015-04-261-1/+1
* | | Updated the Core.Mattes D2015-04-251-0/+0
* | | Merge pull request #1897 from mc-server/RestrictionsMattes D2015-04-256-43/+772
|\ \ \
| * | | cPlayer now checks restrictions.Mattes D2015-04-253-7/+68
| * | | Added player restrictions to the DB and API.Mattes D2015-04-253-36/+704
* | | | Merge pull request #1896 from mc-server/FindAndDoWithPlayerRaceMattes D2015-04-251-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Eliminate race condition in cRoot::FindAndDoWithPlayerworktycho2015-04-241-4/+4
| |/ /
* / / Plugin removes its command registrations and webtabs when unloaded.Mattes D2015-04-251-0/+5
|/ /
* | Merge pull request #1894 from mc-server/RefactorManualBindingsTemplatesMattes D2015-04-235-392/+286
|\ \
| * | Refactored ManualBindings' callbacks using templates.Mattes D2015-04-235-392/+286
|/ /
* | Digging up a clay block spawns 4 clay items.jammet2015-04-231-0/+5
* | Merge pull request #1892 from mc-server/DoWithPluginMattes D2015-04-235-173/+332
|\ \
| * | Implemented cPluginManager:DoWithPlugin(), fixed ForEachPlugin().Mattes D2015-04-235-173/+332
* | | Nether Quartz is handled in the Ore handler.jammet2015-04-231-0/+5
* | | Merge pull request #1851 from wraith11/DoorFixMattes D2015-04-232-6/+21
|\ \ \
| * | | Fix door placing in connection with slabswraith112015-04-212-6/+21
* | | | Merge pull request #1852 from wraith11/SlabPlacingMattes D2015-04-231-0/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix slab placingwraith112015-04-221-0/+23
| |/ /
* | | Merge pull request #1883 from mc-server/NarrowWindowIDMattes D2015-04-222-3/+7
|\ \ \
| * | | Narrowed WindowID to use only 7 bits.Mattes D2015-04-212-3/+7
|/ / /
* | | Hotfixed some chunk presence issues when generating.Mattes D2015-04-211-0/+2
* | | Merge pull request #1879 from mc-server/DynamicThresholdMattes D2015-04-212-7/+6
|\ \ \
| * | | Changed default MaxThreshold valueSTRWarrior2015-04-211-1/+1
| * | | Calculate threshold for each column in a chunk instead for the whole chunkSTRWarrior2015-04-211-2/+1
| * | | Changed Nether composition to change the threshold from a cubic noiseSTRWarrior2015-04-202-7/+7
* | | | Network: fixed excessive debug logging.Mattes D2015-04-212-7/+1
* | | | Merge pull request #1881 from mc-server/UrlInHttpRequestMattes D2015-04-214-43/+62
|\ \ \ \
| * | | | Added URL member to the HTTPRequest API class.Mattes D2015-04-214-43/+62
|/ / / /
* | | | WebAdmin: Removed server name, shortened memory report.Mattes D2015-04-201-5/+1
* | | | Fixed a bad recipe.Mattes D2015-04-201-1/+1
* | | | ItemHandler type fixes.Mattes D2015-04-201-2/+2
* | | | Merge pull request #1878 from jammet/patch-2Mattes D2015-04-201-1/+1
|\ \ \ \
| * | | | Fixing dyeingjammet2015-04-201-1/+1
* | | | | Protocol 1.8: Limit the amount of displayed data on NBT parse failure.Mattes D2015-04-201-1/+1
* | | | | ItemHandler: Using automatic array bounds.Mattes D2015-04-201-1/+1
|/ / / /
* | | | Updated the Core plugin.Mattes D2015-04-191-0/+0
* | | | HangingEntity: Fixed a needless clang warning.Mattes D2015-04-191-2/+5
* | | | Fixed typo in NetherForts initializationSTRWarrior2015-04-191-1/+1
* | | | Merge pull request #1877 from mc-server/GlowStoneNiLSPACE2015-04-194-2/+140
|\| | |
| * | | GlowStone: Changed order of initialization of member variablesSTRWarrior2015-04-191-2/+2
| * | | Fixed styleSTRWarrior2015-04-191-2/+2
| * | | Added GlowStone finisherSTRWarrior2015-04-194-2/+140
| |/ /
* | | Merge pull request #1875 from mc-server/PluginFoldersMattes D2015-04-1916-1161/+884
|\ \ \
| * | | Refresh plugin list before trying to load.Mattes D2015-04-191-0/+1
| * | | APIDump: Documented cPluginManager:IsPluginLoaded().Mattes D2015-04-191-0/+1
| * | | Added cPluginManager:IsPluginLoaded() API, better load error msgs.Mattes D2015-04-192-5/+42
| * | | Refactored cWebPlugin for C++11 style and proper WebTab clearing.Mattes D2015-04-196-103/+149
| * | | Split the plugin names and plugin folders to avoid confusing them.Mattes D2015-04-1914-1059/+697
* | | | ClientHandle: Fixed re-sending refused right-clicks.Mattes D2015-04-191-1/+8
* | | | HTTP: Error message is sent as the payload as well.Mattes D2015-04-192-2/+5
* | | | Merge pull request #1864 from mc-server/StrictRecipeMatchingMattes D2015-04-192-55/+58
|\ \ \ \
| * | | | Recipes match zero DamageValue strictly.Mattes D2015-04-162-55/+58
* | | | | Merge pull request #1876 from jammet/patch-1Mattes D2015-04-191-0/+19
|\ \ \ \ \
| * | | | | Add StainedClayjammet2015-04-191-0/+19
|/ / / / /
* | | | | Merge pull request #1870 from mathias-gh/masterMattes D2015-04-171-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update IronGolem.cppmathias-gh2015-04-171-1/+1
* | | | | Merge pull request #1869 from mathias-gh/masterNiLSPACE2015-04-171-0/+1
|\| | | |
| * | | | Added MobTypeName for Giantmathias-gh2015-04-171-0/+1
|/ / / /
* / / / Fixed arm swing animationTiger Wang2015-04-171-1/+1
|/ / /
* | | Fixed PolishedGranite et al crafting recipes.Mattes D2015-04-164-6/+7
* | | Merge pull request #1858 from mc-server/BucketPluginCallsMattes D2015-04-1524-501/+267
|\ \ \
| * | | Scooping up fluid calls the player placement hooks.Mattes D2015-04-141-4/+12
| * | | Placing a fluid from bucket calls plugin hooks.Mattes D2015-04-1421-53/+204
| * | | Removed HOOK_MAX and HOOK_NUM_HOOKS from Lua API.Mattes D2015-04-132-4/+3
| * | | HookNotify: Rewritten for generic hooks.Mattes D2015-04-131-440/+48
* | | | Merge pull request #1844 from DevToaster/masterMattes D2015-04-1416-16/+61
|\ \ \ \ | |/ / / |/| | |
| * | | Changed air drag for pickupsDevToaster2015-03-311-1/+1
| * | | Changed air drag units to 'interpolated ticks' per secondDevToaster2015-03-3111-14/+18
| * | | Adjusted projectile physicsDevToaster2015-03-311-4/+6
| * | | Modified physics for more vanilla-like behaviorDevToaster2015-03-3115-12/+51
* | | | Debuggers: Renamed conflicting /cs command to /cstay.Mattes D2015-04-131-1/+1
* | | | Merge pull request #1854 from mc-server/FileOpsMattes D2015-04-125-11/+389
|\ \ \ \ | |_|/ / |/| | |
| * | | cFile:ChangeFileExt now accepts extensions with leading dot, too.Mattes D2015-04-113-4/+25
| * | | Added more cFile API functions.Mattes D2015-04-114-7/+89
| * | | Fixed plugin hook calls when unloading plugins.Mattes D2015-04-101-1/+248
| * | | Added proper implementation of cFile::ChangeFileExt().Mattes D2015-04-102-2/+30
* | | | Added extra divide operator to Vector3.STRWarrior2015-04-071-0/+9
* | | | Update GETTING-STARTED.mdMattes D2015-04-071-7/+10
|/ / /
* | | Fixed MSVC warnings, improved comments.Mattes D2015-04-061-5/+5
* | | Added cFile:ChangeFileExt() function.Mattes D2015-04-063-0/+28
* | | Fixed crash on exit introduced with Windows Service capability.Mattes D2015-04-053-31/+29
* | | Merge pull request #1847 from mc-server/DumpInfoFixMattes D2015-04-042-6/+14
|\ \ \
| * | | Fixed DumpInfo pluginSTRWarrior2015-04-042-6/+14
* | | | Merge pull request #1846 from mc-server/WorldChangingMattes D2015-04-041-0/+6
|\| | | | |_|/ |/| |
| * | Fixed players not appearing/disappearing when traveling to a new world.STRWarrior2015-04-031-0/+6
* | | Fixed the nether and end getting snow if they were generated in the overworld.STRWarrior2015-04-031-0/+7
* | | Merge pull request #1799 from SnappingTurtles/BlockButtonMattes D2015-04-031-1/+5
|\ \ \
| * | | Removed 0x6, 0x7 from BlockButton.Alexandre Guertin2015-03-251-5/+3
| * | | Buttons can be placed on the top and on the bottom face of a blockAlexandre Guertin2015-03-091-1/+7
* | | | Merge pull request #1845 from birkett/masterMattes D2015-04-036-35/+245
|\ \ \ \ | |_|_|/ |/| | |
| * | | Working as a Windows service. Starts and stops correctly.Anthony Birkett2015-04-016-35/+245
|/ / /
* | | QtBiomeVisualiser: Fixed compilation and INI loading.Mattes D2015-03-283-6/+13
* | | Fixed placing bottom half-slabs by clicking a top half-slab.Mattes D2015-03-281-2/+2
| |/ |/|
* | Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-2448-2038/+2405
|\ \
| * | Added VarInt64, normalized cPacketizer datatype names.Mattes D2015-03-228-694/+750
| * | Unified cPacketizer across all protocols.Mattes D2015-03-2214-769/+873
| * | ProtoProxy: Fixed connection and logging.Mattes D2015-03-225-15/+23
| * | Fixed signedness warnings in Protocol.Mattes D2015-03-2111-14/+14
| * | Creeper: Fixed skeleton check.Mattes D2015-03-211-11/+10
| * | Fixed signedness issues in protocols.Mattes D2015-03-216-62/+76
| * | Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-2122-169/+224
| * | Unified cByteBuffer types.Mattes D2015-03-2115-591/+722
* | | Merge pull request #1775 from tommysanterre/terrainheightfixMattes D2015-03-2318-22/+31
|\ \ \
| * | | Correct world height validations.Tommy Santerre2015-03-2018-22/+31
| |/ /
* | | Merge pull request #1792 from mc-server/APIDocsMattes D2015-03-221-2/+37
|\ \ \
| * | | APIDump: Linkified eShrapnelLevel.Mattes D2015-03-211-2/+2
| * | | APIDump: Used suggestionsSTRWarrior2015-03-211-8/+8
| * | | APIDump: Improved documentation of cWorld:GetTNTShrapnelLevelSTRWarrior2015-03-211-3/+3
| * | | APIDump: Gave shrapnellevel it's own constantgroupSTRWarrior2015-03-211-0/+7
| * | | APIDump: Fixed typo in cWorld:BroadcastEntityAnimation documentationSTRWarrior2015-03-211-1/+1
| * | | APIDump: Improved cWorld:GetMaxViewDistance documentationSTRWarrior2015-03-211-1/+1
| * | | APIDump: Improved cBlockArea.msDifference documentationSTRWarrior2015-03-211-1/+1
| * | | APIDump: Documented function in cChunkDescSTRWarrior2015-03-211-0/+1
| * | | APIDump: Documented functions & Variables in cBlockInfoSTRWarrior2015-03-211-0/+4
| * | | APIDump: Documented missing constant in cBlockAreaSTRWarrior2015-03-211-0/+1
| * | | APIDump: Documented all undocumented functions in cWorldSTRWarrior2015-03-211-1/+23
* | | | Merge pull request #1786 from mc-server/pipelineSyntaxworktycho2015-03-213-22/+88
|\ \ \ \ | |/ / / |/| | |
| * | | Style fixesworktycho2015-03-211-15/+15
| * | | Fixed alignmentworktycho2015-03-211-2/+2
| * | | Changed pipeline character from >> to |tycho2015-03-112-15/+15
| * | | Fixed style and removed false positivestycho2015-03-112-7/+12
| * | | Fixed Sequence Generator for IntGenTycho2015-03-102-12/+24
| * | | Fixed StyleTycho2015-03-012-13/+15
| * | | Added pipelining syntax for generatorsTycho2015-03-012-16/+63
* | | | Changed linked world name variables and setters / getters.Mattes D2015-03-213-30/+31
* | | | Fixed trailing whitespace.Mattes D2015-03-211-1/+1
* | | | Improved arrow in-flight and block-hit appearanceTiger Wang2015-03-202-19/+3
* | | | cPluginLua:cResettable no longer shares CS with plugin.Mattes D2015-03-202-10/+13
* | | | Merge pull request #1822 from mc-server/ResettableLuaCallbackMattes D2015-03-206-79/+150
|\ \ \ \
| * | | | Added cPluginLua::cResettable interface, used for scheduled tasks.Mattes D2015-03-206-79/+150
* | | | | Merge pull request #1821 from bibo38/bugfix1765Mattes D2015-03-202-0/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removed Metavalue from Piston drops. Bugfix #1765bibo382015-03-202-0/+12
* | | | | Updated Core.Mattes D2015-03-201-0/+0
* | | | | Merge pull request #1818 from mc-server/VerboseTestsMattes D2015-03-201-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Enabled output of individual tests.Mattes D2015-03-181-1/+1
* | | | | APIDump: Added inheritance checking.Mattes D2015-03-191-3/+107
* | | | | Removed unwanted base classes from Lua API.Mattes D2015-03-194-2/+10
* | | | | AllToLua: Fixed cMonster inheritance.Mattes D2015-03-191-2/+2
* | | | | Improved DoWithID bindings.Mattes D2015-03-192-3/+8
* | | | | Merge pull request #1819 from bibo38/bugfix1783Mattes D2015-03-191-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Removed wrong else clause, which caused that the following if-Statement got only executed in rare cases. This has blocked the creation of new Fluid-Sources. Bugfix #1783bibo382015-03-191-1/+2
|/ / / /
* | | | APIDump: Removed the tolua.cast() example.Mattes D2015-03-191-26/+3
* | | | Fixed a clang warning, improved comments.Mattes D2015-03-191-7/+4
* | | | AllToLua: Removed an unneeded class declaration.Mattes D2015-03-192-8/+2
* | | | AllToLua: Fixed the parse order for bindings generation.Mattes D2015-03-191-26/+45
* | | | Added cNetwork initialization to program start.Mattes D2015-03-181-0/+4
* | | | Debuggers: Added inheritance testing.Mattes D2015-03-182-0/+81
* | | | World:DoWithEntityByID() checks the entities-to-add as well.Mattes D2015-03-181-0/+14
|/ / /
* | | Debuggers: Added a cBoundingBox test.Mattes D2015-03-182-0/+61
* | | Network: Close the UDP endpoint in destructor.Mattes D2015-03-182-0/+11
* | | Merge pull request #1817 from bibo38/bugfix1715worktycho2015-03-171-4/+4
|\ \ \
| * | | Changed Variable types of Endianness.h to uniform UInt* types from Globals.hbibo382015-03-171-4/+4
* | | | Merge pull request #1816 from bibo38/bugfix1715worktycho2015-03-171-8/+8
|\| | |
| * | | Fixed double underscore identifiers in the Endianess.h file, which are reserved for implementation use. Bug #1715bibo382015-03-171-8/+8
|/ / /
* | | Merge pull request #1810 from mc-server/paintingsMattes D2015-03-1513-190/+157
|\ \ \
| * | | Fixed style violationsTiger Wang2015-03-141-2/+2
| * | | cPainting saving implementedTiger Wang2015-03-1413-72/+83
| * | | Fixed confusion over Item Frame directionsTiger Wang2015-03-134-120/+76
* | | | Merge pull request #1811 from mc-server/grassworktycho2015-03-155-43/+16
|\ \ \ \
| * | | | Use thread_local in cFastRandomTiger Wang2015-03-141-2/+8
| * | | | Fixed grass spread, closes #1743Tiger Wang2015-03-145-41/+8
| |/ / /
* | | | Merge pull request #1734 from mc-server/pistonsMattes D2015-03-147-57/+46
|\ \ \ \
| * | | | Reverted non-functional changesTiger Wang2015-03-055-53/+11
| * | | | Handle client 'leave bed' requestTiger Wang2015-02-089-61/+92
* | | | | Merge pull request #1808 from tumultenrx/masterMattes D2015-03-146-11/+72
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed a small bugtumultenrx2015-03-141-1/+1
| * | | | Monsters will now attack. Additional checks have been added when generating spawn.tumultenrx2015-03-136-11/+72
* | | | | Merge pull request #1809 from flx5/masterNiLSPACE2015-03-131-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Performance improvements for #1807flx52015-03-121-3/+3
* | | | | Merge pull request #1761 from mc-server/NetworkIPEnumMattes D2015-03-127-5/+239
|\ \ \ \ \
| * | | | | Use std::memcpy to fix alignmentTiger Wang2015-03-101-2/+8
| * | | | | Potential Linux implementationTiger Wang2015-03-081-4/+54
| * | | | | Network: Replaced magic number with named constant.Mattes D2015-02-221-1/+1
| * | | | | cNetwork: Added EnumLocalIPAddresses() function.Mattes D2015-02-227-5/+183
* | | | | | Merge pull request #1807 from flx5/masterMattes D2015-03-1110-24/+97
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fixed coding conventions for Pull Request #1807flx52015-03-115-24/+32
| * | | | | Fixed issue with quotes not appearing in pairsflx52015-03-111-4/+5
| * | | | | Fixed some markup issuesflx52015-03-111-3/+4
| * | | | | Fixed some markup issuesflx52015-03-111-3/+5
| * | | | | Fixes #493 and #490flx52015-03-1110-13/+74
* | | | | | Merge pull request #1804 from mc-server/streamlinetravisAlexander Harkness2015-03-111-5/+1
|\ \ \ \ \ \
| * | | | | | Reduced number of build jobs.Alexander Harkness2015-03-111-2/+2
| * | | | | | Reduce amount of testing, realises #1795Tiger Wang2015-03-102-7/+3
| |/ / / / /
* | | | | | Merge pull request #1665 from mc-server/InventoryMattes D2015-03-1143-701/+1392
|\ \ \ \ \ \
| * | | | | | Moved window code into cpp filesHowaner2015-03-1023-519/+839
| * | | | | | Merge branch 'master' into InventoryHowaner2015-03-0977-296/+6382
| |\| | | | |
| * | | | | | Readded old commentHowaner2015-02-061-0/+2
| * | | | | | Merge branch 'master' into InventoryHowaner2015-02-0654-2096/+1384
| |\ \ \ \ \ \
| * | | | | | | Readded old DistributeStackToAreas() comment.Howaner2015-01-251-2/+5
| * | | | | | | Merge branch 'master' into InventoryHowaner2015-01-25232-1534/+5177
| |\ \ \ \ \ \ \
| * | | | | | | | C++11 and function rename.Howaner2014-12-1716-50/+71
| * | | | | | | | Merge branch 'master' into InventoryHowaner2014-12-1738-2886/+2849
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Implemented vanilla-like shift click.Howaner2014-12-1317-105/+400
| * | | | | | | | | Own classes for all windows.Howaner2014-12-1328-597/+647
* | | | | | | | | | Merge pull request #1805 from mc-server/chunkDataFixMattes D2015-03-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed Bug in cChunkData.worktycho2015-03-101-1/+1
|/ / / / / / / / /
* | | | | | | | / Fixed client kick/crash if many block changes happendHowaner2015-03-091-3/+15
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #1794 from mc-server/MesaPlateauFMattes D2015-03-082-6/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Added parenthesis around the comparisonsSTRWarrior2015-03-081-2/+2
| * | | | | | | | Added proper trees to Mesa biomesSTRWarrior2015-03-081-6/+10
| * | | | | | | | Added grass/course dirt layer on MesaPlateauF(M)STRWarrior2015-03-081-0/+14
|/ / / / / / / /
* | | | | | | | Merge pull request #1784 from mc-server/SteppyHeiGenTiger Wang2015-03-063-1/+409
|\ \ \ \ \ \ \ \
| * | | | | | | | Steppy HeiGen: Fixed Linux compilation.Mattes D2015-03-011-1/+1
| * | | | | | | | Added Steppy height generator.Mattes D2015-03-013-1/+409
* | | | | | | | | Updated license year.Alexander Harkness2015-03-051-1/+1
* | | | | | | | | Merge pull request #1791 from joshi07/masterTiger Wang2015-03-052-2/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added OnEntityTeleport.lua hook to APIDumpjoshi072015-03-051-0/+29
| * | | | | | | | | Added description to APIDump for OnEntityTeleportjoshi072015-03-051-2/+2
* | | | | | | | | | Grass checks for sufficient light before spreadingAlexander Harkness2015-03-051-1/+13
* | | | | | | | | | Merge pull request #1790 from joshi07/masterMattes D2015-03-058-12/+81
|\| | | | | | | | |
| * | | | | | | | | Added OnTeleportEntity hook for plugins.joshi072015-03-058-12/+81
|/ / / / / / / / /
* | | | | | | | | Lua API: Fixed md5 and sha1 hex formatting.Mattes D2015-03-031-4/+4
* | | | | | | | | Merge pull request #1781 from mc-server/VinesMattes D2015-03-013-0/+122
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Removed trailing whitespaceSTRWarrior2015-03-011-1/+1
| * | | | | | | | Replaced IntNoiseXX with IntNoiseXXIntSTRWarrior2015-03-011-2/+2
| * | | | | | | | Replaced cFinishGenPtr with std::make_sharedSTRWarrior2015-03-011-1/+1
| * | | | | | | | Made the minimum vine level configurableSTRWarrior2015-02-283-4/+7
| * | | | | | | | Implemented a vines finisher that creates vines in jungle biomesSTRWarrior2015-02-283-0/+119
* | | | | | | | | Merge pull request #1780 from DevToaster/masterMattes D2015-03-012-53/+53
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Changed C-styled casts to static_cast and removed unneeded castsDevToaster2015-02-281-34/+34
| * | | | | | | | Replaced short int with int for Player experienceDevToaster2015-02-281-1/+1
| * | | | | | | | modified: src/Entities/Player.cppDevToaster2015-02-282-27/+27
* | | | | | | | | Debuggers plugin: Disabled WECUI manipulation.Mattes D2015-03-011-1/+2
* | | | | | | | | Fixed raspi easyinstall.Alexander Harkness2015-03-011-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1769 from mc-server/snowweatherNiLSPACE2015-02-284-114/+220
|\ \ \ \ \ \ \ \
| * | | | | | | | GetSnowStartHeight returns an intSTRWarrior2015-02-282-2/+2
| * | | | | | | | changed int to unsignedSTRWarrior2015-02-262-4/+4
| * | | | | | | | Ice finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior2015-02-251-26/+19
| * | | | | | | | Snow finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior2015-02-251-22/+14
| * | | | | | | | Weather: Snow starts forming when the top block is at the right height or higherSTRWarrior2015-02-251-66/+57
| * | | | | | | | Added GetSnowStartHeightSTRWarrior2015-02-252-0/+130
* | | | | | | | | Merge pull request #1779 from mc-server/DoorHingesFixMattes D2015-02-281-4/+17
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed door placement.Mattes D2015-02-281-4/+17
|/ / / / / / / /
* | | | | | | | Merge pull request #1778 from mc-server/OreXPAlexander Harkness2015-02-281-0/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | Added experience drops when mining oresSTRWarrior2015-02-281-0/+59
|/ / / / / / / /
* | | | | | | | Merge pull request #1771 from Raekye/masterMattes D2015-02-261-10/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | use DoSetSpeed in AddSpeed* in Entity.cppRaekye2015-02-261-10/+4
|/ / / / / / /
* | | | | | | Fixed flowing water turning into ice when snowingSTRWarrior2015-02-251-1/+1
* | | | | | | Merge pull request #1762 from mc-server/LuaStringCompressMattes D2015-02-252-0/+172
|\ \ \ \ \ \ \
| * | | | | | | Added documentation for CompressStringZLIBSTRWarrior2015-02-231-1/+1
| * | | | | | | Fixed operatorsSTRWarrior2015-02-231-6/+6
| * | | | | | | Added forgotten indentSTRWarrior2015-02-231-2/+2
| * | | | | | | Replaced lua_isXYZ with cLuaState::CheckParamXYZSTRWarrior2015-02-231-12/+13
| * | | | | | | Documented cStringCompressionSTRWarrior2015-02-231-2/+21
| * | | | | | | Exported all compression functions in a new class.STRWarrior2015-02-231-16/+129
| * | | | | | | Documented CompressString and UncompressStringSTRWarrior2015-02-221-0/+2
| * | | | | | | Exported CompressString and UncompressString to LuaSTRWarrior2015-02-221-0/+37
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 1.8 Protocol: Fixed a possible race condition.Mattes D2015-02-241-5/+9
* | | | | | | Fixed race condition for TCP link deleting.Mattes D2015-02-221-2/+6
* | | | | | | Merge pull request #1760 from Samvbnm/patch-1Mattes D2015-02-221-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update COMPILING.mdSamvbnm2015-02-221-1/+1
| * | | | | | Update COMPILING.mdSamvbnm2015-02-211-1/+2
| * | | | | | Update COMPILING.mdSamvbnm2015-02-211-1/+1
|/ / / / / /
* | | | | | Door handler: Removed needless check.Mattes D2015-02-211-1/+1
* | | | | | Fix door placement checkFreddie Wang2015-02-211-7/+3
* | | | | | Merge pull request #1758 from mc-server/CryptoHashAPIMattes D2015-02-214-19/+190
|\ \ \ \ \ \
| * | | | | | Added cCryptoHash namespace to Lua API.Mattes D2015-02-214-19/+190
* | | | | | | Merge pull request #1755 from mc-server/NetworkUDPMattes D2015-02-2117-51/+1591
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | APIDump: Added the UDP zero port policy.Mattes D2015-02-201-1/+1
| * | | | | | Network tests: Fixed clang warnings.Mattes D2015-02-203-3/+3
| * | | | | | UDPEndpointImpl: Fixed clang warnings.Mattes D2015-02-201-3/+3
| * | | | | | cNetwork: Added UDP API.Mattes D2015-02-2014-48/+1588
* | | | | | | Fixed monster spawn randomness.Mattes D2015-02-201-1/+2
* | | | | | | Fixed crash when logging nil values.Matyas Dolak2015-02-201-0/+32
* | | | | | | Flower pots: In 1.8 items are saved with the name and not the id.Howaner2015-02-181-5/+12
|/ / / / / /
* | | | | | NetworkSingleton: LibEvent thread is joined properly on server exit.Mattes D2015-02-182-7/+5
* | | | | | InfoReg: Fixed MultiCommand return values.Mattes D2015-02-181-2/+1
* | | | | | Network: Fixed two-socket servers.Mattes D2015-02-181-1/+1
* | | | | | Merge pull request #1750 from tommysanterre/gitignoreMattes D2015-02-181-0/+6
|\ \ \ \ \ \
| * | | | | | Ignore files generated on buildTommy Santerre2015-02-181-0/+6
|/ / / / / /
* | | | | | Merge pull request #1748 from Creaprog/patch-1Mattes D2015-02-161-2/+4
|\ \ \ \ \ \
| * | | | | | Fixed guest.htmlCreaprog2015-02-161-1/+1
| * | | | | | Fixed guest.htmlCreaprog2015-02-161-2/+4
|/ / / / / /
* | | | | | Fixed guest page.Alexander Harkness2015-02-161-2/+16
* | | | | | Merge pull request #1741 from Creaprog/patch-2Alexander Harkness2015-02-161-4/+4
|\ \ \ \ \ \
| * | | | | | Fixed Server.cppCreaprog2015-02-161-1/+1
| * | | | | | Fixed Server.cppCreaprog2015-02-151-4/+3
| * | | | | | Fixed Server.cppCreaprog2015-02-151-0/+1
| * | | | | | Fixed Server.cppCreaprog2015-02-151-4/+4
| * | | | | | Fixed Server.cppCreaprog2015-02-151-4/+4
|/ / / / / /
* | | | | | Merge pull request #1740 from Creaprog/patch-1Mattes D2015-02-151-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed login_template.htmlCreaprog2015-02-151-1/+1
|/ / / / / /
* | | | | | Fixed TCP link shutdown.Mattes D2015-02-143-11/+71
* | | | | | SslContext: Turned debug messages off.Mattes D2015-02-141-1/+1
* | | | | | Fixed Linux compilation.Mattes D2015-02-142-2/+2
* | | | | | Exported TLS server start on cTCPLink to Lua API.Mattes D2015-02-135-10/+292
* | | | | | Exported cTCPLink:Close and :Shutdown() to Lua API.Mattes D2015-02-132-13/+85
* | | | | | PolarSSL++: Fixed debugging output.Mattes D2015-02-121-0/+3
* | | | | | Fixed Linux compilation.Mattes D2015-02-121-1/+1
* | | | | | LuaAPI: Added client TLS support for TCP links.Mattes D2015-02-1212-8/+395
* | | | | | Update COMPILING.mdMattes D2015-02-081-2/+2
| |_|_|_|/ |/| | | |
* | | | | Protocol 1.7: Fixed Coverity issues.Mattes D2015-02-081-4/+7
* | | | | ServerHandle: Fixed socket reuse.Mattes D2015-02-081-10/+30
* | | | | WSSAnvil: Fixed chunk data padding.Mattes D2015-02-081-2/+5
* | | | | Merge pull request #1729 from mc-server/ReuseFlagMattes D2015-02-081-1/+14
|\ \ \ \ \
| * | | | | Use evutil_make_listen_socket_reuseableHowaner2015-02-071-16/+6
| * | | | | Set reuse flag to socketsHowaner2015-02-071-1/+24
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1718 from mc-server/LuaNetworkAPIMattes D2015-02-0720-3/+2453
|\ \ \ \ \
| * | | | | APIDump: Added client and server examples.Mattes D2015-02-071-0/+137
| * | | | | APIDump: Added cNetwork documentation.Mattes D2015-02-062-1/+184
| * | | | | NetworkTest plugin: updated comments and splash loading.Mattes D2015-02-041-7/+10
| * | | | | LuaServerHandle: Removed debugging output.Mattes D2015-02-041-4/+0
| * | | | | Exported cServerHandle and cNetwork:Listen to Lua.Mattes D2015-02-0415-15/+1145
| * | | | | cNetwork: Exported lookup functions to Lua API.Mattes D2015-02-047-3/+282
| * | | | | NetworkTest plugin: Added cNetwork:Connect test code.Mattes D2015-02-042-0/+109
| * | | | | cTCPLink: Fixed missing addresses on link connection.Mattes D2015-02-041-2/+2
| * | | | | cNetwork: Exported the Connect() method and cTCPLink class to Lua.Mattes D2015-02-048-1/+614
| |/ / / /
* | | | | Merge pull request #1727 from mc-server/EntitiesMattes D2015-02-074-8/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SpacingHowaner2015-02-071-1/+1
| * | | | Updated IsOnGround() documentationHowaner2015-02-071-1/+1
| * | | | cPlayer should override IsOnGround()Howaner2015-02-072-3/+3
| * | | | Added IsOnGround() to cEntityHowaner2015-02-072-6/+9
|/ / / /
* | | | Switched LuaState to use sizeof...tycho2015-01-311-15/+1
* | | | Merge pull request #1713 from mc-server/UseLibeventMattes D2015-01-3048-2071/+1363
|\ \ \ \
| * | | | Fixed listening ports not closed on cServerHandle::Close.Mattes D2015-01-271-0/+3
| * | | | Fixed server failure to open any port not aborting the server.Mattes D2015-01-271-29/+35
| * | | | Fixed a deadlock in cClientHandle network sending.Mattes D2015-01-272-5/+28
| * | | | Added network termination called at app exit.Mattes D2015-01-276-17/+90
| * | | | cTCPLinkImpl: Added the BEV_OPT_THREADSAFE flag.Mattes D2015-01-271-2/+8
| * | | | ServerHandleImpl: Removed needless diagnostic output.Mattes D2015-01-271-4/+0
| * | | | Client: Only decode protocol when there's actual data incoming.Mattes D2015-01-271-2/+8
| * | | | Added LibEvent license to the binary distribution pack.Mattes D2015-01-271-0/+99
| * | | | Fix clang compile errorworktycho2015-01-271-1/+1
| * | | | Removed cFile::ReplaceFileNameInvalidChars().Mattes D2015-01-273-27/+3
| * | | | Fixed enchant packet handling.Mattes D2015-01-271-3/+3
| * | | | Turned off echo in Windows script.Mattes D2015-01-271-0/+1
| * | | | RCONServer: Changed variables to UInt32.Mattes D2015-01-272-32/+29
| * | | | Replaced atoi() with StringToInteger().Mattes D2015-01-275-9/+11
| * | | | Removed ListenThread and SocketThreads.Mattes D2015-01-275-1225/+0
| * | | | BlockingSslClientSocket: Migrated to cNetwork API.Mattes D2015-01-273-15/+198
| * | | | Converted cServer to use the cNetwork API.Mattes D2015-01-278-413/+330
| * | | | cNetwork: Fixed IP address reading for incoming connections.Mattes D2015-01-271-1/+2
| * | | | Protocol18: Fixed failure with invalig logfile names.Mattes D2015-01-271-8/+15
| * | | | cFile: Added ReplaceFileNameInvalidChars().Mattes D2015-01-272-0/+26
| * | | | StringUtils: Fixed bad predicate in MergeStringVectors().Mattes D2015-01-271-1/+1
| * | | | RCON server: fixed compilation.Mattes D2015-01-271-1/+1
| * | | | Fixed RCONClient compilation.Mattes D2015-01-273-14/+55
| * | | | Migrated RCON server to cNetwork API.Mattes D2015-01-272-100/+116
| * | | | Fixed a crash in RCON server.Mattes D2015-01-271-1/+0
| * | | | Fixed missing LibEvent reference in OSSupport.Mattes D2015-01-271-1/+1
| * | | | WebAdmin uses the new cNetwork API.Mattes D2015-01-278-203/+237
| * | | | IniFile: Added common code to migrate ports.Mattes D2015-01-272-4/+56
| * | | | StringUtils: Added string vector manipulation.Mattes D2015-01-272-1/+54
* | | | | Updated PolarSSL.Matyas Dolak2015-01-291-0/+0
* | | | | CheckBasicStyle: Fixed a forgotten file close.Mattes D2015-01-291-0/+1
* | | | | Fixed missing LibEvent reference in OSSupport.Mattes D2015-01-291-1/+1
* | | | | Updated PolarSSL.Mattes D2015-01-271-0/+0
* | | | | Updated LibEvent.Mattes D2015-01-271-0/+0
|/ / / /
* | | | Debuggers: Logging the os.clock for console-scheduled tasks.Matyas Dolak2015-01-271-3/+6
* | | | Merge pull request #1716 from Raekye/masterMattes D2015-01-261-6/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix logic bug in cChunk::FastSetBlock filtering out leaves meta changesRaekye2015-01-261-7/+9
| * | | filter out leaves meta changes from being sent to the clientRaekye2015-01-261-0/+4
|/ / /
* | | Gamosocm supportAlexander Harkness2015-01-241-2/+1
* | | Merge pull request #1701 from mc-server/libeventMattes D2015-01-2423-8/+2292
|\ \ \
| * | | cNetwork: Added self pointers to keep objects alive for callbacks.Mattes D2015-01-235-17/+39
| * | | cNetwork: Renamed callback to OnConnected()Mattes D2015-01-223-4/+7
| * | | cNetwork: Added link creation callback.Mattes D2015-01-226-26/+90
| * | | cNetwork: Changed listening API.Mattes D2015-01-225-51/+79
| * | | cNetwork: Added error message to error callbacks.Mattes D2015-01-228-21/+28
| * | | cTCPLinkImpl: Fixed type conversion warning.Mattes D2015-01-223-5/+5
| * | | cNetwork: Fixed race conditions with lookups; proper shutdown.Mattes D2015-01-227-82/+124
| * | | cNetwork: Split the main cpp file into several files.Mattes D2015-01-2214-1052/+1170
| * | | cNetwork: Fixed WinXP dualstack listening.Mattes D2015-01-221-21/+42
| * | | cNetwork: Split cNetworkSingleton to a separate file.Mattes D2015-01-225-326/+442
| * | | cNetwork: Fixed WSAStartup()-not-called error in Listen().Mattes D2015-01-221-0/+3
| * | | cNetwork: Handle WSA initialization failures.Mattes D2015-01-221-1/+7
| * | | cNetwork: Added an OnError callback for listening servers.Mattes D2015-01-223-0/+13
| * | | cNetwork: Rewritten server listen into a factory method.Mattes D2015-01-221-88/+102
| * | | cNetwork: Removed unneeded dependency.Mattes D2015-01-221-1/+0
| * | | cNetwork: Refactored cTCPLinkImpl::Connect into a factory.Mattes D2015-01-221-41/+48
| * | | cNetwork: Cosmetics.Mattes D2015-01-221-6/+10
| * | | cNetwork: Fixed compilation in out-of-source builds.Mattes D2015-01-221-0/+3
| * | | cNetwork: Fixed compilation.Mattes D2015-01-221-9/+8
| * | | Wrap debug variable in ifdef worktycho2015-01-221-0/+2
| * | | cNetwork: Added error logging to server socket creation.Mattes D2015-01-221-6/+24
| * | | cNetwork: Added multithreading protection.Mattes D2015-01-223-4/+35
| * | | cNetwork: Implemented connection shutdown and close.Mattes D2015-01-223-18/+74
| * | | cNetwork: Fixed Linux compilation.Mattes D2015-01-222-6/+24
| * | | cNetwork: Implemented link address getting.Mattes D2015-01-222-61/+121
| * | | cNetwork: Implemented basic server functionality.Mattes D2015-01-222-123/+282
| * | | cNetwork: Implemented IP-to-hostname lookup.Mattes D2015-01-222-11/+130
| * | | cNetwork: Implemented HostnameToIP lookups.Mattes D2015-01-226-9/+256
| * | | Excluded PolarSSL tests from MCS tests.Mattes D2015-01-221-1/+2
| * | | Added newline to logged messages in the tests.Mattes D2015-01-221-8/+12
| * | | Extracted Google connection testTycho2015-01-225-74/+113
| * | | cNetwork: Linux compilation fix.Mattes D2015-01-222-4/+23
| * | | Implemented LibEvent-based client connections.Mattes D2015-01-224-0/+1028
| * | | Added the libevent library.Mattes D2015-01-224-1/+15
* | | | Merge pull request #1712 from UltraCoderRU/fix_coverityMattes D2015-01-236-3/+52
|\ \ \ \
| * | | | Fixed defect #43662 in Coverity list.Kirill Kirilenko2015-01-231-1/+17
| * | | | Fixed defect #43665 in Coverity list.Kirill Kirilenko2015-01-231-0/+11
| * | | | Fixed defect #73101 in Coverity list.Kirill Kirilenko2015-01-231-1/+13
| * | | | Fixed defect #43671 in Coverity list.Kirill Kirilenko2015-01-231-0/+4
| * | | | Fixed defect #43661 in Coverity list.Kirill Kirilenko2015-01-231-1/+2
| * | | | Fixed defect #71781 in Coverity list.Kirill Kirilenko2015-01-231-0/+5
|/ / / /
* | | | ProtoProxy: Added socket startup error reporting.Matyas Dolak2015-01-231-3/+31
* | | | Fixed negative return values in SchematicFileSerializer.Matyas Dolak2015-01-231-1/+3
|/ / /
* | | Merge pull request #1708 from mc-server/WarningFixesMattes D2015-01-2214-310/+384
|\ \ \
| * | | Fixed warnings in StringUtils.Mattes D2015-01-212-49/+59
| * | | ProtoProxy: Fixed warnings in Connection.cpp.Matyas Dolak2015-01-211-87/+89
| * | | ByteBuffer: Added support for reading unsigned shorts and ints.Matyas Dolak2015-01-212-1/+33
| * | | ProtoProxy: Fixed warnings in Connection.cpp.Matyas Dolak2015-01-212-16/+24
| * | | Fixed warnings in FastNBT.cpp.Mattes D2015-01-201-39/+40
| * | | Fixed warnings in 1.7 protocol.Mattes D2015-01-183-110/+131
| * | | Fixed various warnings.Mattes D2015-01-183-8/+8
| * | | cWorld: Fixed a type warning.Mattes D2015-01-181-1/+1
|/ / /
* | | Fixed type conversion warnings.Mattes D2015-01-182-4/+4
* | | Merge pull request #1702 from mc-server/chronoMattes D2015-01-18117-260/+262
|\ \ \
| * | | Fixed type-conversion warnings.Mattes D2015-01-184-8/+8
| * | | correct comment to say millisecondsworktycho2015-01-171-1/+1
| * | | Converted Monster to std::chronoTycho2015-01-164-18/+18
| * | | Converted cPickupEntity to std::chronoTycho2015-01-162-12/+12
| * | | Converted MinecartEntity to std::chronoTycho2015-01-162-8/+8
| * | | Converted cExpOrbEntity to std::chronoTycho2015-01-162-7/+7
| * | | Converted ArrowEntityTiers to std::chronoTycho2015-01-162-7/+7
| * | | Fix trailing whitespaceTycho2015-01-111-1/+1
| * | | Initial convertion of a_Dt to std::chronoTycho2015-01-11117-221/+221
| * | | Created new type cTickTime and rewrote cWorld::TickThread to use itTycho2015-01-112-6/+8
* | | | Merge pull request #1707 from UltraCoderRU/masterMattes D2015-01-178-11/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed CppCheck: (performance) Prefer prefix ++/-- operators for non-primitive types.Kirill Kirilenko2015-01-172-2/+2
| * | | Fixed CppCheck: (performance) Possible inefficient checking for emptiness.Kirill Kirilenko2015-01-174-5/+5
| * | | Fixed CppCheck: (performance) Function parameter should be passed by reference.Kirill Kirilenko2015-01-172-4/+4
|/ / /
* | | CMake: Check libs in submodules before configuring.Mattes D2015-01-091-0/+8
* | | Fixed Linux compilation.Mattes D2015-01-032-2/+2
* | | Protocols: Ignore garbage data at the end of PluginMessage packets.Mattes D2015-01-032-0/+21
* | | cByteBuffer: Improved SingleThreadAccessChecker performance.Mattes D2015-01-031-1/+6
* | | Merge pull request #1691 from tonibm19/patch-3Mattes D2014-12-301-0/+2
|\ \ \
| * | | Use cRoot:Get():GetServer():GetNumPlayers() instead of a custom function.tonibm192014-12-301-9/+1
| * | | Added player count to webadmintonibm192014-12-291-0/+10
|/ / /
* | | Add make as a required program for *nixworktycho2014-12-261-2/+2
* | | MobHead: Fixed wither spawning.Mattes D2014-12-251-13/+40
* | | ProtoProxy: Log block change packet details.Mattes D2014-12-251-0/+3
* | | MobHeads: fixed regular head placement.Mattes D2014-12-251-2/+22
* | | Merge pull request #1687 from mc-server/StyleCheckTravisMattes D2014-12-252-0/+6
|\ \ \
| * | | Travis style check in the right folder.Mattes D2014-12-251-1/+3
| * | | Travis: Added lua installation before build.Mattes D2014-12-251-0/+3
| * | | Added basic style checking to Travis builds.Mattes D2014-12-251-0/+1
|/ / /
* | | Fixed tools compilation.Mattes D2014-12-253-0/+5
* | | Fixed door placement.Mattes D2014-12-252-3/+4
* | | Fixed forgotten big flower handler.Mattes D2014-12-251-1/+2
* | | Fixed basic style.Mattes D2014-12-254-23/+71
* | | APIDump: Added details about client handle in OnServerPing hook.Mattes D2014-12-251-1/+4
* | | cIsThread: Fixed a race condition on thread start.Mattes D2014-12-252-7/+30
* | | Merge pull request #1686 from mc-server/PlaceBlockRefactorMattes D2014-12-2548-786/+1489
|\ \ \
| * | | APIDump: Updated the player block placement documentation.Mattes D2014-12-244-11/+14
| * | | Fixed redstone dust placement on upside-down slabs.Mattes D2014-12-241-1/+36
| * | | Replaced a std::hash specialization with explicit type.Mattes D2014-12-242-8/+4
| * | | gcc compilation fix.Mattes D2014-12-241-1/+6
| * | | Refactored all player block placing to go through hooks.Mattes D2014-12-2443-775/+1423
| * | | Added Vector3::TurnCW() and Vector3::TurnCCW()Mattes D2014-12-241-0/+16
* | | | ByteBuffer: SingleThreadAccessChecker is request-only.Mattes D2014-12-241-1/+10
|/ / /
* | | Fixed too many slashes.Alexander Harkness2014-12-231-1/+1
* | | Better installation script.Alexander Harkness2014-12-231-5/+3
* | | Fixed armhf download URL.Alexander Harkness2014-12-231-1/+1
* | | Init Mojang API pointerworktycho2014-12-231-0/+1
* | | Merge pull request #1684 from jonfabe/DepthStriderMattes D2014-12-223-1/+17
|\ \ \
| * | | Fix compile error on OS X introduced by commit ecf778bbec2794562bf5e5b8645e2171f7cd081cJonathan Fabian2014-12-221-1/+1
| * | | Added Depth Strider enchantmentJonathan Fabian2014-12-222-0/+16
|/ / /
* | | ProtoProxy: Added a sanity check to metadata string lengths.Mattes D2014-12-211-2/+6
* | | MCADefrag: Added a sanity check for chunk size.Mattes D2014-12-211-1/+1
* | | WSSAnvil: Added clamping to entity coords.Mattes D2014-12-211-3/+3
* | | FastNBT: Added a sanity check for number of list items.Mattes D2014-12-211-1/+8
* | | cChunk: Fixed missing initialization.Mattes D2014-12-211-0/+2
* | | cWorld: Moved initialization into constructor.Mattes D2014-12-211-3/+2
* | | cEndGen: Fixed unitialized member variables.Mattes D2014-12-211-1/+3
* | | cNoise3DComposable: Fixed unitialized member variables.Mattes D2014-12-211-1/+3
* | | Fixed coverity issues in protocols.Mattes D2014-12-212-4/+11
* | | Fixed a possible division by zero.Mattes D2014-12-213-6/+16
* | | Fixed crash on restartTiger Wang2014-12-212-5/+14
* | | Merge pull request #1682 from Masy98/entitiesMattes D2014-12-2115-92/+203
|\ \ \
| * | | Fixed damn empty line with no useMasy982014-12-202-5/+1
| * | | Added Rabbit.h and Rabbit.cpp to the CMakeListMasy982014-12-201-0/+2
| * | | Fixed Rabbit sizeMasy982014-12-201-1/+1
| * | | Added RabbitsMasy982014-12-2014-92/+205
* | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-12-2117-1/+150
|\| | |
| * | | Merge pull request #1680 from Masy98/entitiesMattes D2014-12-1916-1/+149
| |\ \ \
| | * | | Fixed Guardians size and healthMasy982014-12-193-1/+8
| | * | | Guardian can now spawn if wanted!?Masy982014-12-182-2/+2
| | * | | Merge branch 'master' into entitiesMasy982014-12-1837-2880/+2822
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1679 from SphinxC0re/masterMattes D2014-12-181-0/+1
| |\ \ \ \
| | * | | | Added itemblacklist to gitignoreJulian Laubstein2014-12-171-0/+1
| |/ / / /
| | * | | Added Entity GuardianMasy982014-12-1817-2/+143
* | | | | Fix repeater unpoweringTiger Wang2014-12-181-2/+4
|/ / / /
* | | | Merge pull request #1677 from mc-server/GlobalFixesMattes D2014-12-171-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | derpHowaner2014-12-171-1/+1
| * | | Added comment.Howaner2014-12-171-1/+1
| * | | Fixed eMonsterType lua bugs.Howaner2014-12-171-0/+1
|/ / /
* | | Merge pull request #1674 from gushromp/masterMattes D2014-12-171-8/+7
|\ \ \
| * | | Removed unneeded newlinesIvan Đorđević2014-12-171-6/+0
| * | | Merge branch 'master' of https://github.com/gushromp/MCServergushromp2014-12-161-0/+1
| |\ \ \
| | * | | Fixed water from spreading on bottom of worldgushromp2014-12-161-5/+8
| * | | | Fixed water from spreading on bottom of worldgushromp2014-12-161-7/+11
| |/ / /
* | | | Merge pull request #1581 from mc-server/redstoneMattes D2014-12-1725-2864/+2645
|\ \ \ \ | |/ / / |/| | |
| * | | NULL -> nullptrTiger Wang2014-12-175-18/+22
| * | | Removed testTiger Wang2014-12-133-176/+0
| * | | Merge branch 'master' into redstoneTiger Wang2014-12-13232-5012/+11651
| |\ \ \ | | | |/ | | |/|
| * | | Fixed compilation?Tiger Wang2014-11-011-3/+4
| * | | Improved redstone simulatorTiger Wang2014-10-292-818/+808
| * | | Cleaned up simulatorsTiger Wang2014-10-2517-2681/+2644
| * | | Fixed some block checksTiger Wang2014-10-252-4/+3
* | | | Updated Core.Mattes D2014-12-161-0/+0
* | | | Merge pull request #1673 from gushromp/masterMattes D2014-12-151-0/+6
|\ \ \ \
| * | | | Added braces to 'if' according to the code guidelinesgushromp2014-12-151-0/+2
| * | | | Updated cPlayer::DoMoveToWorld to send target world's weather info to Playerblashyrk2014-12-151-0/+4
|/ / / /
* | | | Fixed mob invisibilityHowaner2014-12-141-1/+0
* | | | Merge pull request #1635 from mc-server/CocoaMattes D2014-12-146-4/+158
|\ \ \ \
| * \ \ \ Merge branch 'master' into CocoaHowaner2014-12-142-5/+26
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | "& 0x0f" isn't neededHowaner2014-12-142-3/+3
| * | | | FixesHowaner2014-12-134-5/+22
| * | | | Merge branch 'master' into CocoaHowaner2014-12-13104-1751/+2182
| |\ \ \ \
| * | | | | Added cocoa pod.Howaner2014-12-015-2/+139
* | | | | | Merge pull request #1670 from Masy98/craftingFranz Reiter2014-12-142-3/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fixed fence/-gates and door recipes and added baked potato recipeMasy982014-12-142-3/+4
|/ / / / /
* | | | | Clang needs the libstdc++ that comes with gcc-4.8Tycho2014-12-131-3/+5
* | | | | final syntax errorsTycho2014-12-131-5/+4
* | | | | Double equalsTycho2014-12-131-5/+5
* | | | | Fix forgoten thensTycho2014-12-131-4/+4
* | | | | "Don't set compiler to gcc on clang builds"Tycho2014-12-131-4/+5
* | | | | Merge pull request #1664 from mc-server/SandstoneCavesMattes D2014-12-131-3/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | WormNestCaves occasionally generates sandstone around the caveSTRWarrior2014-12-131-3/+22
| | |_|/ | |/| |
* | | | Merge pull request #1663 from mc-server/APIDumpSizeAlexander Harkness2014-12-131-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Made comment in example code smallerSTRWarrior2014-12-131-1/+3
| * | | Reverted main_APIDump.lua changesSTRWarrior2014-12-131-4/+4
| * | | Fixed the width sometimes going over the div sizeSTRWarrior2014-12-131-4/+4
* | | | Merge pull request #1660 from Seadragon91/masterMattes D2014-12-121-1/+1
|\ \ \ \
| * | | | Fixed print of milliseconds from chronoLukas Pioch2014-12-121-1/+1
* | | | | Updated the Core.Mattes D2014-12-121-0/+0
* | | | | LightingThread: Fixed a memory leak.Mattes D2014-12-121-2/+2
* | | | | Exported cWorld:PrepareChunk to Lua API, test in Debuggers.Mattes D2014-12-122-1/+73
|/ / / /
* | | | Debuggers: Added loadchunk and preparechunk commands.Mattes D2014-12-112-0/+87
* | | | Debuggers: Changed to use Info.lua file.Mattes D2014-12-112-33/+222
* | | | Merge pull request #1657 from mc-server/PrepareChunkMattes D2014-12-1111-51/+293
|\ \ \ \ | |/ / / |/| | |
| * | | Added a cWorld:PrepareChunk function.Mattes D2014-12-109-51/+260
| * | | Lighting thread: skip chunks that are already lit.Mattes D2014-12-101-0/+10
| * | | Added a RemoveIf() function to cQueueMattes D2014-12-091-0/+23
* | | | Cosmetic touchups.Mattes D2014-12-115-10/+11
* | | | Merge remote-tracking branch 'planetx/master'Mattes D2014-12-112-5/+33
|\ \ \ \
| * | | | Check to see if header write out is requiredplanetx2014-12-081-17/+15
| * | | | Added timestamp to merged files WSSAnvilplanetx2014-12-081-1/+1
| * | | | Added timestamp to merged files WSSAnvilplanetx2014-12-081-62/+62
| * | | | Added timestamp to new files WSSAnvilplanetx2014-12-082-79/+149
| * | | | Added Timestamp info to chunks in WSSAnvilplanetx2014-12-072-87/+47
* | | | | Fixed DungeonRooms edges not generating sometimes.Mattes D2014-12-111-2/+2
* | | | | Merge pull request #1655 from tonibm19/patch-2Mattes D2014-12-101-1/+1
|\ \ \ \ \
| * | | | | Moved NetherOreNeststonibm192014-12-101-1/+1
| * | | | | Added NetherOreNests to nether default generator.tonibm192014-12-081-1/+1
* | | | | | Merge pull request #1623 from p-mcgowan/issue_1253Mattes D2014-12-108-3/+94
|\ \ \ \ \ \
| * | | | | | Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin()Vincent2014-12-101-1/+1
| * | | | | | Fixed return value in CheckMultiLogin()Vincent2014-12-091-1/+2
| * | | | | | Fixed indent problems and added return definitions to CheckMultiLogin().Vincent2014-12-093-7/+8
| * | | | | | Changed DoWithPlayer to auto instead of using iterator.Vincent2014-12-091-2/+2
| * | | | | | Changed CheckMultiLogin() to not have main body wrapped in an if statement.Vincent2014-12-084-21/+28
| * | | | | | created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World.Vincent2014-12-082-2/+9
| * | | | | | Fixed compile errorsVincent2014-12-086-18/+14
| * | | | | | removed last space in handlehandshakeVincent2014-12-081-1/+0
| * | | | | | Changed HandleHandshake to return the result of CheckMultiLogin instead of just true since it already returns true if it finds and kicks the current player.Vincent2014-12-081-24/+23
| * | | | | | Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added.Vincent2014-12-084-23/+52
| * | | | | | Merge branch 'issue_1253' of https://github.com/p-mcgowan/MCServer into issue_1253Vincent2014-12-071-5/+5
| |\ \ \ \ \ \
| | * | | | | | Changed Kick messagevincentleung12014-11-301-2/+2
| | * | | | | | removed extra space and fixed some formatting in cCallbackvincentleung12014-11-301-3/+3
| * | | | | | | changed from using iterator to auto for server and clienthandleVincent2014-12-072-4/+4
| |/ / / / / /
| * | | | | | removed GetUsernames() from WorldVincent2014-11-302-18/+0
| * | | | | | Uses callback for players already in World.Vincent2014-11-301-5/+12
| * | | | | | fixed naming of strings and changed from i to IVincent2014-11-295-13/+18
| * | | | | | issue 1253 - prevent multiple logins with same usernameVincent2014-11-295-0/+58
* | | | | | | Fixed compiling.Howaner2014-12-091-1/+1
* | | | | | | Moved NaturalPatches in front of PreSimulator and Animals.Mattes D2014-12-081-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #1654 from tonibm19/patch-1Alexander Harkness2014-12-081-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Added NaturalPatches to finisherstonibm192014-12-081-1/+1
|/ / / / /
* | | | | Merge pull request #1563 from mc-server/c++11EventsMattes D2014-12-074-143/+72
|\ \ \ \ \
| * | | | | cMojangAPI: Fixed a possible problem with thread termination order.Mattes D2014-12-071-5/+17
| * | | | | Fixed integer overflow problems.Mattes D2014-12-072-4/+4
| * | | | | Merge remote-tracking branch 'origin/master' into c++11EventsMattes D2014-12-07178-3914/+5859
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Fixed format warning.Mattes D2014-12-071-2/+2
* | | | | | Fixed crash on server stop.Mattes D2014-12-071-0/+9
* | | | | | Fixed c++11 branch issues.Mattes D2014-12-078-45/+59
* | | | | | Merge pull request #1555 from mc-server/c++11Mattes D2014-12-0749-1248/+353
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-12-0637-149/+695
| |\ \ \ \ \ \
| * | | | | | | Tools: Removed unused Timer.* file from CMakeLists.txt.Mattes D2014-12-042-4/+1
| * | | | | | | CheckBasicStyle: Doesn't report false positives ending in a keyword.Mattes D2014-12-041-5/+5
| * | | | | | | Fixed trailing whitespace.Mattes D2014-12-042-6/+6
| * | | | | | | Merged branch 'origin/master' into c++11.Mattes D2014-12-0475-339/+1070
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed indent.Mattes D2014-12-031-2/+2
| * | | | | | | | Server: Fixed a MSVC warning.Mattes D2014-12-031-1/+1
| * | | | | | | | ByteBuffer: Re-added Single-thread access checker.Mattes D2014-12-032-0/+90
| * | | | | | | | Merge remote-tracking branch 'origin-master' into c++11Tiger Wang2014-11-2632-1653/+1688
| * | | | | | | | Removed unnecessary #includesTiger Wang2014-11-232-2/+0
| * | | | | | | | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-2399-1589/+7139
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Compilation fixesTiger Wang2014-11-235-15/+11
| * | | | | | | | | Update GCC on TravisTiger Wang2014-11-232-24/+20
| * | | | | | | | | Merged branch 'master' into c++11.Mattes D2014-10-2447-193/+310
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | SuggestionsTiger Wang2014-10-247-10/+50
| * | | | | | | | | Added FastRandom.* back to CMakeLists.txt.Mattes D2014-10-231-0/+2
| * | | | | | | | | Merged branch 'master' into c++11.Mattes D2014-10-2351-526/+819
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Compile fix?Tiger Wang2014-10-213-6/+0
| * | | | | | | | | | Missing EOL.Alexander Harkness2014-10-211-1/+1
| * | | | | | | | | | Alignment.Alexander Harkness2014-10-211-6/+6
| * | | | | | | | | | Missing space.Alexander Harkness2014-10-211-1/+1
| * | | | | | | | | | Missing space fix.Alexander Harkness2014-10-211-1/+1
| * | | | | | | | | | Compile fix?Tiger Wang2014-10-212-4/+2
| * | | | | | | | | | Windows close handlers handles more closesTiger Wang2014-10-211-5/+2
| * | | | | | | | | | Replace &*[0] accesses with .data()Tiger Wang2014-10-213-8/+8
| * | | | | | | | | | En masse NULL -> nullptr replaceTiger Wang2014-10-20211-1439/+1439
| * | | | | | | | | | Use std::recusive_mutexTiger Wang2014-10-203-52/+9
| * | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-10-2036-234/+281
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Migrated cSleep and cTimer to std::chronoTiger Wang2014-10-2018-168/+45
| * | | | | | | | | | | Migrated random generators to std::randomTiger Wang2014-10-1916-556/+102
| * | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-10-1939-496/+260
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use std::threadTiger Wang2014-10-1913-432/+59
* | | | | | | | | | | | | Reduced river heightSTRWarrior2014-12-071-2/+2
* | | | | | | | | | | | | Fixed error message in cFinishGenPassiveMobsSTRWarrior2014-12-071-1/+1
* | | | | | | | | | | | | Replaced most auto_ptr with unique_ptr.Mattes D2014-12-062-62/+62
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1647 from mc-server/SocketThreadsFixMattes D2014-12-061-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixes socket leak in HTTP server.Mattes D2014-12-031-3/+11
* | | | | | | | | | | | FinishGenPassiveMobs: Cosmetic changes.Mattes D2014-12-052-30/+33
* | | | | | | | | | | | Merge pull request #1642 from p-mcgowan/animalTerrainFinisherMattes D2014-12-055-3/+274
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | formatting and default spawn percentagep-mcgowan2014-12-051-1/+2
| * | | | | | | | | | | | Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisherp-mcgowan2014-12-0538-184/+496
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | CheckBasicStyle: Check missing braces for control statements.Mattes D2014-12-051-0/+19
* | | | | | | | | | | | | BasicStyle: Added missing braces to control statements.Mattes D2014-12-0517-54/+241
* | | | | | | | | | | | | CheckBasicStyle: Added a check for parentheses around comparisons.Mattes D2014-12-051-0/+22
* | | | | | | | | | | | | Fixed reported parentheses around comparisons.Mattes D2014-12-0514-83/+99
* | | | | | | | | | | | | Merge pull request #1649 from jonfabe/InfoDumpFixMattes D2014-12-051-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix duplicate commands added to README.mdJonathan Fabian2014-12-051-1/+12
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1648 from mc-server/CraftingLuaFixMattes D2014-12-046-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed the CRAFTING_NO_RECIPE hook call.Mattes D2014-12-046-6/+6
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1638 from p-mcgowan/cactiNoLongerSpawnOnBeachesMattes D2014-12-042-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | conflict resolutionp-mcgowan2014-12-048-40/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1645 from jonfabe/SpectatorModeFixesMattes D2014-12-042-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Updated whitespace in comment, changed conditional to logical equivalent due to popular demandJonathan Fabian2014-12-041-2/+2
| * | | | | | | | | | | | Fix Spaces to TabsJonathan Fabian2014-12-031-5/+5
| * | | | | | | | | | | | Add missing IsSpectatorMode() checks in Player.cpp, make sure that player is flying when spawned otherwise it will fall through the world.Jonathan Fabian2014-12-031-6/+11
| * | | | | | | | | | | | Allow Spectator Gamemode as a world default.Jonathan Fabian2014-12-031-1/+1
* | | | | | | | | | | | | Merge pull request #1646 from p-mcgowan/luaCheckstyleWarningsMattes D2014-12-034-34/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clearing CheckBasicStyle.lua messagesp-mcgowan2014-12-034-34/+34
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1640 from p-mcgowan/mooshroomMobSpawnerRuleMattes D2014-12-031-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | updated mooshroom check for myceliump-mcgowan2014-12-021-1/+1
| * | | | | | | | | | | | extra formatting parenthesesp-mcgowan2014-12-021-2/+2
| * | | | | | | | | | | | added spawning rule to mooshroomp-mcgowan2014-12-021-0/+13
* | | | | | | | | | | | | Merge pull request #1634 from mc-server/DungeonSpawnersMattes D2014-12-021-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fixed forgotten semicolonSTRWarrior2014-12-021-1/+1
| * | | | | | | | | | | | Using IntNoise3DInt instead of IntNoise3DSTRWarrior2014-12-021-1/+1
| * | | | | | | | | | | | Suggestions by xoftSTRWarrior2014-12-021-3/+3
| * | | | | | | | | | | | Using static cast for Dungeon spawnersSTRWarrior2014-12-011-1/+1
| * | | | | | | | | | | | Dungeons spawners now spawn mobsSTRWarrior2014-12-011-1/+22
| | * | | | | | | | | | | reformat for lua and CIp-mcgowan2014-12-022-6/+9
| | * | | | | | | | | | | formatting and commenting fixesp-mcgowan2014-12-022-6/+6
| | * | | | | | | | | | | cacti no longer spawn outside of desert variantsp-mcgowan2014-12-012-1/+16
| |/ / / / / / / / / / / |/| | | | | | | | | | |
| | * | | | | | | | | | reformatp-mcgowan2014-12-051-9/+5
| | * | | | | | | | | | restructure, with logic this timep-mcgowan2014-12-051-5/+13
| | * | | | | | | | | | restructured random animals, added check for desert (update as per wiki)p-mcgowan2014-12-051-19/+17
| | * | | | | | | | | | handle non-vanilla dimensionsp-mcgowan2014-12-051-2/+2
| | * | | | | | | | | | handle non-vanilla dimensionsp-mcgowan2014-12-051-2/+3
| | * | | | | | | | | | formatting fixesp-mcgowan2014-12-051-4/+11
| | * | | | | | | | | | format blocks and randomizingp-mcgowan2014-12-042-9/+9
| | * | | | | | | | | | last doxy fixp-mcgowan2014-12-041-3/+3
| | * | | | | | | | | | added p-mcgowan to contributorsp-mcgowan2014-12-041-0/+1
| | * | | | | | | | | | awful comment fixing, randomizer fixp-mcgowan2014-12-042-19/+32
| | * | | | | | | | | | class description and doxy-commentingp-mcgowan2014-12-032-5/+8
| | * | | | | | | | | | doxy-commentingp-mcgowan2014-12-031-3/+3
| | * | | | | | | | | | forgot generation defaul initp-mcgowan2014-12-031-1/+1
| | * | | | | | | | | | forgot initializerp-mcgowan2014-12-031-1/+5
| | * | | | | | | | | | typos and oversights for lua and CIp-mcgowan2014-12-021-1/+5
| | * | | | | | | | | | fastRandom unusedp-mcgowan2014-12-021-1/+0
| | * | | | | | | | | | indentation, repeatable random, small correctionsp-mcgowan2014-12-021-98/+93
| | * | | | | | | | | | fix comments after replacing spaces with tabsp-mcgowan2014-12-021-4/+4
| | * | | | | | | | | | animal terrain finisherp-mcgowan2014-12-022-187/+187
| | * | | | | | | | | | animal terrain finisherp-mcgowan2014-12-022-0/+241
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1636 from mc-server/MineshaftSpawnersAlexander Harkness2014-12-011-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Using static cast for MineShaft spawnersSTRWarrior2014-12-011-1/+1
| * | | | | | | | | | Mineshaft spawners now spawn cave spidersSTRWarrior2014-12-011-1/+4
|/ / / / / / / / / /
* | | | | | | | | | Simplefied SoulsandRimsSTRWarrior2014-12-011-36/+6
* | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2014-12-0131-181/+637
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Updated coreHowaner2014-12-011-0/+0
| * | | | | | | | | Reverted bad .gitignore changeHowaner2014-12-011-1/+1
| * | | | | | | | | Merge pull request #1602 from mc-server/MobSpawnerMattes D2014-12-0131-182/+638
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | MobSpawner fixes.Howaner2014-12-017-6/+14
| | * | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-12-017-22/+46
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-11-3017-13/+134
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Removed old MobType category.Howaner2014-11-291-8/+1
| | * | | | | | | | | | Removed unused imports.Howaner2014-11-292-2/+0
| | * | | | | | | | | | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.Howaner2014-11-2913-122/+137
| | * | | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-11-2983-2253/+3204
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Finished mob spawner implementation.Howaner2014-11-1818-124/+78
| | * | | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-11-18415-12388/+11874
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed compile errors.Howaner2014-09-272-42/+42
| | * | | | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-09-26186-4062/+10585
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Implemented mob spawner.Howaner2014-09-1911-67/+393
| | * | | | | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-09-1925-103/+293
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Created MobSpawnerEntity class.Howaner2014-09-174-1/+165
* | | | | | | | | | | | | | | Added better soulsand rimsSTRWarrior2014-12-015-12/+107
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1624 from mc-server/LuaDeprecatingMattes D2014-12-014-20/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed old StringToMobType() function from Monster.cppHowaner2014-11-301-10/+0
| * | | | | | | | | | | | | | Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() insteadHowaner2014-11-293-10/+40
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | DistortedHeightmap: Added missing initialization.Mattes D2014-12-011-0/+2
* | | | | | | | | | | | | | Noise3D: Fixed missing initialization.Mattes D2014-12-011-1/+3
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Hopefully fixed random build failsSTRWarrior2014-11-301-1/+1
* | | | | | | | | | | | | Fixed a crash in cSpawnPrepare.Mattes D2014-11-301-0/+2
* | | | | | | | | | | | | Fixed nether ceilingSTRWarrior2014-11-301-1/+1
* | | | | | | | | | | | | Fixed compiling on linux.Howaner2014-11-301-0/+1
* | | | | | | | | | | | | Improved comments for cWorld::DoWithPlayer().Mattes D2014-11-302-2/+3
* | | | | | | | | | | | | Merge pull request #1626 from mc-server/StackTraceOnFailureMattes D2014-11-309-7/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed MCADefrag compilation.Mattes D2014-11-291-0/+8
| * | | | | | | | | | | | | Removed unneeded include.Mattes D2014-11-291-1/+0
| * | | | | | | | | | | | | Fixed QtBiomeVisualiser compilation.Mattes D2014-11-292-3/+17
| * | | | | | | | | | | | | Fixed missing files in ProtoProxy.Mattes D2014-11-291-0/+8
| * | | | | | | | | | | | | Added a basic stacktracing for assert and signal failures.Mattes D2014-11-295-4/+73
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1622 from M10360/masterMattes D2014-11-293-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added M10360.M103602014-11-291-0/+1
| * | | | | | | | | | | | | Smelting Netherrack not TallGrass gives you NetherBrickItem.M103602014-11-291-1/+1
| * | | | | | | | | | | | | Added missing fuels.M103602014-11-291-0/+19
| * | | | | | | | | | | | | Removed duplicate.M103602014-11-291-1/+0
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / Update coreHowaner2014-11-291-0/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1619 from mc-server/WarningFixesMattes D2014-11-2826-63/+68
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Chunk: Fixed same-name iterators.Mattes D2014-11-271-5/+5
| * | | | | | | | | | | | OctavedNoise: Another unshadowed local variable.Mattes D2014-11-271-9/+11
| * | | | | | | | | | | | Minecart.h: Fixed integral conversion warning.Mattes D2014-11-271-1/+1
| * | | | | | | | | | | | RidgedNoise: Replaced fabs with std::abs().Mattes D2014-11-271-2/+2
| * | | | | | | | | | | | OctavedNoise: Unshadowed a local variable.Mattes D2014-11-271-10/+12
| * | | | | | | | | | | | BlockEntities: Removed the extra semicolon.Mattes D2014-11-2716-24/+25
| * | | | | | | | | | | | Replaced auto_ptr with unique_ptr.Mattes D2014-11-272-6/+6
| * | | | | | | | | | | | CompoGenBiomal: Fixed signed vs unsigned comparison.Mattes D2014-11-271-1/+1
| * | | | | | | | | | | | Fixed BlockStringToType return value.Mattes D2014-11-273-5/+5
|/ / / / / / / / / / / /
* | | | | | | | | | | | CMake: Fixed linux builds.Mattes D2014-11-261-5/+4
* | | | | | | | | | | | cRoot: Fixed a memory leak with cRankManager.Mattes D2014-11-262-3/+5
* | | | | | | | | | | | Windows: Fixed builds with LeakFinder enabled.Mattes D2014-11-262-2/+4
* | | | | | | | | | | | WSSAnvil: Fixed bad code in arrow loading.Mattes D2014-11-261-2/+8
* | | | | | | | | | | | Merge pull request #1617 from mc-server/ReachDistanceMattes D2014-11-251-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ClientHandle: Fixed max block place distance check.Mattes D2014-11-251-4/+10
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1604 from mc-server/GeneratorShapeRefactorMattes D2014-11-2430-1532/+1578
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added TwoHeights shape generator.Mattes D2014-11-235-8/+162
| * | | | | | | | | | | | Noise3D generator: Enlarged averaging to avoid steep beach slopes.Mattes D2014-11-232-4/+4
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactorMattes D2014-11-237-2/+156
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | cWorld: Changed generator defaults.Mattes D2014-11-201-13/+17
| * | | | | | | | | | | | BiomalNoise3D generator: finished all biomes.Mattes D2014-11-201-66/+74
| * | | | | | | | | | | | CompoGenBiomal: Fixed sealevel offset.Mattes D2014-11-201-1/+1
| * | | | | | | | | | | | CompoGenBiomal: Fixed sealevel not generating properly.Mattes D2014-11-201-1/+2
| * | | | | | | | | | | | Generators: Unified SeaLevel into a single variable.Mattes D2014-11-203-70/+3
| * | | | | | | | | | | | Noise3D generators: Changed noise generator to InterpolNoise.Mattes D2014-11-202-10/+10
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactorMattes D2014-11-2038-593/+1483
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Mobs: Fixed crash with terrain too high.Mattes D2014-11-152-5/+7
| * | | | | | | | | | | | | Generator: Fixed crash with trees too high.Mattes D2014-11-151-2/+7
| * | | | | | | | | | | | | Snow generator: Fixed failure at top of the world.Mattes D2014-11-151-1/+1
| * | | | | | | | | | | | | ChunkDesc: Fixed comment about indexing.Mattes D2014-11-151-1/+1
| * | | | | | | | | | | | | DungeonRooms: Changed to work with the new shape generators.Mattes D2014-11-151-10/+15
| * | | | | | | | | | | | | Gen refactor: Implemented CompositedHeiGen.Mattes D2014-11-139-217/+141
| * | | | | | | | | | | | | Generator: Shape initial refactoring.Mattes D2014-11-1223-1346/+1356
* | | | | | | | | | | | | | Merge pull request #1611 from mc-server/SpawnPrepareMattes D2014-11-242-120/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Changed back capitalization.Mattes D2014-11-241-3/+3
| * | | | | | | | | | | | | cWorld: Rewritten spawn preparation.Mattes D2014-11-222-120/+113
* | | | | | | | | | | | | | Merge pull request #1612 from p-mcgowan/pigsIntoZombiePigmenOnLightningMattes D2014-11-232-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | formatting - newline at EOF inserted: Pig.cppp-mcgowan2014-11-231-1/+5
| * | | | | | | | | | | | | | pigs turn into pigmen on lightningp-mcgowan2014-11-232-0/+19
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1610 from p-mcgowan/villagersIntoWitchOnLightningMattes D2014-11-221-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | formatter errorp-mcgowan2014-11-221-3/+3
| * | | | | | | | | | | | | | villagers turn into witches on lightningp-mcgowan2014-11-221-2/+4
| * | | | | | | | | | | | | | villagers turn into witches when struck by lightningp-mcgowan2014-11-221-0/+5
| |/ / / / / / / / / / / / /
* / / / / / / / / / / / / / InfoReg: Added a diagnostic for bad Info.lua command info.Mattes D2014-11-221-0/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1594 from mc-server/LargeOakTreeMattes D2014-11-203-2/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Changed commentSTRWarrior2014-11-161-1/+1
| * | | | | | | | | | | | First implementation for the LargeOakTreeSTRWarrior2014-11-133-2/+125
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1603 from mc-server/ImprovedNoiseMattes D2014-11-2028-544/+1282
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | cInterpolNoise: Implemented optimized 2D generating.Mattes D2014-11-193-32/+219
| * | | | | | | | | | | cOctavedNoise: Removed misleading comment, fixed assert texts.Mattes D2014-11-191-3/+3
| * | | | | | | | | | | cOctavedNoise: Added a forgotten comment.Mattes D2014-11-181-1/+1
| * | | | | | | | | | | Added a cInterpolNoise template for faster noise generator.Mattes D2014-11-183-4/+439
| * | | | | | | | | | | Moved all Noise-related files into a separate folder.Mattes D2014-11-1826-80/+56
| * | | | | | | | | | | Refactored cRidgedNoise into a separate template.Mattes D2014-11-185-243/+104
| * | | | | | | | | | | OctavedNoise: linux compilation fixes.Mattes D2014-11-182-2/+3
| * | | | | | | | | | | Added cOctavedNoise template.Mattes D2014-11-173-258/+206
| * | | | | | | | | | | Fixed include path.Mattes D2014-11-171-1/+1
| * | | | | | | | | | | Added cImprovedNoise implementation.Mattes D2014-11-174-46/+376
* | | | | | | | | | | | Merge pull request #1598 from mc-server/SignEditorMattes D2014-11-187-21/+85
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use cLuaState's stack trace.Howaner2014-11-171-48/+27
| * | | | | | | | | | | Added UpdateSign() method to DeprecatedBindings.cppHowaner2014-11-172-3/+88
| * | | | | | | | | | | Use LastPlacedSign instead of LastPlacedBlock.Howaner2014-11-153-9/+6
| * | | | | | | | | | | Updated APIDumpHowaner2014-11-151-2/+3
| * | | | | | | | | | | Fixed a security problem with signs.Howaner2014-11-155-16/+18
* | | | | | | | | | | | Fixed a wrong assert in cClientHandle::SetViewDistance().Mattes D2014-11-171-4/+8
* | | | | | | | | | | | BiomalNoise3D: Added more biomes.Mattes D2014-11-161-13/+65
* | | | | | | | | | | | Merge pull request #1577 from mc-server/ViewDistanceMattes D2014-11-166-16/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Renamed m_UsedViewDistance to m_CurrentViewDistanceHowaner2014-11-152-11/+11
| * | | | | | | | | | | Renamed m_SetViewDistance to m_RequestedViewDistanceHowaner2014-11-152-7/+7
| * | | | | | | | | | | Renamed GetSettedViewDistance() to GetRequestedViewDistance()Howaner2014-11-153-4/+4
| * | | | | | | | | | | Updated APIDumpHowaner2014-11-141-0/+1
| * | | | | | | | | | | Use m_UsedViewDistance and m_SetViewDistance.Howaner2014-11-143-15/+26
| * | | | | | | | | | | Merge branch 'master' into ViewDistanceHowaner2014-11-1441-547/+4763
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ... in this worldHowaner2014-10-301-1/+1
| * | | | | | | | | | | | Added a MaxViewDistance option.Howaner2014-10-303-1/+16
* | | | | | | | | | | | | APIDump: Fixed example cCompositeChat URLHowaner2014-11-141-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Noise3D: Added jungles.Mattes D2014-11-141-0/+2
* | | | | | | | | | | | Noise3D: Added oceans.Mattes D2014-11-131-0/+3
* | | | | | | | | | | | Fixed trailing whitespace.Mattes D2014-11-123-3/+3
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | BiomalNoise3D: Added a few biomes.Mattes D2014-11-101-5/+8
* | | | | | | | | | | TallGrassGenerator: Fixed crash when too highSTRWarrior2014-11-101-0/+5
* | | | | | | | | | | Added BiomalNoise3D shape generator.Mattes D2014-11-104-29/+369
* | | | | | | | | | | Noise3d Generator: Fixed unused function error.Mattes D2014-11-091-1/+1
* | | | | | | | | | | Noise3D generator: rewritten from scratch.Mattes D2014-11-092-78/+145
* | | | | | | | | | | Travis badge uses master branch.Alexander Harkness2014-11-081-1/+1
* | | | | | | | | | | Added gratipay badge.Alexander Harkness2014-11-081-1/+1
* | | | | | | | | | | Noise3D CompoGen: Fixed missing initialization.Mattes D2014-11-061-0/+2
* | | | | | | | | | | Merge branch 'DoWithPlayerByUUID'Mattes D2014-11-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed an extra space.Mattes D2014-11-061-1/+1
| * | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerLukas Pioch2014-11-0517-368/+1024
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServerMattes D2014-11-0618-369/+1025
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #1587 from Ambushed91/WebAdminAlexander Harkness2014-11-054-45/+36
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update V1.0.9Ambushed912014-11-053-44/+36
| | * | | | | | | | | | | Update V1.0.3Ambushed912014-11-052-3/+2
* | | | | | | | | | | | | renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDumpLukas Pioch2014-11-056-10/+13
* | | | | | | | | | | | | Simplified FindAndDoWithUUID, formatted lineLukas Pioch2014-11-022-8/+2
* | | | | | | | | | | | | Added FindAndDoWithUUIDLukas Pioch2014-11-025-0/+46
| | | | | | | | | | | | * cEvent: Changed chrono duration resolution.Mattes D2014-11-041-1/+1
| | | | | | | | | | | | * cEvent: Changed steady_clock to system_clock.Mattes D2014-11-041-2/+2
| | | | | | | | | | | | * Merge branch 'master' into c++11EventsMattes D2014-11-0457-923/+4978
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | WebAdmin: Fixed login template destination address.Mattes D2014-11-041-1/+1
| * | | | | | | | | | | | Merge remote-tracking branch 'ambushed/WebAdmin'Mattes D2014-11-0416-293/+703
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Update template.luaArian2014-11-041-70/+81
| | * | | | | | | | | | | Update template.luaArian2014-10-281-6/+5
| | * | | | | | | | | | | Update login_template.htmlArian2014-10-281-110/+62
| | * | | | | | | | | | | Update style.cssArian2014-10-281-4/+4
| | * | | | | | | | | | | Update login.cssArian2014-10-281-4/+4
| | * | | | | | | | | | | Update login.cssArian2014-10-281-1/+1
| | * | | | | | | | | | | Update guest.htmlArian2014-10-281-3/+2
| | * | | | | | | | | | | Update template.luaArian2014-10-281-2/+21
| | * | | | | | | | | | | Update login_template.htmlArian2014-10-271-58/+108
| | * | | | | | | | | | | Update login.cssArian2014-10-271-1/+218
| | * | | | | | | | | | | Update style.cssArian2014-10-271-1/+432
| | * | | | | | | | | | | Update template.luaArian2014-10-271-0/+1
| | * | | | | | | | | | | Update login_template.htmlArian2014-10-271-0/+1
| | * | | | | | | | | | | Update style.cssArian2014-10-271-0/+1
| | * | | | | | | | | | | Update login.cssArian2014-10-271-0/+1
| | * | | | | | | | | | | Update template.luaAmbushed912014-10-271-6/+10
| | * | | | | | | | | | | Update template.luaAmbushed912014-10-271-90/+75
| | * | | | | | | | | | | Update template.htmlAmbushed912014-10-271-125/+136
| | * | | | | | | | | | | Update login_template.htmlAmbushed912014-10-271-58/+61
| | * | | | | | | | | | | Update style.cssAmbushed912014-10-271-1024/+1
| | * | | | | | | | | | | Update login.cssAmbushed912014-10-271-378/+1
| | * | | | | | | | | | | Update login.cssAmbushed912014-10-271-1/+378
| | * | | | | | | | | | | Update temp.htmlAmbushed912014-10-271-99/+0
| | * | | | | | | | | | | Update guest.htmlAmbushed912014-10-271-5/+3
| | * | | | | | | | | | | Update login.cssAmbushed912014-10-231-442/+1
| | * | | | | | | | | | | Update template.luaAmbushed912014-10-231-4/+1
| | * | | | | | | | | | | Update style.cssAmbushed912014-10-231-1/+1
| | * | | | | | | | | | | Update login.cssAmbushed912014-10-231-2/+2
| | * | | | | | | | | | | Update login_template.htmlAmbushed912014-10-231-4/+1
| | * | | | | | | | | | | Update temp.htmlAmbushed912014-10-231-1/+1
| | * | | | | | | | | | | Update login_template.htmlAmbushed912014-10-231-3/+1
| | * | | | | | | | | | | Update (original).htmlAmbushed912014-10-231-4/+4
| | * | | | | | | | | | | Update style.cssAmbushed912014-10-231-1/+1
| | * | | | | | | | | | | Update guest.htmlAmbushed912014-10-231-1/+1
| | * | | | | | | | | | | Update WebAdminAmbushed912014-10-2318-401/+1699
| * | | | | | | | | | | | MinMax heigen: Reduced the number of octaves.Mattes D2014-11-041-2/+0
| * | | | | | | | | | | | Added MinMax height generator.Mattes D2014-11-041-0/+207
| * | | | | | | | | | | | Fixed a missing endline.Mattes D2014-11-031-1/+5
| * | | | | | | | | | | | Added a (disabled) perf test for biome generators.Mattes D2014-11-031-0/+46
| * | | | | | | | | | | | HeiGen: Moved construction to the end of file.Mattes D2014-11-031-75/+75
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1569 from mc-server/GrownBiomesMattes D2014-11-029-78/+3140
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Grown biomes: fixed Linux build.Mattes D2014-11-021-3/+3
| * | | | | | | | | | | | Grown biomes: Unified with GrownProt biomes.Mattes D2014-11-023-159/+595
| * | | | | | | | | | | | GrownProt: Added the rest of rare and M biomes.Mattes D2014-11-012-14/+91
| * | | | | | | | | | | | GrownProt biome gen: Added biome edges.Mattes D2014-11-012-2/+162
| * | | | | | | | | | | | Merge branch 'master' into GrownBiomesMattes D2014-10-314-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | GrownProt biomes: added alterations.Mattes D2014-10-313-130/+192
| * | | | | | | | | | | | | QtBiomeVisualiser: Fixed default zoom selection.Mattes D2014-10-311-5/+1
| * | | | | | | | | | | | | QtBiomeVisualiser: Set start zoom to 25%, just like AMIDST.Mattes D2014-10-301-1/+3
| * | | | | | | | | | | | | QtBiomeVisualiser: Added a prototyping int generator flavor.Mattes D2014-10-306-53/+1256
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into GrownBiomesMattes D2014-10-304-12/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Grown biomes: made biomes smaller, made beaches smaller.Mattes D2014-10-291-11/+8
| * | | | | | | | | | | | | Merged branch 'master' into GrownBiomes.Mattes D2014-10-2827-478/+693
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cIntGen: Added a virtual destructor.Mattes D2014-10-271-0/+4
| * | | | | | | | | | | | | | Removed too advanced C++11 features.Mattes D2014-10-272-32/+28
| * | | | | | | | | | | | | | IntGen: Attempt at fixing Linux compilation.Mattes D2014-10-261-13/+13
| * | | | | | | | | | | | | | BioGenGrown: Smaller biomes, add land to map center.Mattes D2014-10-262-16/+13
| * | | | | | | | | | | | | | Fixed a copypasta error in cIntGenAddToOcean.Mattes D2014-10-261-4/+4
| * | | | | | | | | | | | | | Added a missing header to CMakeLists.Mattes D2014-10-261-0/+1
| * | | | | | | | | | | | | | Added new biomegen: GrownMattes D2014-10-265-67/+1122
| * | | | | | | | | | | | | | Added IsBiomeVeryCold() and IsBiomeCold() functions.Mattes D2014-10-262-0/+71
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed it yet again.Alexander Harkness2014-11-021-1/+1
* | | | | | | | | | | | | | Files found.Alexander Harkness2014-11-021-1/+1
* | | | | | | | | | | | | | Use screen instaead.Alexander Harkness2014-11-021-2/+2
* | | | | | | | | | | | | | Added nohup.Alexander Harkness2014-11-021-0/+1
* | | | | | | | | | | | | | CMake: Added a C++11 check for VS.Mattes D2014-11-021-0/+15
* | | | | | | | | | | | | | Fixed wrong url.Alexander Harkness2014-11-011-1/+1
* | | | | | | | | | | | | | Added DO easy-installAlexander Harkness2014-11-011-0/+2
* | | | | | | | | | | | | | Merge pull request #1580 from mc-server/doinstallAlexander Harkness2014-11-011-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Create app.ymlAlexander Harkness2014-11-011-0/+10
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | cLuaState: Fixed errors on non-existent callbacks.Mattes D2014-10-311-1/+5
* | | | | | | | | | | | | Fixed missing CS lock in cChunkMap::WakeUpSimulatorsInArea().Mattes D2014-10-311-0/+1
* | | | | | | | | | | | | Update README.mdAlexander Harkness2014-10-311-1/+1
* | | | | | | | | | | | | Fixed m_SentChunks list chunk removing.Howaner2014-10-301-1/+1
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1576 from mc-server/QtBiomeVisualiserThreadedGenMattes D2014-10-302-9/+72
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | QtBiomeVisualiser: Generator uses all machine threads.Mattes D2014-10-292-9/+72
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1575 from mc-server/1.8-ItemMattes D2014-10-292-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed 1.8 world item format reading.Howaner2014-10-292-3/+25
|/ / / / / / / / / / /
* | | | | | | | | | | QtBiomeVisualiser: Added quick shutdown to region loaders.Mattes D2014-10-283-1/+18
* | | | | | | | | | | QtBiomeVisualiser: Fixed mouse zoom vs menu zoom.Mattes D2014-10-281-1/+2
* | | | | | | | | | | Merge pull request #1574 from mc-server/QtBiomeVisualiserRegionsMattes D2014-10-2817-439/+568
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | QtBiomeVisualiser: Reduced memory usage.Mattes D2014-10-284-182/+156
| * | | | | | | | | | | QtBiomeVisualiser: Fixed random regions not rendered.Mattes D2014-10-282-0/+4
| * | | | | | | | | | | Merged remote-tracking branch 'origin/master'.Mattes D2014-10-287-33/+65
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | QtBiomeVisualiser: Attempt at fixing Linux compilation.Mattes D2014-10-281-1/+1
| * | | | | | | | | | | | QtBiomeVisualiser: Switched caching to entire regions.Mattes D2014-10-2715-249/+409
* | | | | | | | | | | | | Forgotten m_SendChunksMediumPriority.empty() check.Howaner2014-10-281-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | QtBiomeVisualiser: Fixed compilation on Linux.Mattes D2014-10-284-5/+14
* | | | | | | | | | | | Merge pull request #1573 from mc-server/warningfixesMattes D2014-10-286-32/+64
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed compile (typos).Alexander Harkness2014-10-271-2/+2
| * | | | | | | | | | | Comment alignment.Alexander Harkness2014-10-272-8/+8
| * | | | | | | | | | | CheckBasicStyle'dAlexander Harkness2014-10-274-32/+32
| * | | | | | | | | | | Another one.#Alexander Harkness2014-10-271-0/+22
| * | | | | | | | | | | Fixed more warnings.Alexander Harkness2014-10-271-14/+14
| * | | | | | | | | | | Another switch.Alexander Harkness2014-10-271-0/+5
| * | | | | | | | | | | Fix missing biomes in enum.Alexander Harkness2014-10-271-0/+5
| * | | | | | | | | | | Fixed remaining warnings.Alexander Harkness2014-10-271-5/+5
| * | | | | | | | | | | Actually fixed the warning.Alexander Harkness2014-10-271-20/+9
| * | | | | | | | | | | Test warning fix.Alexander Harkness2014-10-271-0/+11
|/ / / / / / / / / / /
* | | | | | | | | | | Fixed typo.Alexander Harkness2014-10-271-1/+1
* | | | | | | | | | | Pocess?Alexander Harkness2014-10-271-2/+2
* | | | | | | | | | | Merge pull request #1568 from mc-server/TypedBlocktypesAlexander Harkness2014-10-261-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added type to block type enum.Mattes D2014-10-261-1/+11
|/ / / / / / / / / / /
* | | | | | | | | | | APIDump: Added basic projectile documentation.Mattes D2014-10-251-6/+18
* | | | | | | | | | | shorter easy-install commandAlexander Harkness2014-10-251-1/+1
|/ / / / / / / / / /
| | | | | | | | | * Moved the chrono include into Globals.Mattes D2014-10-242-1/+2
| | | | | | | | | * Added a missing chrono include.Mattes D2014-10-241-0/+1
| | | | | | | | | * Merge branch 'master' into c++11EventsMattes D2014-10-2445-190/+305
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1565 from mc-server/MergedIniFileMattes D2014-10-2435-71/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | IniFile: Removed the problematic printf-like Set function.Mattes D2014-10-242-20/+0
| * | | | | | | | | | Fixed formatstringworktycho2014-10-241-1/+1
| * | | | | | | | | | IniFile: Removed an unused macro.Mattes D2014-10-231-4/+0
| * | | | | | | | | | QtBiomeVisualiser: Moved the IniFile lib.Mattes D2014-10-234-5/+5
| * | | | | | | | | | Removed iniFile library from linux dependencies.Mattes D2014-10-232-2/+2
| * | | | | | | | | | Merged IniFile into main MCS sources.Mattes D2014-10-2329-40/+29
* | | | | | | | | | | OSSupport/CMakeLists.txt: fixed indentationarchshift2014-10-241-3/+3
* | | | | | | | | | | Fixed potential linker errors with mingw, as it isn't MSVC and it isn't APPLE.archshift2014-10-241-4/+4
* | | | | | | | | | | Fix linking on OS X, which does not have librt.archshift2014-10-231-2/+6
* | | | | | | | | | | Re-updated Core.Mattes D2014-10-231-0/+0
* | | | | | | | | | | Merge pull request #1500 from mc-server/ChunkLoaderMattes D2014-10-2311-117/+264
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use 3 priorities.Howaner2014-10-234-7/+45
| * | | | | | | | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-23240-2086/+2400
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Fixed a crash in redstone simulator.Mattes D2014-10-231-1/+0
| |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-2117-539/+474
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | style.Howaner2014-10-211-1/+2
| * | | | | | | | | | | Reverted plugin removeHowaner2014-10-214-0/+0
| * | | | | | | | | | | Fixed submodule downgradesHowaner2014-10-213-0/+0
| * | | | | | | | | | | Use two lists and 2 chunk send prioritys.Howaner2014-10-214-66/+40
| * | | | | | | | | | | New c++11 stuff.Howaner2014-10-211-4/+4
| * | | | | | | | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-21130-2313/+1951
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added distance check.Howaner2014-10-071-0/+12
| * | | | | | | | | | | | Stream 4 chunks per tick. Added priority.Howaner2014-10-067-29/+58
| * | | | | | | | | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-0637-645/+1059
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Better StreamNextChunk() methodHowaner2014-10-062-15/+120
| * | | | | | | | | | | | | Optimized chunk loaderHowaner2014-10-027-105/+93
| | | | | | | | | | | | | * Reimplemented cEvent using C++11 primitives.Mattes D2014-10-232-136/+51
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Removed the "conditional expression is constant" warning.Mattes D2014-10-231-2/+4
* | | | | | | | | | | | | Merge pull request #1562 from mc-server/signplaceMattes D2014-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Signs can be placed on wallsigns.Alexander Harkness2014-10-231-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1559 from mc-server/nullptrMattes D2014-10-23211-1746/+1768
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | En masse NULL -> nullptr replaceTiger Wang2014-10-23211-1746/+1768
|/ / / / / / / / / / / /
* | | | | | | | | | | | ComposableGenerator: Removed nullptr initializers.Mattes D2014-10-221-3/+3
* | | | | | | | | | | | Upgraded core.Alexander Harkness2014-10-221-0/+0
* | | | | | | | | | | | LuaState: Projectiles are pushed using their full class.Mattes D2014-10-221-1/+1
* | | | | | | | | | | | APIDump: Added docs for a few projectiles.Mattes D2014-10-221-5/+21
* | | | | | | | | | | | Clearer version indication.Alexander Harkness2014-10-221-1/+1
* | | | | | | | | | | | Added inheritance information to Lua docs for projectiles.Mattes D2014-10-211-6/+41
* | | | | | | | | | | | cItemFrame: Fixed a forgotten rename.Mattes D2014-10-212-2/+2
* | | | | | | | | | | | Merge pull request #1515 from mc-server/BlockFixesMattes D2014-10-215-36/+97
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reverted hook move.Howaner2014-10-211-5/+5
| * | | | | | | | | | | | Moved tall grass pickups handle.Howaner2014-10-212-9/+37
| * | | | | | | | | | | | Merge branch 'master' into BlockFixesHowaner2014-10-21132-2270/+1819
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Leaves are harvest-able.Howaner2014-10-071-2/+0
| * | | | | | | | | | | | Corrected drops from dead bush, tall grass and cobweb.Howaner2014-10-075-39/+64
| * | | | | | | | | | | | Corrected IsBlockAttachable() in BlockVine.hHowaner2014-10-071-5/+15
* | | | | | | | | | | | | Properly exported cItemFrame and cHangingEntity to Lua.Mattes D2014-10-2110-67/+100
* | | | | | | | | | | | | Fixed trailing whitespace.Mattes D2014-10-212-2/+2
* | | | | | | | | | | | | Exported individual projectile classes to Lua API.Mattes D2014-10-2118-221/+367
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merged branch 'master' of git://github.com/sriehl/MCServerMattes D2014-10-2117-540/+475
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | fix std:min call, include algorithm and compare same typeSteven Riehl2014-10-121-2/+2
| * | | | | | | | | | | refactor an if block to std::minSteven Riehl2014-10-121-4/+1
| * | | | | | | | | | | convert old style casts to fix warningsSteven Riehl2014-10-1217-549/+486
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Updated ProtectionAreasTiger Wang2014-10-211-0/+0
* | | | | | | | | | | cLuaState: cEntity is pushed with specific type.Mattes D2014-10-211-7/+48
* | | | | | | | | | | Updated the Core.Mattes D2014-10-201-0/+0
* | | | | | | | | | | InfoDump: Do not crash if one plugin fails to load.Mattes D2014-10-201-1/+5
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1554 from SphinxC0re/masterAlexander Harkness2014-10-201-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed #1550Julian Laubstein2014-10-201-6/+6
|/ / / / / / / / / /
* | | | | | | | | | Fixed a potential crash in cEntity bindings.Mattes D2014-10-201-2/+6
* | | | | | | | | | Merge pull request #1553 from SphinxC0re/workAlexander Harkness2014-10-202-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Found it!Julian Laubstein2014-10-201-1/+1
| * | | | | | | | | | Fix for fix #1552Julian Laubstein2014-10-201-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1552 from SphinxC0re/masterAlexander Harkness2014-10-202-1/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added error messageJulian Laubstein2014-10-202-9/+11
| * | | | | | | | | | Added error handling to load <plugin> commandJulian Laubstein2014-10-201-1/+11
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1549 from SphinxC0re/masterMattes D2014-10-197-16/+86
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed error with non-const functionJulian Laubstein2014-10-192-2/+2
| * | | | | | | | | | Added mechanics placeable on halfslabsJulian Laubstein2014-10-195-14/+84
* | | | | | | | | | | Removed obsolete tr1::shared_ptr.Mattes D2014-10-191-13/+2
* | | | | | | | | | | Fixed minor style issues.Mattes D2014-10-193-3/+3
* | | | | | | | | | | TwoLevel BioGen: fixed swapped inside and outside biomes.Mattes D2014-10-191-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Mountain height gen: Added ditches.Mattes D2014-10-192-8/+16
* | | | | | | | | | Generator: Rewritten to use SharedPtrs.Mattes D2014-10-1921-185/+149
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | cLuaState: cMonster descendants don't push their specific type.Mattes D2014-10-191-1/+10
* | | | | | | | | cLuaState: cBlockEntity descendants are pushed with proper class type.Mattes D2014-10-1917-26/+63
* | | | | | | | | LuaState: Pushing a cEntity pushes the correct class name.Mattes D2014-10-192-6/+8
* | | | | | | | | Bindings: Removed obsolete codegen files.Mattes D2014-10-193-237/+0
* | | | | | | | | Merge pull request #1502 from mc-server/furnacesTiger Wang2014-10-1819-227/+180
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fixed failure for cRankManager to restartTiger Wang2014-10-184-43/+44
| * | | | | | | | Furnaces now update their block entity typeTiger Wang2014-10-182-3/+5
| * | | | | | | | Simpler code.Alexander Harkness2014-10-181-3/+2
| * | | | | | | | Nullptr?Alexander Harkness2014-10-161-2/+2
| * | | | | | | | Fixed a number of stylistic issues.Alexander Harkness2014-10-161-7/+7
| * | | | | | | | Improved furnacesTiger Wang2014-10-0315-180/+131
* | | | | | | | | InfoDump: Fixed trailing whitespace.Mattes D2014-10-181-3/+3
* | | | | | | | | InfoDump: Fixed GH permission export, moved output to plugins.Mattes D2014-10-181-196/+225
* | | | | | | | | cMojangAPI: Don't update data if server is in offline mode.Mattes D2014-10-175-8/+12
* | | | | | | | | LuaChunkStay: Fixed a crash on unused callback.Mattes D2014-10-171-2/+6
* | | | | | | | | Merged branch 'fix_chunks'.Mattes D2014-10-162-3/+35
* | | | | | | | | Merge pull request #1541 from mc-server/VariadicTemplatesMattes D2014-10-161-3/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use universal referencesworktycho2014-10-161-4/+4
| * | | | | | | | | cLuaState::Call() uses variadic templates.Mattes D2014-10-151-3/+75
* | | | | | | | | | Merge pull request #1539 from mc-server/DungeonLootMattes D2014-10-162-6/+34
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into DungeonLootSTRWarrior2014-10-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | BioGen: Fixed a compiler warning.Mattes D2014-10-161-2/+2
* | | | | | | | | | | Merge pull request #1537 from mc-server/GenerationCrashMattes D2014-10-161-1/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed possible crashSTRWarrior2014-10-151-1/+8
|/ / / / / / / / / / /
| * | | | | | | | | | Changed i variable to jSTRWarrior2014-10-161-3/+10
| * | | | | | | | | | Reversed wrong fix for #1517.STRWarrior2014-10-161-8/+2
| * | | | | | | | | | Reversed the order of the lootSTRWarrior2014-10-151-7/+15
| * | | | | | | | | | Added loot to dungeons.STRWarrior2014-10-151-1/+27
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1536 from mc-server/MineshaftBooksMattes D2014-10-153-1/+46
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Using C++11 loopsSTRWarrior2014-10-151-5/+5
| * | | | | | | | | The code now prevents conflicting enchantments.STRWarrior2014-10-151-0/+1
| * | | | | | | | | IntNoise1DInt result gets devided by 7 firstSTRWarrior2014-10-151-1/+1
| * | | | | | | | | Adding enchantments directly instead of first getting the name of it.STRWarrior2014-10-151-1/+1
| * | | | | | | | | Renamed the counter to 'j'STRWarrior2014-10-151-1/+1
| * | | | | | | | | Returned cFastRandom and cEnchantment:GetRandomEnchantmentFromVector to beforeSTRWarrior2014-10-155-16/+36
| * | | | | | | | | Enchanted books generate in MineShafts chestsSTRWarrior2014-10-155-6/+30
* | | | | | | | | | Functions in cPluginManager get references instead of pointers.Mattes D2014-10-1529-181/+220
* | | | | | | | | | Usernames are lowercased before generating offline UUID.Mattes D2014-10-151-1/+4
|/ / / / / / / / /
* | | | | | | | | cWorld: Fixed scheduler.Mattes D2014-10-132-12/+34
* | | | | | | | | Fixed style.Mattes D2014-10-133-4/+7
* | | | | | | | | CheckBasicStyle ignores the Bindings.h generated file.Mattes D2014-10-131-0/+1
* | | | | | | | | Merge pull request #1529 from mc-server/unique_ptrMattes D2014-10-124-42/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Aligned simulatorsworktycho2014-10-121-5/+5
| * | | | | | | | | Fix styleworktycho2014-10-121-2/+2
| * | | | | | | | | Fix spacesworktycho2014-10-121-2/+2
| * | | | | | | | | Update World.cppworktycho2014-10-121-1/+1
| * | | | | | | | | Fix lambda captureworktycho2014-10-111-1/+2
| * | | | | | | | | Moved a few objects to unique_ptrtycho2014-10-104-39/+41
* | | | | | | | | | We only use VS2013 now, thus VS2008 is banished!archshift2014-10-121-3/+2
* | | | | | | | | | Added CLion project directory to .gitignorearchshift2014-10-121-0/+2
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Update README.mdAlexander Harkness2014-10-111-1/+1
* | | | | | | | | The longer URL has https, so we have to use that until the shortener has HTTPS.Alexander Harkness2014-10-111-1/+1
* | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServerAlexander Harkness2014-10-112-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Webadmin: use images already in files/ instead of inline image dataarchshift2014-10-112-5/+5
* | | | | | | | | | Added a guide to the easy install method.Alexander Harkness2014-10-111-3/+10
|/ / / / / / / / /
* | | | | | | | | Added easy installation method for Linux.Alexander Harkness2014-10-111-0/+17
* | | | | | | | | Merge pull request #1261 from mc-server/issue850Mattes D2014-10-112-55/+150
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed compilation.Alexander Harkness2014-10-111-1/+1
| * | | | | | | | | Merge branch 'master' into issue850Alexander Harkness2014-10-11472-18746/+26885
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reverted submodule changes.Alexander Harkness2014-10-112-0/+0
| * | | | | | | | | | Fixed typo and removed useless right side up slab meta.Alexander Harkness2014-10-111-2/+1
| * | | | | | | | | | Renamed NEWLEAVES and NEWLOG to LEAVES and LOG.archshift2014-07-301-34/+34
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into issue850archshift2014-07-29652-11439/+47867
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Spacing fixes and a few more BLOCK_META constants.narroo2014-07-021-131/+152
| * | | | | | | | | | | Fixed E_META_...Typos in BlockID.hnarroo2014-06-083-90/+80
| * | | | | | | | | | | Fixed some E_META_*** Namesnarroo2014-05-201-71/+67
| * | | | | | | | | | | Fixed Formmatingnarroo2014-04-281-69/+69
| * | | | | | | | | | | Added some E_META_* values to BlockID.hnarroo2014-04-281-20/+120
* | | | | | | | | | | | More README changes.Alexander Harkness2014-10-111-5/+2
* | | | | | | | | | | | Fixes.Alexander Harkness2014-10-111-2/+2
* | | | | | | | | | | | Fixed remaining indent and replaced tiger with webfreak.Alexander Harkness2014-10-111-107/+107
* | | | | | | | | | | | Merge pull request #1531 from win32re/patch-1Alexander Harkness2014-10-111-129/+134
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update template.htmlwin32re2014-10-111-3/+8
| * | | | | | | | | | | Fixed indentation.win32re2014-10-111-130/+131
| * | | | | | | | | | | More template changes.win32re2014-10-111-131/+130
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1528 from kjanku1/masterAlexander Harkness2014-10-111-0/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update strings.xmlKamil Janku2014-10-111-1/+1
| * | | | | | | | | | | Android strings transladed to polishkjanku12014-10-111-0/+13
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1530 from win32re/patch-1Alexander Harkness2014-10-111-4/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update template.htmlwin32re2014-10-111-4/+10
|/ / / / / / / / / /
* | | | | | | | | | Fixed MSVC compilation.Mattes D2014-10-102-1/+3
* | | | | | | | | | Merge pull request #1376 from mc-server/static_castarchshift2014-10-103-24/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Float/Ciel: If it's going to use C++11, it might as well take advantage of itarchshift2014-10-093-26/+12
| * | | | | | | | | | Use static casts instead of C casts, add floor-cast functionsarchshift2014-10-093-24/+55
|/ / / / / / / / / /
* | | | | | | | | | DistortedHeightmap: Fixed crash on number rounding.Mattes D2014-10-091-4/+5
* | | | | | | | | | Merge pull request #1520 from mc-server/c++11switchMattes D2014-10-091-4/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix flag name in gcc 4.6 and earlierworktycho2014-10-091-8/+32
| * | | | | | | | | | Enabled C++11 in gccworktycho2014-10-091-11/+9
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1519 from mc-server/submodulizeMattes D2014-10-0813-864/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reordered .gitmodules. Fixes #496Alexander Harkness2014-10-081-6/+6
| * | | | | | | | | | Added MagicCarpetAlexander Harkness2014-10-082-0/+3
| * | | | | | | | | | Removed MagicCarpetAlexander Harkness2014-10-082-178/+0
| * | | | | | | | | | Added Handy.Alexander Harkness2014-10-084-244/+3
| * | | | | | | | | | Added ChatLogAlexander Harkness2014-10-082-3/+6
| * | | | | | | | | | Removed ChatLog.Alexander Harkness2014-10-081-31/+0
| * | | | | | | | | | Added chunkWorx.Alexander Harkness2014-10-082-0/+3
| * | | | | | | | | | Removed ChunkWorxAlexander Harkness2014-10-083-411/+0
* | | | | | | | | | | Merge pull request #1518 from mc-server/AcaciaTreesMattes D2014-10-081-5/+75
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Added comments to the GetAcaciaTreeImage functionSTRWarrior2014-10-081-0/+18
| * | | | | | | | | | Using array with possible directions.STRWarrior2014-10-081-8/+9
| * | | | | | | | | | Added AcaciaTrees for the savanna biomesSTRWarrior2014-10-081-5/+56
| | |_|_|/ / / / / / | |/| | | | | | | |
* / | | | | | | | | Updated Buildserver URLs.Alexander Harkness2014-10-081-2/+2
|/ / / / / / / / /
* | | | | | | | | Removed BlockHaybale.h from CMakeLists.txtHowaner2014-10-071-1/+0
* | | | | | | | | Removed unused cBlockHayBaleHandler.Howaner2014-10-072-24/+1
* | | | | | | | | Merge pull request #1513 from mc-server/MojangAPIRefreshMattes D2014-10-072-19/+132
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | cMojangAPI: Added periodical refreshes.Mattes D2014-10-062-19/+132
* | | | | | | | | Fixed crash in ForEachEntityInBox API.madmaxoft2014-10-063-6/+18
* | | | | | | | | Merge pull request #1509 from WebFreak001/masterMattes D2014-10-064-266/+432
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | added font callbackWebFreak0012014-10-051-1/+1
| * | | | | | | | Removed my license, added me to CONTRIBUTORSWebFreak0012014-10-052-16/+1
| * | | | | | | | Added newlineWebFreak0012014-10-051-2/+1
| * | | | | | | | Added licenseWebFreak0012014-10-051-0/+16
| * | | | | | | | Made WebAdmin design more modernWebFreak0012014-10-053-265/+431
* | | | | | | | | Merge pull request #1510 from mc-server/TimedEventMattes D2014-10-063-1/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update CMakeLists.txtworktycho2014-10-061-1/+1
| * | | | | | | | | Added a cEvent::Wait() with timeout.Mattes D2014-10-052-0/+51
* | | | | | | | | | Fixed a missed value.madmaxoft2014-10-051-1/+1
* | | | | | | | | | Removed obsolete cMonster::eType.madmaxoft2014-10-051-3/+0
* | | | | | | | | | Fixed eMonsterType Lua API mismatch.madmaxoft2014-10-056-54/+25
* | | | | | | | | | Fixed typo.Alexander Harkness2014-10-051-1/+1
* | | | | | | | | | cClientHandle: Added protocol version knowledge.Mattes D2014-10-055-3/+22
* | | | | | | | | | Update README.mdAlexander Harkness2014-10-051-1/+1
|/ / / / / / / / /
* / / / / / / / / Updated Core.Mattes D2014-10-051-0/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #1504 from win32re/masterSTRWarrior2014-10-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes #1503 - No gravel is being generatedwin32re2014-10-041-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #1489 from mc-server/fixesMattes D2014-10-042-71/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | Comment suggestionsTiger Wang2014-10-031-2/+3
| * | | | | | | | Improved torch handlerTiger Wang2014-09-302-70/+52
* | | | | | | | | QtBiomeVisualiser: Added mouse hover info.Mattes D2014-10-037-147/+228
* | | | | | | | | QtBiomeVisualiser: Zoom is now limited and aligned to steps.madmaxoft2014-10-034-59/+169
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Fix spelling of PRISMRAINEAlexander Harkness2014-10-021-1/+1
* | | | | | | | Added parentheses for clarity.Alexander Harkness2014-10-011-1/+1
* | | | | | | | APIDump: Fixed cEntity documentation.madmaxoft2014-10-011-5/+23
* | | | | | | | Fixed broken code.Alexander Harkness2014-10-011-2/+2
* | | | | | | | Merge pull request #1494 from Masy98/blocksMattes D2014-10-013-26/+32
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fixed sortingMasy982014-10-011-2/+2
| * | | | | | | Merge branch 'master' into blocksMasy982014-10-015-42/+71
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1493 from Masy98/blocksMattes D2014-10-013-16/+70
|\ \ \ \ \ \ \ \
* | | | | | | | | APIDump: Added more of the missing documentation.madmaxoft2014-10-011-5/+22
* | | | | | | | | cRoot: Removed useless variable from Lua API.madmaxoft2014-10-011-2/+3
* | | | | | | | | cPlayer: Removed useless functions from the Lua API.madmaxoft2014-10-011-2/+6
* | | | | | | | | Bindings: Fixed binding for cPlayer::PermissionMatches().madmaxoft2014-10-011-10/+4
* | | | | | | | | Unified cRoot broadcast chat documentation.madmaxoft2014-10-012-12/+19
* | | | | | | | | APIDump: Documented missing cIniFile function.madmaxoft2014-10-011-0/+1
* | | | | | | | | APIDump: Documented missing cCompositeChat functions.madmaxoft2014-10-011-4/+6
* | | | | | | | | APIDump: Added missing cClientHandle documentation.madmaxoft2014-10-011-0/+3
* | | | | | | | | cClientHandle: Alpha-sorted the sending functions.madmaxoft2014-10-011-7/+7
| | * | | | | | | Fixed Red Sandstone and Prismarine dropsMasy982014-10-013-24/+30
| |/ / / / / / /
| * | | | | | | Added Daylight Sensors to the "can't push" listMasy982014-10-011-0/+2
| * | | | | | | Fixed ":"Masy982014-10-011-11/+11
| * | | | | | | Added missing 1.8 blocks, E_METAs and soundsMasy982014-10-013-7/+59
|/ / / / / / /
* | | | | | | Merge pull request #1490 from mc-server/removecompactMattes D2014-10-0128-1664/+0
|\ \ \ \ \ \ \
| * | | | | | | Removed WSSCompactTiger Wang2014-09-3028-1664/+0
| |/ / / / / /
* | | | | | | Merge pull request #1487 from mc-server/BlockFixesMattes D2014-09-308-6/+62
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Code improvementsHowaner2014-09-303-3/+7
| * | | | | | Fixed 1.8 dirt typesHowaner2014-09-303-3/+35
| * | | | | | Fixed iron trapdoorsHowaner2014-09-304-2/+9
| * | | | | | Fixed 1.8 doors.Howaner2014-09-301-1/+14
* | | | | | | Merge pull request #1485 from mc-server/PluginMessagesMattes D2014-09-306-118/+242
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed a missing semicolon.madmaxoft2014-09-301-1/+1
| * | | | | | Rewritten plugin messages, vanilla are being parsed directly.madmaxoft2014-09-306-118/+242
* | | | | | | Merge pull request #1427 from mc-server/chestcartsMattes D2014-09-3015-72/+190
|\ \ \ \ \ \ \
| * | | | | | | Compilation fixTiger Wang2014-09-282-4/+4
| * | | | | | | SuggestionsTiger Wang2014-09-276-23/+69
| * | | | | | | Merge remote-tracking branch 'origin/master' into chestcartsTiger Wang2014-09-27235-6583/+12914
| |\ \ \ \ \ \ \
| * | | | | | | | e.t.c. -> etc.Tiger Wang2014-09-131-1/+1
| * | | | | | | | Added newlinesTiger Wang2014-09-131-1/+5
| * | | | | | | | Implemented Chest MinecartsTiger Wang2014-09-1315-94/+161
* | | | | | | | | Merge pull request #1484 from SphinxC0re/masterMattes D2014-09-301-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | IndentationJulian Laubstein2014-09-301-3/+3
| * | | | | | | | Set right indentationJulian Laubstein2014-09-301-3/+3
| * | | | | | | | actual solving of the halfslap+torch problemJulian Laubstein2014-09-301-1/+3
|/ / / / / / / /
* | | | | | | | Updated Core.madmaxoft2014-09-291-0/+0
* | | | | | | | Updated Core.madmaxoft2014-09-291-0/+0
* | | | | | | | RankMgr: GetAllPlayers() returns players sorted by name.madmaxoft2014-09-293-3/+3
* | | | | | | | Updated the Core.madmaxoft2014-09-291-0/+0
* | | | | | | | Style fixes.madmaxoft2014-09-293-10/+13
* | | | | | | | World: Fixed chunk generation by plugins.madmaxoft2014-09-291-1/+1
* | | | | | | | QtBiomeVisualiser: Seed is read properly.madmaxoft2014-09-292-9/+8
* | | | | | | | Fixed codestyle again.Alexander Harkness2014-09-291-1/+1
* | | | | | | | Merge pull request #1472 from mc-server/RanksMattes D2014-09-295-1/+206
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed a typo in the description.madmaxoft2014-09-291-1/+1
| * | | | | | | | Renamed GetAllPlayers() to GetAllPlayerUUIDs()Howaner2014-09-293-7/+7
| * | | | | | | | Merge branch 'master' into RanksHowaner2014-09-2939-4770/+178
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed SetDefaultRank() return value.Howaner2014-09-281-1/+1
| * | | | | | | | | cRankManager: Added ClearPlayerRanks()Howaner2014-09-284-0/+46
| * | | | | | | | | Updated api documentation.Howaner2014-09-282-1/+3
| * | | | | | | | | cRankManager: Added GetAllPlayers() and GetPlayerName()Howaner2014-09-284-0/+157
* | | | | | | | | | Merge pull request #1480 from w00tc0d3/workAlexander Harkness2014-09-292-3/+14
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | BlockStone.h: fix the codestylew00tc0d32014-09-291-6/+5
| * | | | | | | | | Tabs -> spacesw00tc0d32014-09-291-4/+4
| * | | | | | | | | BlockStone: drop the right cobblestone on onBreak().netchip2014-09-292-3/+15
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1479 from SphinxC0re/masterMattes D2014-09-291-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update BlockTorch.hJulian Laubstein2014-09-291-3/+3
| * | | | | | | | | Added torches placeable on upside-down-halfslapsJulian Laubstein2014-09-291-1/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1473 from mc-server/NewStoneGenerationMattes D2014-09-293-7/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed compilationSTRWarrior2014-09-281-1/+10
| * | | | | | | | | Added Granite, Diorite and Andesite to the NaturalPatches generator.STRWarrior2014-09-283-7/+37
* | | | | | | | | | Merge pull request #1478 from doublej472/masterMattes D2014-09-292-0/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | DerpJonathan Frederick2014-09-291-1/+1
| * | | | | | | | | | Fix commentsJonathan Frederick2014-09-291-2/+2
| * | | | | | | | | | Make endermen take damage in waterJonathan Frederick2014-09-282-0/+21
* | | | | | | | | | | Plugin messages: Vanilla prefixes its payloads with VarInt lengths.madmaxoft2014-09-281-4/+13
|/ / / / / / / / / /
* | | | | | | | | | Revert "1.8: Fixed plugin messages."madmaxoft2014-09-281-1/+3
* | | | | | | | | | Protocol 1.8: Fixed possible crash on malformed packet.madmaxoft2014-09-281-0/+5
* | | | | | | | | | Fixed trailing whitespace.madmaxoft2014-09-281-1/+1
* | | | | | | | | | Merge pull request #1471 from mc-server/redstoneDataMattes D2014-09-284-1/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update Chunk.cppworktycho2014-09-281-1/+1
| * | | | | | | | | | Use factory method to construct redstone simulator dataTycho2014-09-284-1/+13
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1466 from mc-server/endofsupportMattes D2014-09-2827-4757/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Compilation fixTiger Wang2014-09-282-3/+2
| * | | | | | | | | Bug fixTiger Wang2014-09-275-32/+27
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into endofsupportTiger Wang2014-09-278-4/+54
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Dropped support for <1.7.xTiger Wang2014-09-2722-4733/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #1463 from mc-server/sp_docs1.6EoSAlexander Harkness2014-09-282-1/+52
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add Code example.Alexander Harkness2014-09-281-0/+26
| * | | | | | | | changed description to be more readable.Alexander Harkness2014-09-271-3/+2
| * | | | | | | | Copy edit.Alexander Harkness2014-09-271-1/+1
| * | | | | | | | Fixed return value descriptions.Alexander Harkness2014-09-271-1/+3
| * | | | | | | | Fixed typo again.Alexander Harkness2014-09-271-1/+1
| * | | | | | | | Typo fix.Alexander Harkness2014-09-271-1/+1
| * | | | | | | | Fixed line left in.Alexander Harkness2014-09-271-4/+3
| * | | | | | | | Remaining part of fix.Alexander Harkness2014-09-271-0/+1
| * | | | | | | | Hopefully fix #1384Alexander Harkness2014-09-271-0/+24
* | | | | | | | | 1.8: Fixed plugin messages.Howaner2014-09-271-3/+4
* | | | | | | | | QtBiomeVisualiser: fixed compilation.madmaxoft2014-09-271-1/+10
* | | | | | | | | Fixed another redstone crash.madmaxoft2014-09-271-1/+6
* | | | | | | | | Merge pull request #1465 from Masy98/blocksMattes D2014-09-272-3/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Combined conditionsMasy982014-09-271-8/+11
| * | | | | | | | | Added barriers correctlyMasy982014-09-272-0/+6
* | | | | | | | | | BioGen: TwoLevel is now fully settable in INI.madmaxoft2014-09-272-44/+31
* | | | | | | | | | Fixed minor style issues.madmaxoft2014-09-273-3/+3
* | | | | | | | | | Wrapped clang-specific pragma into an #ifdef block.madmaxoft2014-09-271-1/+6
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1461 from mc-server/RedstoneFixTiger Wang2014-09-273-1/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Update creatable.cppworktycho2014-09-271-0/+1
| * | | | | | | | Update IncrementalRedstoneSimulator.incworktycho2014-09-271-1/+1
| * | | | | | | | Update IncrementalRedstoneSimulator.incworktycho2014-09-271-1/+1
| * | | | | | | | Correct method name.worktycho2014-09-271-1/+1
| * | | | | | | | Set chunk dataworktycho2014-09-271-0/+5
| * | | | | | | | Add data accessor.worktycho2014-09-271-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #1459 from Masy98/blocksAlexander Harkness2014-09-273-2/+45
|\| | | | | | |
| * | | | | | | Added default value to switch and spruce gate to fence gate handlerMasy982014-09-272-0/+6
| * | | | | | | Fixed convertToPickups for fence gatesMasy982014-09-271-1/+1
| * | | | | | | Fixed convertToPickups for doorsMasy982014-09-271-1/+38
| |/ / / / / /
* / / / / / / Removed polarSSL makefile. Fixes #591.Alexander Harkness2014-09-272-1/+1
|/ / / / / /
* | | | | | Merge pull request #1456 from Howaner/FixesMattes D2014-09-2616-77/+41
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into FixesHowaner2014-09-26113-3157/+3556
| |\ \ \ \ \ \
| * | | | | | | Fixed players custom name in 1.8Howaner2014-09-2614-66/+30
| * | | | | | | Added type checking to map loading.Howaner2014-09-262-11/+11
* | | | | | | | Fixed UNUSED macro so that it doesn't require type knowledge.madmaxoft2014-09-262-5/+14
* | | | | | | | Updated CoreTiger Wang2014-09-261-0/+0
* | | | | | | | Merge pull request #1415 from Masy98/blocksMattes D2014-09-2613-41/+287
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Moved curly brace to seperate lineMasy982014-09-261-1/+2
| * | | | | | | Re-added 1.8 blocks to the redstone simulatorMasy982014-09-261-9/+46
| * | | | | | | Merge branch 'master' into blocksMasy982014-09-26184-6551/+12716
| |\ \ \ \ \ \ \
| * | | | | | | | Added slime block to slime balls recipeMasy982014-09-121-0/+1
| * | | | | | | | Added Sea Lantern dropsMasy982014-09-122-0/+32
| * | | | | | | | Fixed 1.8 Item stacking and block harvestingMasy982014-09-122-26/+44
| * | | | | | | | Added new doors in ItemDoor.hMasy982014-09-111-1/+15
| * | | | | | | | Fixed mutton name in Sheep.cppMasy982014-09-112-3/+11
| * | | | | | | | Fixed mutton name in ItemHandlerMasy982014-09-111-1/+1
| * | | | | | | | Added barrier blockMasy982014-09-113-1/+7
| * | | | | | | | Added 1.8 food to the food listMasy982014-09-112-2/+5
| * | | | | | | | Added blocks to the fire simulatorMasy982014-09-111-0/+11
| * | | | | | | | Fixed incorrect handlersMasy982014-09-111-3/+3
| * | | | | | | | Added stone slab in BlockSlab.hMasy982014-09-101-1/+3
| * | | | | | | | Fixed typoMasy982014-09-101-1/+1
| * | | | | | | | Added new blocks to the BlockInfoMasy982014-09-103-12/+76
| * | | | | | | | Added new blocks to the BlockHandlerMasy982014-09-101-0/+12
| * | | | | | | | Added iron trapdoor, fence gates and doors to the redstone simulatorMasy982014-09-101-0/+11
| * | | | | | | | Added 1.8 Blocks and ItemsMasy982014-09-101-0/+37
* | | | | | | | | Merge pull request #1455 from mc-server/includesTiger Wang2014-09-2610-22/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Plugin.hworktycho2014-09-261-2/+0
| * | | | | | | | | Removed a few unnessicary includesTycho2014-09-2610-21/+16
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTycho2014-09-263-3/+8
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Fixed issue with castingtycho2014-09-263-3/+8
* | | | | | | | | Removed more unessicary includesTycho2014-09-2649-59/+55
|/ / / / / / / /
* | | | | | | | Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-2662-3075/+3480
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into redstoneTestsTycho2014-09-254-23/+42
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed styleTycho2014-09-254-2/+108
| * | | | | | | | Merge branch 'master' into redstoneTestsTycho2014-09-2583-948/+6850
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix accedental c++11Tycho2014-09-171-6/+7
| * | | | | | | | | Merge branch 'master' into redstoneTestsTycho2014-09-1788-2583/+2318
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added first test to show the object can be createdTycho2014-09-1746-456/+681
| * | | | | | | | | | IncrementalRedstoneSimulator now has no dependencies on cChunkTycho2014-09-166-375/+384
| * | | | | | | | | | Don't include IncrementalRedsonteSimulator.inc when in SELF_TEST modeTycho2014-09-111-5/+0
| * | | | | | | | | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-1122-2339/+2403
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Improved searching for spawn.madmaxoft2014-09-261-3/+14
* | | | | | | | | | cByteBuffer: Simplified ReadPosition().madmaxoft2014-09-251-6/+9
* | | | | | | | | | Protocol 1.8: Fixed plugin message packet.madmaxoft2014-09-251-1/+3
* | | | | | | | | | cByteBuffer: Fixed position reading.madmaxoft2014-09-251-3/+3
* | | | | | | | | | TwoLevel BioGen: reads params from INI file.madmaxoft2014-09-251-9/+26
* | | | | | | | | | Added cByteBuffer::WriteBEUShort().madmaxoft2014-09-253-1/+15
* | | | | | | | | | Merge pull request #1452 from Howaner/FixesMattes D2014-09-257-18/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Comment styleHowaner2014-09-251-1/+1
| * | | | | | | | | | Merge branch 'master' into FixesHowaner2014-09-254-25/+41
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Fixed wrong Surrounding sizeHowaner2014-09-251-3/+3
| * | | | | | | | | | Anvil: Arrow Tile tags are a short in VanillaHowaner2014-09-252-7/+24
| * | | | | | | | | | Use the json writer to write sign texts.Howaner2014-09-251-5/+10
| * | | | | | | | | | Fixed dispender direction bugHowaner2014-09-251-1/+1
| * | | | | | | | | | Fixed hanging direction bugs.Howaner2014-09-253-2/+17
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Protocol 1.8: Handling packet compression properly.madmaxoft2014-09-252-14/+39
* | | | | | | | | | Protocol 1.8: Added checks for values presence.madmaxoft2014-09-251-2/+8
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Redstone: Fixed a crash with repeaters on a chunk border.madmaxoft2014-09-251-13/+22
* | | | | | | | | 1.8 Protocol: Fixed problems with no-payload packets.madmaxoft2014-09-251-6/+7
* | | | | | | | | 1.7 Protocol: fixed potential problems with no-payload packets.madmaxoft2014-09-251-4/+4
* | | | | | | | | HangingEntity: Silenced a crash.madmaxoft2014-09-251-2/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #1449 from mc-server/WorldLoaderMattes D2014-09-243-5/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | derpHowaner2014-09-241-4/+4
| * | | | | | | | Don't create two entity lists.Howaner2014-09-242-7/+14
| * | | | | | | | Merge branch 'master' into WorldLoaderHowaner2014-09-249-14/+33
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | QtBiomeVisualiser: Fixed MSVC path-crossing.madmaxoft2014-09-247-10/+15
* | | | | | | | | Anvil: Wolf collar color is a byte in Vanilla.madmaxoft2014-09-232-4/+18
| * | | | | | | | Merge branch 'master' into WorldLoaderHowaner2014-09-232-5/+5
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Fixed compiler warnings in 1.8 protocol.madmaxoft2014-09-231-2/+2
* | | | | | | | | Fixed a crash in WSSAnvil.madmaxoft2014-09-231-3/+3
| * | | | | | | | MCServer world compatiblity with vanilla and mcedit.Howaner2014-09-233-5/+52
|/ / / / / / / /
* | | | | | | | Merge pull request #1372 from mc-server/EntityCustomNameFranz Reiter2014-09-2320-31/+267
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed SQLiteCpp downgradeHowaner2014-09-231-0/+0
| * | | | | | | | Merge branch 'master' into EntityCustomNameHowaner2014-09-23232-4784/+10892
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | QtBiomeVisualiser: Fixed confusion about Globals.h.madmaxoft2014-09-235-21/+21
* | | | | | | | | Made ExpBottleEntity break on entities.archshift2014-09-232-1/+23
* | | | | | | | | Merge pull request #1447 from cedeel/patch-2worktycho2014-09-235-44/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | A few compiler warning fixesChris Darnell2014-09-235-44/+47
|/ / / / / / / / /
* | | | | | | | | Updated README.mdHowaner2014-09-222-2/+2
* | | | | | | | | Hotfixed 1.8 item reading.Howaner2014-09-222-6/+6
* | | | | | | | | QtBiomeVisualiser: Implemented live-update for the generator setup.madmaxoft2014-09-225-17/+49
* | | | | | | | | QtBiomeVisualiser: generator source is read from generator setup ini.madmaxoft2014-09-223-16/+13
* | | | | | | | | QtBiomeVisualiser: Moved the generator setup into a side-pane.madmaxoft2014-09-225-39/+96
* | | | | | | | | Merge pull request #1398 from mc-server/1.8-ProtocolAlexander Harkness2014-09-2236-680/+4729
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changed metadata reading again.Howaner2014-09-222-173/+7
| * | | | | | | | | Fixed item nbt reading.Howaner2014-09-222-3/+168
| * | | | | | | | | Code improvements.Howaner2014-09-194-38/+36
| * | | | | | | | | Updated SPAWNING_ENTITY hook description.Howaner2014-09-191-2/+3
| * | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-1931-360/+648
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | DerpHowaner2014-09-181-1/+1
| * | | | | | | | | Exported player list states to extra functions.Howaner2014-09-1814-531/+837
| * | | | | | | | | 1.8: Simplified item metadata reading.Howaner2014-09-183-27/+3
| * | | | | | | | | Use xofts ReadPosition() code.Howaner2014-09-171-3/+6
| * | | | | | | | | Fixed SQLiteCpp downgradeHowaner2014-09-141-0/+0
| * | | | | | | | | Simplified WriteUUID()Howaner2014-09-141-9/+9
| * | | | | | | | | Fixed warnings.Howaner2014-09-141-3/+3
| * | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-1458-2270/+1737
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 1.8: Updated scoreboard packets.Howaner2014-09-131-3/+7
| * | | | | | | | | | Moved chat json creating to the CompositeChat class.Howaner2014-09-136-346/+192
| * | | | | | | | | | 1.8: Fixed maps.Howaner2014-09-1312-45/+43
| * | | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-1324-104/+185
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-122-0/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-1265-326/+260
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed many right click issues.Howaner2014-09-122-7/+17
| * | | | | | | | | | | | | Fixed wrong buffer length in the 1.8 protocol.Howaner2014-09-121-10/+4
| * | | | | | | | | | | | | 1.8: Fixed ReadItem()Howaner2014-09-122-20/+40
| * | | | | | | | | | | | | 1.8: Added difficulty sendingHowaner2014-09-121-0/+6
| * | | | | | | | | | | | | 1.8: Fixed block entities.Howaner2014-09-121-8/+2
| * | | | | | | | | | | | | 1.8: Fixed eating.Howaner2014-09-121-0/+1
| * | | | | | | | | | | | | 1.8: Fixed workbench, enchanting and anvil window.Howaner2014-09-121-3/+19
| * | | | | | | | | | | | | 1.8: Enderman, byte -> shortHowaner2014-09-121-1/+1
| * | | | | | | | | | | | | 1.8: Fixed enderman spawning.Howaner2014-09-121-1/+1
| * | | | | | | | | | | | | 1.8: Fixed inventory open packet.Howaner2014-09-113-4/+32
| * | | | | | | | | | | | | Removed GetProtocolVersion() from the protocols.Howaner2014-09-117-19/+6
| * | | | | | | | | | | | | 1.8: Fixed sign placing.Howaner2014-09-111-1/+1
| * | | | | | | | | | | | | 1.8: Fixed hangings.Howaner2014-09-114-32/+89
| * | | | | | | | | | | | | 1.8: Added ParticleEffect packet.Howaner2014-09-1119-38/+115
| * | | | | | | | | | | | | 1.8: Added MultiBlockChange packet.Howaner2014-09-094-54/+86
| * | | | | | | | | | | | | Downgrade SQLiteCpp againHowaner2014-09-091-0/+0
| * | | | | | | | | | | | | Added the player list to the 1.8 protocol.Howaner2014-09-0916-31/+108
| * | | | | | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-0962-850/+1589
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | PlayerSpawn packet: Send the correct uuid.Howaner2014-09-091-5/+1
| * | | | | | | | | | | | | | 1.8: Added new uuid field.Howaner2014-09-093-17/+44
| * | | | | | | | | | | | | | More fixes.Howaner2014-09-083-12/+7
| * | | | | | | | | | | | | | Recoded cProtocol180 class.Howaner2014-09-084-589/+2690
| * | | | | | | | | | | | | | 1.8: Fixed tab complete.Howaner2014-09-083-2/+20
| * | | | | | | | | | | | | | Fixed more 1.8 packets.Howaner2014-09-087-47/+313
| * | | | | | | | | | | | | | Updated chunk sending to 1.8Howaner2014-09-084-26/+22
| * | | | | | | | | | | | | | Added GetProtocolVersion() to cProtocol.Howaner2014-09-088-26/+29
| * | | | | | | | | | | | | | Implemented packet compression.Howaner2014-09-087-35/+117
| * | | | | | | | | | | | | | Fixed client errors.Howaner2014-09-045-52/+79
| * | | | | | | | | | | | | | Added more 1.8 protocol things.Howaner2014-09-046-14/+632
| * | | | | | | | | | | | | | Started implementing of the 1.8 protocol.Howaner2014-09-047-7/+502
* | | | | | | | | | | | | | | Merge pull request #1446 from cedeel/patch-1Alexander Harkness2014-09-226-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Made it compile with clangChris Darnell2014-09-226-11/+11
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | QtBiomeVisualiser: Added the base for INI editting.madmaxoft2014-09-215-20/+266
* | | | | | | | | | | | | | | Fix crash in cLineBlockTracerTiger Wang2014-09-211-8/+7
* | | | | | | | | | | | | | | QtBiomeVisualiser: Added list of vanilla worlds.madmaxoft2014-09-202-7/+145
* | | | | | | | | | | | | | | Fixed cParsedNBT::FindTagByPath().madmaxoft2014-09-201-1/+1
* | | | | | | | | | | | | | | QtBiomeVisualiser: Added support for loading Anvil worlds.madmaxoft2014-09-204-5/+320
* | | | | | | | | | | | | | | Fixed typos in items.ini.madmaxoft2014-09-191-1/+2
* | | | | | | | | | | | | | | Merge pull request #1442 from Masy98/LanguageMattes D2014-09-192-3/+611
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Added german language support, now reallyMasy982014-09-181-0/+603
| * | | | | | | | | | | | | | Added german language supportMasy982014-09-181-3/+8
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | QtBiomeVisualiser: More gcc fixes.madmaxoft2014-09-181-2/+2
* | | | | | | | | | | | | | QtBiomeVisualiser: Fixed linux compilation.madmaxoft2014-09-185-0/+6
* | | | | | | | | | | | | | Fixed minor style issues.madmaxoft2014-09-173-5/+5
* | | | | | | | | | | | | | Voronoi biomegen: Added JitterSize and OddRowOffset.madmaxoft2014-09-173-88/+164
* | | | | | | | | | | | | | Updated SQLiteCpp.madmaxoft2014-09-171-0/+0
* | | | | | | | | | | | | | Merge pull request #1437 from nesco/masterMattes D2014-09-174-5/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Implementing Spectator Modenesco2014-09-171-1/+1
| * | | | | | | | | | | | | | Update World.hnesco2014-09-171-1/+1
| * | | | | | | | | | | | | | Preparing 1.8 updatenesco2014-09-171-5/+15
| * | | | | | | | | | | | | | Preparing 1.8 updatenesco2014-09-161-1/+2
| * | | | | | | | | | | | | | Preparing 1.8 update nesco2014-09-161-0/+3
| * | | | | | | | | | | | | | Pre 1.8 releasenesco2014-09-161-0/+8
| * | | | | | | | | | | | | | Preparing 1.8 changesnesco2014-09-161-0/+3
| * | | | | | | | | | | | | | Pre 1.8 releasenesco2014-09-161-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Added an explicit setting for allowing BungeeCord handshake.madmaxoft2014-09-173-1/+16
* | | | | | | | | | | | | | Fixed wrong url in the debuggers pluginHowaner2014-09-171-1/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | BungeeCord compatibility: don't overwrite UUID / properties.madmaxoft2014-09-171-2/+10
* | | | | | | | | | | | | Full BungeeCord compatibility.madmaxoft2014-09-172-1/+17
* | | | | | | | | | | | | Initial BungeeCord support.madmaxoft2014-09-174-1/+43
|/ / / / / / / / / / / /
* | | | | | | | | | | | VoronoiMap: Added Jitter and OddRowOffset params.madmaxoft2014-09-152-11/+55
* | | | | | | | | | | | QtBiomeVisualiser: Fixed colors and read failures.madmaxoft2014-09-151-6/+5
* | | | | | | | | | | | QtBiomeVisualiser: Added reloading.Mattes D2014-09-156-4/+49
* | | | | | | | | | | | QtBiomeVisualiser: removed multithreading.Mattes D2014-09-152-65/+10
* | | | | | | | | | | | QtBiomeVisualiser: Added multithreading.Mattes D2014-09-153-23/+102
* | | | | | | | | | | | QtBiomeVisualiser: Extended zoom down below 100%.Mattes D2014-09-142-16/+80
* | | | | | | | | | | | QtBiomeVisualiser: Added mouse and keyboard view control.Mattes D2014-09-142-4/+137
* | | | | | | | | | | | QtBiomeVisualiser: Removed build-specific variables.Mattes D2014-09-141-3/+0
* | | | | | | | | | | | Removed the unused nightbuild script.madmaxoft2014-09-141-209/+0
* | | | | | | | | | | | Merge pull request #1434 from Masy98/masterAlexander Harkness2014-09-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Added me to the contributors listMasy982014-09-141-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Added new Qt-based biome visualiser.Mattes D2014-09-1437-2181/+1482
* | | | | | | | | | | OSSupport: Fixed UNICODE Windows builds.Mattes D2014-09-142-8/+8
* | | | | | | | | | | Improved cBlockHandler::DropBlockTiger Wang2014-09-135-46/+34
* | | | | | | | | | | Entities experience water resistanceTiger Wang2014-09-132-16/+31
* | | | | | | | | | | Merge pull request #1353 from mc-server/EffectsMattes D2014-09-1313-16/+179
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added extra mushroom handler.Howaner2014-09-124-10/+60
| * | | | | | | | | | | Merge branch 'master' into EffectsHowaner2014-09-12133-1375/+2157
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Renamed SetWalkSpeed() to SetRelativeWalkSpeed()Howaner2014-09-024-11/+11
| * | | | | | | | | | | Merge branch 'master' into EffectsHowaner2014-09-0238-405/+954
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Removed SexyMotd linkHowaner2014-08-301-1/+0
| * | | | | | | | | | | | Added GetWalkSpeed() and SetWalkSpeed() documentation.Howaner2014-08-302-0/+3
| * | | | | | | | | | | | Fixed potion removing in creative mode.Howaner2014-08-305-8/+16
| * | | | | | | | | | | | Added slowness effect and added entity support.Howaner2014-08-302-16/+65
| * | | | | | | | | | | | Added SetWalkSpeed() to cMonster.Howaner2014-08-302-0/+9
| * | | | | | | | | | | | Merge branch 'master' into EffectsHowaner2014-08-3012-223/+319
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added speed entity effect.Hownaer2014-08-283-1/+46
* | | | | | | | | | | | | | Gittip is now GratipayAlexander Harkness2014-09-131-1/+1
* | | | | | | | | | | | | | Updated CI Links to new ones.Alexander Harkness2014-09-131-2/+2
| |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fixed friction being applied whilst airborneTiger Wang2014-09-121-11/+13
* | | | | | | | | | | | | APIDump: Improved command binding documentation.madmaxoft2014-09-121-4/+4
* | | | | | | | | | | | | Merge pull request #1424 from Howaner/FixesMattes D2014-09-1221-85/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Only drop flint or gravel, not both.Howaner2014-09-121-2/+4
| * | | | | | | | | | | | Fixed farmland issues.Howaner2014-09-1211-64/+75
| * | | | | | | | | | | | Only place farmland if no block is upper than dirt/grass.Howaner2014-09-121-1/+6
| * | | | | | | | | | | | Added hoe interact sound.Howaner2014-09-121-0/+1
| * | | | | | | | | | | | Play placesound from the middle of the block.Howaner2014-09-121-1/+1
| * | | | | | | | | | | | Fixed block place sounds.Howaner2014-09-122-15/+27
| * | | | | | | | | | | | Spawn exp if you break a mob spawner.Howaner2014-09-126-4/+50
| * | | | | | | | | | | | Disabled mobspawner itemdrop.Howaner2014-09-121-0/+1
| * | | | | | | | | | | | Players in survival mode are not allowed to break a bedrock.Howaner2014-09-121-0/+6
|/ / / / / / / / / / / /
* | | | | | | / / / / / Fixed iron ore drop.Howaner2014-09-121-1/+2
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Added flint drop and fence gate meta reset.Howaner2014-09-122-0/+17
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Fixed a redstone sim failure with droppers.Mattes D2014-09-111-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTycho2014-09-102-3/+3
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #1414 from Masy98/CraftingMattes D2014-09-101-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed spacingMasy982014-09-101-1/+1
| | * | | | | | | | | Fixed sign recipeMasy982014-09-101-1/+1
| * | | | | | | | | | Grammar fixes.Alexander Harkness2014-09-101-2/+2
* | | | | | | | | | | Cleaned up flagsTycho2014-09-101-5/+4
|/ / / / / / / / / /
* | | | | | | | | | Added MCServer_ prfix to env vars for versionsTycho2014-09-102-9/+9
* | | | | | | | | | Merge pull request #1413 from mc-server/versionInfoAlexander Harkness2014-09-106-0/+48
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added example for how to use version info to travisTycho2014-09-101-0/+4
| * | | | | | | | | | Added abilty to set build infoTycho2014-09-105-0/+44
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1402 from Masy98/SoundsMattes D2014-09-1050-299/+172
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed old sound-configuration for SignPostsMasy982014-09-091-6/+0
| * | | | | | | | | | Removed old sound-configuration for RepeatersMasy982014-09-091-6/+0
| * | | | | | | | | | Removed old sound-configuration for TrapdoorsMasy982014-09-091-5/+0
| * | | | | | | | | | Removed old sound-configuration for doorsMasy982014-09-092-10/+0
| * | | | | | | | | | Moved sound-configs into BlockID.h and fixed/ added loads of soundsMasy982014-09-0945-272/+172
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1399 from mc-server/warningsMattes D2014-09-093-17/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Actually set defaultworktycho2014-09-091-0/+1
| * | | | | | | | | | use the correct ASSERTworktycho2014-09-081-2/+2
| * | | | | | | | | | FIxed a couple more warningsTycho2014-09-081-2/+8
| * | | | | | | | | | TimeOfDay does not need to be an Int64Tycho2014-09-083-6/+6
| * | | | | | | | | | Fixed a few compile warningsTycho2014-09-081-9/+14
* | | | | | | | | | | Update Zip2008_PDBs.listAlexander Harkness2014-09-091-1/+2
* | | | | | | | | | | Update Zip2008.listAlexander Harkness2014-09-091-0/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | capitalisation errorworktycho2014-09-081-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1397 from mc-server/saveSettingMattes D2014-09-081-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | derpworktycho2014-09-081-1/+1
| * | | | | | | | | If server fails init, save any changed or generated settings.worktycho2014-09-081-0/+1
|/ / / / / / / / /
* / / / / / / / / Exported cClientHandle:GetIPString() to Lua API.Mattes D2014-09-072-1/+2
|/ / / / / / / /
* | | | | | | | Webadmin: Added default ports to auto-generated ini file.Mattes D2014-09-071-2/+6
* | | | | | | | WebAdmin: Added HTTPS instructions when cert / key is missing.Mattes D2014-09-071-0/+1
* | | | | | | | Fixed submodules' downgrade from the previous PR merge.Mattes D2014-09-072-0/+0
* | | | | | | | Re-ordered the items.ini and added a few new namesMasy982014-09-061-291/+290
* | | | | | | | Merge branch 'master' into blocksMasy982014-09-0673-990/+1672
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Masy982014-09-0638-575/+762
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #1385 from mc-server/clangWarningsMattes D2014-09-062-6/+27
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update SetFlags.cmakeworktycho2014-09-061-1/+0
| | | * | | | | | | | Added workaround for clang versionTycho2014-09-062-5/+16
| | | * | | | | | | | bumped cmake version min and fixed clang supportTycho2014-09-062-3/+3
| | | * | | | | | | | Wrong cmake varworktycho2014-09-061-2/+2
| | | * | | | | | | | Improve error messageworktycho2014-09-061-2/+2
| | | * | | | | | | | Should now compile in clang 3.0worktycho2014-09-061-5/+16
| | * | | | | | | | | Added missing newline.Mattes D2014-09-061-1/+1
| | * | | | | | | | | Removed chunk's unused Y coord.Mattes D2014-09-062-5/+4
| | * | | | | | | | | Added Y-wise asserts to signs.Mattes D2014-09-063-0/+4
| | * | | | | | | | | Alpha-sorted protocol 1.7 senders.Mattes D2014-09-061-7/+7
| | * | | | | | | | | Fixed player spawning in unknown world.Mattes D2014-09-061-0/+4
| | |/ / / / / / / /
| | * | | | | | | | Win build: put third party licenses into a separate folder.madmaxoft2014-09-066-5/+1
| | * | | | | | | | Anvil: Fixed an off-by-one error in the loader.Mattes D2014-09-061-1/+1
| | * | | | | | | | Fixed scoreboard loader type checks.Mattes D2014-09-061-10/+10
| | * | | | | | | | Removed outdated message sending methods.Alexander Harkness2014-09-061-3/+3
| | * | | | | | | | Merge pull request #1361 from mc-server/WebAdminMattes D2014-09-069-348/+501
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Xoft fixes.Alexander Harkness2014-09-061-1/+1
| | | * | | | | | | | [WebAdmin] Code improvements.Howaner2014-09-022-61/+99
| | | * | | | | | | | Merge branch 'master' into WebAdminHowaner2014-09-0227-293/+770
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | * | | | | | | | WebAdmin: Exported logo and background.Howaner2014-08-313-3/+3
| | | * | | | | | | | WebAdmin: Stop webadmin if template can't load.Howaner2014-08-311-1/+3
| | | * | | | | | | | WebAdmin: Added favicon to the login template.Howaner2014-08-311-0/+1
| | | * | | | | | | | WebAdmin: Exported favicon.Howaner2014-08-312-4/+4
| | | * | | | | | | | WebAdmin: Exported stylesheet in a own file.Howaner2014-08-312-333/+329
| | | * | | | | | | | WebAdmin: Added login templateHowaner2014-08-312-0/+24
| | | * | | | | | | | WebAdmin: Added "files" folder and load the login template from login_template.htmlHowaner2014-08-312-10/+102
| | * | | | | | | | | WorldStorage no longer queues chunks into generator.Mattes D2014-09-054-51/+17
| | * | | | | | | | | Fixed loading empty chunks.Mattes D2014-09-052-2/+7
| | * | | | | | | | | Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-059-107/+141
| | * | | | | | | | | BiomeMultiCache is not used for simple generators.Mattes D2014-09-051-21/+22
| | * | | | | | | | | Fixed style.Mattes D2014-09-053-9/+13
| | * | | | | | | | | Fixed security: Player cannot spawn in a disabled world.Mattes D2014-09-051-1/+1
| | * | | | | | | | | Anvil: Fixed loading block entities with invalid Y coord.Mattes D2014-09-051-1/+1
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master'Masy982014-09-0548-444/+935
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #1375 from mc-server/EntitiesInBoxMattes D2014-09-0413-1/+264
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed compilation after chunk Y removal.madmaxoft2014-09-041-1/+1
| | | * | | | | | | | | Merge remote-tracking branch 'origin/master' into EntitiesInBoxmadmaxoft2014-09-0432-262/+376
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Debuggers: Reviewed and fixed the Pickups and Poof commands.madmaxoft2014-09-031-10/+17
| | | * | | | | | | | | | LuaState: Fixed class value-getting off the stack.madmaxoft2014-09-031-4/+4
| | | * | | | | | | | | | LuaState: Fixed referenced function pushing.madmaxoft2014-09-032-1/+9
| | | * | | | | | | | | | Debuggers: Added a test code for ForEachEntityInBox().madmaxoft2014-09-031-0/+49
| | | * | | | | | | | | | Exported ForEachEntityInBox() to Lua API.madmaxoft2014-09-032-0/+71
| | | * | | | | | | | | | Added cWorld::ForEachEntityInBox()madmaxoft2014-09-038-0/+117
| | | * | | | | | | | | | cBoundingBox: Added accessors.madmaxoft2014-09-031-0/+11
| | * | | | | | | | | | | Merge pull request #1371 from DayBr3ak/masterMattes D2014-09-043-2/+92
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | change to linear calculationDayBr3ak2014-09-032-9/+7
| | | * | | | | | | | | | adapting formatDayBr3ak2014-09-033-7/+14
| | | * | | | | | | | | | forgot this oneDayBr3ak2014-09-022-2/+2
| | | * | | | | | | | | | opting for size_tDayBr3ak2014-09-022-5/+5
| | | * | | | | | | | | | fixing memory leakDayBr3ak2014-09-021-4/+5
| | | * | | | | | | | | | changing implem, using vectorsDayBr3ak2014-09-022-98/+23
| | | * | | | | | | | | | adding config file entry #381DayBr3ak2014-09-021-1/+10
| | | * | | | | | | | | | adding the multicache behaviorDayBr3ak2014-09-023-4/+119
| | | * | | | | | | | | | added multicache class definitionDayBr3ak2014-09-011-0/+35
| | * | | | | | | | | | | Anvil: Cleanly refuse to store data that is too large.madmaxoft2014-09-041-1/+7
| | * | | | | | | | | | | Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc"archshift2014-09-044-62/+29
| | * | | | | | | | | | | In 1.8, carrots and potatoes yield one less hunger point.archshift2014-09-042-2/+2
| | * | | | | | | | | | | Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etcarchshift2014-09-044-29/+62
| | * | | | | | | | | | | ChunkGenerator: Log world seed when creating a new one.madmaxoft2014-09-031-3/+14
| | * | | | | | | | | | | Added cIniFile::HasValue() function.madmaxoft2014-09-032-0/+23
| | * | | | | | | | | | | Updated SQLiteCpp.madmaxoft2014-09-031-0/+0
| | * | | | | | | | | | | Merge pull request #1351 from LO1ZB/remove-a_RelYMattes D2014-09-0318-230/+237
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | commitLO1ZB2014-09-031-1/+1
| | | * | | | | | | | | | re-add the missing "s" too cChunkCoordsWithBoolListLO1ZB2014-09-033-6/+6
| | | * | | | | | | | | | hopefully the last commit for removing y-coord from chunks. :)LO1ZB2014-09-035-23/+41
| | | * | | | | | | | | | fix possibility of a twice generated chunkLO1ZB2014-09-011-1/+2
| | | * | | | | | | | | | remove orphaned comment.LO1ZB2014-08-301-4/+0
| | | * | | | | | | | | | me being stupidLO1ZB2014-08-291-1/+1
| | | * | | | | | | | | | add commentsLO1ZB2014-08-291-1/+2
| | | * | | | | | | | | | fix chunk regeneratingLO1ZB2014-08-293-9/+9
| | | * | | | | | | | | | remove y-coord from chunksLO1ZB2014-08-2818-217/+208
| | * | | | | | | | | | | Anvil: switched inflate to stream mode.madmaxoft2014-09-033-18/+70
| | * | | | | | | | | | | Fixed style and alpha-sorting.madmaxoft2014-09-036-20/+20
| | * | | | | | | | | | | Quick fix for a preprocessor error with clang on OS Xarchshift2014-09-031-1/+3
| | * | | | | | | | | | | Added mutton, which sheep now drop when killedarchshift2014-09-034-0/+13
| | * | | | | | | | | | | EntityEffect.cpp: Enable 1.8's leaping potionarchshift2014-09-031-1/+1
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Clang wants volatile...madmaxoft2014-09-021-1/+1
| | * | | | | | | | | | Added strict error reporting to chunk loading.madmaxoft2014-09-021-1/+29
| | * | | | | | | | | | Merge pull request #1350 from mc-server/InventoryMattes D2014-09-029-179/+175
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Changed the IsEnchantable() comment again.Howaner2014-09-022-3/+3
| | | * | | | | | | | | Merge branch 'master' into InventoryHowaner2014-09-0256-649/+1452
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Changed the IsEnchantable() comment.Howaner2014-08-302-2/+3
| | | * | | | | | | | | APIDump: Added missing cItem things.Hownaer2014-08-282-4/+9
| | | * | | | | | | | | Added comments.Hownaer2014-08-281-1/+3
| | | * | | | | | | | | Fixed bad values in the IsEnchantable() method.Hownaer2014-08-282-5/+17
| | | * | | | | | | | | Fixed crashes and use std::swap.Hownaer2014-08-284-26/+43
| | | * | | | | | | | | Enchanting table improvements.Hownaer2014-08-285-154/+113
| * | | | | | | | | | | Added new recipes!Masy982014-09-021-4/+19
| * | | | | | | | | | | Seperated "custom" names list from the normal list in items.ini!Masy982014-09-022-197/+328
| |/ / / / / / / / / /
* | | | | | | | | | | Fixed typo!Masy982014-09-021-1/+1
* | | | | | | | | | | Added missing recipes!Masy982014-09-021-6/+21
* | | | | | | | | | | Seperated the "custom" names from the normal list!Masy982014-09-021-193/+326
| | | | | | | | * | | Merge branch 'master' into EntityCustomNameHowaner2014-09-027-74/+252
| | | | | | | | |\ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Re-added alternate spellings of darkgraywool.madmaxoft2014-09-021-0/+2
| * | | | | | | | | | Re-updated the Core.madmaxoft2014-09-021-0/+0
| * | | | | | | | | | Merge remote-tracking branch 'masy/blocks'madmaxoft2014-09-024-58/+212
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Added missing leather recipe!Masy982014-09-011-0/+1
* | | | | | | | | | | Merge branch 'master' into blocksMasy982014-09-0124-271/+589
|\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Fixed spacing and light gray wool name!Masy982014-09-012-38/+40
* | | | | | | | | | | | Added furnace recipes!Masy982014-08-312-17/+30
* | | | | | | | | | | | Added missing mossy stonebrick recipe!Masy982014-08-311-0/+1
* | | | | | | | | | | | Added 1.8 recipes!Masy982014-08-312-8/+80
* | | | | | | | | | | | Added 1.8 blocks and items!Masy982014-08-311-1/+65
| | * | | | | | | | | | Pickups combine only within one chunk.madmaxoft2014-09-011-2/+6
| | * | | | | | | | | | CopyBlocks test: decreased the test size.madmaxoft2014-09-011-2/+2
| | * | | | | | | | | | Fixed off-by-one errors in cChunkDef asserts.madmaxoft2014-09-011-8/+8
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #1368 from mc-server/coverityFixesMattes D2014-09-011-6/+24
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Make sure packets are validworktycho2014-09-011-6/+24
| | | | | | | | * | | Added CustomName saving.Howaner2014-09-023-2/+23
| | | | | | | | * | | Added the new functions to APIDump.Howaner2014-09-023-3/+12
| | | | | | | | * | | Added a custom name test to the debuggers plugin.Howaner2014-09-021-0/+17
| | | | | | | | * | | Added SetCustomName() to players.Howaner2014-09-0215-41/+124
| | | | | | | | * | | Added name tagHowaner2014-09-017-3/+31
| | | | | | | | * | | Added CustomName to cMonster.Howaner2014-09-014-4/+64
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Fixed Bindings regeneration under MSVC.madmaxoft2014-09-011-1/+6
| * | | | | | | | | Fixed previous commit's wrong assumptions.madmaxoft2014-09-011-10/+10
| * | | | | | | | | Fixed MSVC compilation, improved performance.madmaxoft2014-09-011-30/+59
| * | | | | | | | | Fixed MSVC warning.madmaxoft2014-09-011-2/+2
| * | | | | | | | | Merge remote-tracking branch 'Hircine/Enchantments'madmaxoft2014-09-019-22/+323
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed styleJaume Aloy2014-08-313-8/+9
| | * | | | | | | | | Added a_Digger checkJaume Aloy2014-08-302-30/+33
| | * | | | | | | | | More EnchantmentsJaume Aloy2014-08-222-58/+70
| | * | | | | | | | | Protection Enchantments, some fixesJaume Aloy2014-08-214-15/+122
| | * | | | | | | | | Changed if in BlockHandlerJaume Aloy2014-08-192-6/+2
| | * | | | | | | | | FixesJaume Aloy2014-08-196-50/+51
| | * | | | | | | | | Changed if for switchJaume Aloy2014-08-193-15/+25
| | * | | | | | | | | Added more enchantments and some fixesJaume Aloy2014-08-196-23/+101
| | * | | | | | | | | Added some EnchantmentsJaume Aloy2014-08-194-7/+100
| * | | | | | | | | | Avoid false positive in style check.madmaxoft2014-09-011-1/+1
| * | | | | | | | | | Merge pull request #1365 from mc-server/coverityFixesMattes D2014-09-014-9/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Fixed style.madmaxoft2014-09-011-1/+2
| | * | | | | | | | | Removed isDone checkworktycho2014-08-311-2/+2
| | * | | | | | | | | Changed null check to assertworktycho2014-08-311-5/+3
| | * | | | | | | | | Delete the entity before removing from the listworktycho2014-08-311-1/+1
| | * | | | | | | | | Init RankMgr pointer to NULLworktycho2014-08-311-1/+2
| |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge pull request #1363 from mc-server/FurnaceRecipesMattes D2014-09-016-211/+175
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use std::auto_ptrHowaner2014-08-311-6/+6
| | * | | | | | | | | Fixed compile warnings.Howaner2014-08-312-5/+5
| | * | | | | | | | | Fixed wrong doxy-comment.Howaner2014-08-311-1/+1
| | * | | | | | | | | Rewrited furnace.txtHowaner2014-08-312-49/+53
| | * | | | | | | | | Rewrited furnace.txt loading.Howaner2014-08-314-159/+119
| |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed ReplaceString() documentation.Howaner2014-09-011-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1357 from mc-server/leafFixMattes D2014-08-311-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Check range of y in HasNearLogworktycho2014-08-311-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #1355 from mc-server/fixesSTRWarrior2014-08-3010-83/+93
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed style.madmaxoft2014-08-302-4/+6
| * | | | | | | | Merge branch 'master' into fixesmadmaxoft2014-08-3010-251/+406
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | WSSAnvil: Removed leftover debugging code.madmaxoft2014-08-301-4/+0
* | | | | | | | | Fixed MSVC2008 compilation.madmaxoft2014-08-301-18/+18
* | | | | | | | | Merge pull request #1340 from Masy98/craftingMattes D2014-08-302-16/+82
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fixed missing slab name in line 297Masy982014-08-301-1/+1
| * | | | | | | | Merge branch 'master' into craftingMasy982014-08-3088-1562/+4865
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | cChunk: Fixed the Coords param.Mattes D2014-08-291-1/+1
* | | | | | | | | Rewritten block entity loading.Mattes D2014-08-297-215/+308
| * | | | | | | | Fixed slab nameMasy982014-08-211-1/+1
| * | | | | | | | Added missing recipes for stairs and slabs!Masy982014-08-212-4/+5
| * | | | | | | | Added missing recipes for stairs and slabs!Masy982014-08-211-12/+30
| * | | | | | | | Changed new logs from wood to log!Masy982014-08-211-4/+4
| * | | | | | | | Added missing blocks in item.iniMasy982014-08-211-2/+49
| | * | | | | | | Updated CoreTiger Wang2014-08-291-0/+0
| | * | | | | | | A better hotfix for CraftingRecipiesTiger Wang2014-08-291-1/+1
| | * | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-29163-2366/+5937
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | VanillaFluidSimulator: Fixed an invalid Y-coord query.Mattes D2014-08-291-1/+1
* | | | | | | | | Fixed conversion warning.Mattes D2014-08-291-1/+1
* | | | | | | | | Fixed spaces.Mattes D2014-08-291-1/+1
* | | | | | | | | Hotfixed recipe.txt loading.Hownaer2014-08-293-5/+8
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Fire can be destroyed with the sword in creative-modeHownaer2014-08-281-1/+2
* | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerHownaer2014-08-2814-41/+197
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #1323 from mc-server/CraftingFixesMattes D2014-08-2813-39/+105
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Final template keyword style fix.Mattes D2014-08-281-2/+2
| | * | | | | | | | More template keyword fixes.Mattes D2014-08-285-16/+16
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into CraftingFixesMattes D2014-08-28125-2173/+5248
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | CheckBasicStyle: Added checking for the "template" keyword.Mattes D2014-08-281-1/+2
| | * | | | | | | | Fixed spaces after "template" keyword.Mattes D2014-08-285-14/+14
| | * | | | | | | | Fixed commentsTycho2014-08-131-5/+5
| | * | | | | | | | Added missing headerTycho2014-08-131-0/+1
| | * | | | | | | | Fixed Integer pasing warnings in CraftingRecipies.cppTycho2014-08-132-4/+64
| | * | | | | | | | Fixed type issues in CraftingRecipe.cppTycho2014-08-132-5/+5
| | * | | | | | | | Fixed forgotten error checkingTycho2014-08-131-1/+5
| * | | | | | | | | Fixed a typo.Mattes D2014-08-281-1/+1
| * | | | | | | | | Merge pull request #1324 from ChriPiv/masterMattes D2014-08-281-2/+92
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Change comment formattingChristophe Piveteau2014-08-241-20/+12
| | * | | | | | | | Adjust comment formattingChristophe Piveteau2014-08-181-20/+40
| | * | | | | | | | Added a lot of commentsChristophe Piveteau2014-08-151-30/+36
| | * | | | | | | | Clarify comment messageChristophe Piveteau2014-08-151-2/+2
| | * | | | | | | | End of comment moved away from new lineChristophe Piveteau2014-08-151-2/+1
| | * | | | | | | | Add some commentsChristophe Piveteau2014-08-151-10/+21
| | * | | | | | | | Further changes in coding styleChristophe Piveteau2014-08-141-38/+28
| | * | | | | | | | Further fixing of coding style errorsChristophe Piveteau2014-08-131-26/+22
| | * | | | | | | | Another intendation errorChristophe Piveteau2014-08-131-2/+2
| | * | | | | | | | Fixed braces and intendation errorsChristophe Piveteau2014-08-131-3/+11
| | * | | | | | | | Implement ability to push minecarts on curved railsChristophe Piveteau2014-08-131-2/+70
* | | | | | | | | | Fixed anvil placing.Hownaer2014-08-281-5/+6
|/ / / / / / / / /
* | | | | | | | | Fixed ItemCategory code example.Hownaer2014-08-281-2/+2
* | | | | | | | | Fixed mob burning.reiter2014-08-281-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | DungeonRooms: Fixed an off-by-one error.Mattes D2014-08-271-2/+2
* | | | | | | | Debuggers: Added a testcase for OnProjectileHitBlock.Mattes D2014-08-271-0/+13
* | | | | | | | More basic style fixes.Mattes D2014-08-271-2/+2
* | | | | | | | Fixed basic style violations.Mattes D2014-08-272-13/+11
* | | | | | | | CheckBasicStyle: Relaxed the "space after comma".Mattes D2014-08-271-1/+1
* | | | | | | | Merge pull request #1345 from mc-server/DungeonRoomsFinisherMattes D2014-08-277-7/+359
|\ \ \ \ \ \ \ \
| * | | | | | | | DungeonRooms: Added a height probability distribution function.Mattes D2014-08-273-9/+19
| * | | | | | | | DungeonRooms: Added the spawner in the center of the room.Mattes D2014-08-271-0/+15
| * | | | | | | | DungeonRooms: Chests are never placed next to each other.Mattes D2014-08-261-22/+27
| * | | | | | | | DungeonRooms: Random pattern for floors.Mattes D2014-08-261-1/+32
| * | | | | | | | DungeonRooms: Replaced explicit switch with CanBeTerraformed().Mattes D2014-08-261-11/+3
| * | | | | | | | Merge remote-tracking branch 'origin/master' into DungeonRoomsFinisherMattes D2014-08-2624-694/+3478
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Profiling: Added profiling script for x64 executable.Mattes D2014-08-263-6/+12
| * | | | | | | | | VS Profiling: Shutdown the profiler on error.Mattes D2014-08-261-2/+6
| * | | | | | | | | Added initial dungeon rooms finisher.Mattes D2014-08-264-0/+289
* | | | | | | | | | Merge pull request #1346 from mc-server/AnvilStatsHeightsMattes D2014-08-278-16/+187
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AnvilStats: Fixed thread start race condition.Mattes D2014-08-272-10/+24
| * | | | | | | | | | AnvilStats: Added per-height spawner stats.Mattes D2014-08-272-4/+47
| * | | | | | | | | | AnvilStats: Ignoring output XLS files.Mattes D2014-08-271-0/+1
| * | | | | | | | | | AnvilStats: Added cmake directive for larger executable stack.Mattes D2014-08-271-0/+22
| * | | | | | | | | | AnvilStats: Fixed Win64 compilation.Mattes D2014-08-271-1/+1
| * | | | | | | | | | AnvilStats: initial per-height blocktype implementation (WIP).madmaxoft2014-08-273-5/+96
|/ / / / / / / / / /
* | / / / / / / / / AnvilStats: Rewritten to use CMake.madmaxoft2014-08-274-523/+126
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1290 from mc-server/RanksMattes D2014-08-2624-694/+3478
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | RankMgr: Exported the default-rank functions.Mattes D2014-08-242-6/+69
| * | | | | | | | RankMgr: Default rank is applied to players without any rank.Mattes D2014-08-243-60/+21
| * | | | | | | | RankMgr: Unified function signature comments in the bindings.Mattes D2014-08-232-28/+36
| * | | | | | | | RankMgr: Implemented default rank, added defaults.Mattes D2014-08-233-24/+198
| * | | | | | | | Merge remote-tracking branch 'origin/master' into RanksMattes D2014-08-2284-875/+1044
| |\ \ \ \ \ \ \ \
| * | | | | | | | | cMojangAPI updates cRankManager's playernames.Mattes D2014-08-214-2/+87
| * | | | | | | | | RankMgr: Added cRankManager::RemovePlayerRank().Mattes D2014-08-214-0/+60
| * | | | | | | | | Removed last remnant of cGroup.Mattes D2014-08-211-1/+0
| * | | | | | | | | Removed Group.h from Bindings' dependencies.Mattes D2014-08-211-1/+0
| * | | | | | | | | APIDump: Removed the cGroup and cGroupManager classes.Mattes D2014-08-211-25/+2
| * | | | | | | | | Removed cGroup and cGroupManager.Mattes D2014-08-2110-395/+8
| * | | | | | | | | cMojangAPI: Fixed MakeUUID___() bindings.Mattes D2014-08-212-4/+58
| * | | | | | | | | Updated the Core.Mattes D2014-08-201-0/+0
| * | | | | | | | | Exported cServer:ShouldAuthenticate to Lua API.Mattes D2014-08-202-2/+3
| * | | | | | | | | cPlayer: Exported the LoadRank function to Lua API.Mattes D2014-08-201-2/+2
| * | | | | | | | | APIDump: Added cRankManager documentation.Mattes D2014-08-201-0/+56
| * | | | | | | | | RankMgr bindings: fixed GetRankVisuals return value.Mattes D2014-08-201-18/+22
| * | | | | | | | | RankMgr: Fixed an ignored return value in the API.Mattes D2014-08-201-2/+2
| * | | | | | | | | cPlayer reads ranks from cRankManager.Mattes D2014-08-193-263/+139
| * | | | | | | | | RankMgr: Removed unneeded testing code.madmaxoft2014-08-141-208/+2
| * | | | | | | | | Merge branch 'master' into Ranksmadmaxoft2014-08-1418-77/+91
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | RankMgr: Fixed multithreading issues.madmaxoft2014-08-132-49/+109
| * | | | | | | | | | RankMgr: Initial migration code.madmaxoft2014-08-133-1/+568
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into Ranksmadmaxoft2014-08-1215-81/+181
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed unchecked return values.madmaxoft2014-08-111-3/+6
| * | | | | | | | | | | Merge branch 'master' into Ranksmadmaxoft2014-08-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Debuggers: Disabled UUID and RankMgr tests.madmaxoft2014-08-091-2/+2
| * | | | | | | | | | | | WebAdmin: Manually exported string conversion functions.madmaxoft2014-08-092-6/+64
| * | | | | | | | | | | | WebAdmin: Added GetURLEncodedString().madmaxoft2014-08-092-1/+36
| * | | | | | | | | | | | RankMgr: Added GetRankVisuals() function.madmaxoft2014-08-093-5/+81
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into Ranksmadmaxoft2014-08-0912-28/+127
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Debuggers: Simple cRankManager test case.madmaxoft2014-08-081-0/+13
| * | | | | | | | | | | | | Exported cRankManager to LuaAPI.madmaxoft2014-08-085-1/+894
| * | | | | | | | | | | | | cLuaState: Added GetStackValues() auto-generated templates.madmaxoft2014-08-081-0/+27
| * | | | | | | | | | | | | RankMgr: Finished API implementation.madmaxoft2014-08-082-38/+401
| * | | | | | | | | | | | | RankMgr: Implemented GetXforY and GetAll APIs.madmaxoft2014-08-082-18/+162
| * | | | | | | | | | | | | RankMgr: Implemented the basic API functions.madmaxoft2014-08-082-60/+696
| * | | | | | | | | | | | | RankMgr: Renamed PermissionGroup to Group in API and PermGroup in DB.madmaxoft2014-08-082-28/+36
| * | | | | | | | | | | | | RankMgr: Added SQL integer datatypes.madmaxoft2014-08-051-5/+5
| * | | | | | | | | | | | | RankMgr: More interface.madmaxoft2014-08-051-2/+14
| * | | | | | | | | | | | | RankMgr: Initial interface declaration.madmaxoft2014-08-053-0/+258
* | | | | | | | | | | | | | Type warning fixes.Mattes D2014-08-252-2/+2
* | | | | | | | | | | | | | Fixed a type warning.Mattes D2014-08-251-2/+2
* | | | | | | | | | | | | | Assume POWER is big-endian, so it compiles.Alexander Harkness2014-08-231-1/+1
* | | | | | | | | | | | | | Fixed item drop.Howaner2014-08-221-14/+18
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fixed a warning in FastRandom.Mattes D2014-08-221-1/+1
* | | | | | | | | | | | | World: Report chunk count for the spawn area.Mattes D2014-08-221-1/+1
* | | | | | | | | | | | | Fixed cPlugin::OnPlayerMoving signature.Mattes D2014-08-223-3/+3
* | | | | | | | | | | | | cLuaState: Fixed Vector3<> names pushed to Lua.Mattes D2014-08-222-5/+44
* | | | | | | | | | | | | ToLua++ lib: Assert when usertype is not known.Mattes D2014-08-221-4/+7
* | | | | | | | | | | | | Added initializers for class members.Mattes D2014-08-2114-9/+54
* | | | | | | | | | | | | cSetChunkData: Added missing initializers.Mattes D2014-08-211-0/+3
* | | | | | | | | | | | | Added cWorld initializers.Mattes D2014-08-211-0/+30
* | | | | | | | | | | | | Fixed 1.7.2 login packet reading.Mattes D2014-08-211-1/+5
* | | | | | | | | | | | | Sorted the generated param count.Mattes D2014-08-211-1/+1
* | | | | | | | | | | | | Fixed a compile-time warning in MSVC.Mattes D2014-08-211-1/+1
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1314 from mc-server/FireMattes D2014-08-212-33/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into FireHowaner2014-08-2078-860/+857
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Removes the fire if the block under the fire was broken."Howaner2014-08-111-5/+0
| * | | | | | | | | | | | | Removes the fire if the block under the fire was broken.Howaner2014-08-111-0/+5
| * | | | | | | | | | | | | Moved the clicked-through block check to the top of the function.Howaner2014-08-112-41/+17
| * | | | | | | | | | | | | Fixed cancelled fire interact from all directions.Howaner2014-08-111-4/+12
* | | | | | | | | | | | | | Merge pull request #1339 from mc-server/HooksSTRWarrior2014-08-209-42/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Renamed a_Motd to a_ServerDescription.Howaner2014-08-207-14/+14
| * | | | | | | | | | | | | Added a_ClientHandle to the HOOK_SERVER_PING hook.Howaner2014-08-208-10/+14
| * | | | | | | | | | | | | Added "HOOK_SERVER_PING" call to older protocolsHowaner2014-08-201-13/+12
| * | | | | | | | | | | | | Cleaned up code.Howaner2014-08-203-848/+1
| * | | | | | | | | | | | | Added HOOK_SERVER_PINGHowaner2014-08-208-36/+926
| * | | | | | | | | | | | | First implementation of HOOK_SERVER_PING.Howaner2014-08-165-0/+43
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1335 from mc-server/CodeFixesMattes D2014-08-2030-154/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Removed old classes from the CMakeLists.txtHowaner2014-08-201-2/+0
| * | | | | | | | | | | | | Code formatting fixes.Howaner2014-08-1929-152/+83
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Player: Silenced a few type conversion warnings.Mattes D2014-08-181-2/+2
* | | | | | | | | | | | | Player saving creates the "players" folder, if needed.Mattes D2014-08-171-0/+1
* | | | | | | | | | | | | SwamplandM: Fixed sometimes having no mountains.STRWarrior2014-08-181-1/+1
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1329 from mc-server/MoveMattes D2014-08-167-10/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Updated HOOK_PLAYER_MOVING documentation.Howaner2014-08-161-1/+3
| * | | | | | | | | | | | Better OnPlayerMoving hook.Howaner2014-08-166-9/+17
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1308 from mc-server/loggerMattes D2014-08-1524-612/+644
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Removed an unneeded cast.madmaxoft2014-08-151-1/+1
| * | | | | | | | | | | File logger prefixes are 4 chars wide.madmaxoft2014-08-131-6/+6
| * | | | | | | | | | | Logger: Fixed windows debug ODS logger, fixed-size file prefixes.madmaxoft2014-08-131-8/+9
| * | | | | | | | | | | Logger: Fixed missing timestamp in log messages.madmaxoft2014-08-131-1/+1
| * | | | | | | | | | | Fixed windows compilation and style issues.madmaxoft2014-08-124-37/+177
| * | | | | | | | | | | Fix messing renameTycho2014-08-121-1/+1
| * | | | | | | | | | | Renamed LoggersTycho2014-08-1217-439/+418
| * | | | | | | | | | | Fixed Tools to work with new logging frameworkTycho2014-08-108-216/+18
| * | | | | | | | | | | Added forgoten filesTycho2014-08-104-0/+457
| * | | | | | | | | | | First Implementatation of new Loggin frameworkTycho2014-08-1015-398/+51
* | | | | | | | | | | | CheckBasicStyle checks the src folder as well.madmaxoft2014-08-145-14/+20
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1319 from mc-server/webadminfixesMattes D2014-08-132-30/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixed shadowing variableTycho2014-08-131-5/+5
| * | | | | | | | | | Removed unused methodTycho2014-08-132-25/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1296 from mc-server/LuaAPIFranz Reiter2014-08-1213-33/+66
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Exported daylight cycle flag to the protocol.Howaner2014-08-1112-28/+29
| * | | | | | | | | Added a comment and simplified code.Howaner2014-08-102-11/+5
| * | | | | | | | | Added IsDaylightCycleEnabled saving.Howaner2014-08-101-0/+2
| * | | | | | | | | Renamed functions.Howaner2014-08-102-7/+7
| * | | | | | | | | Merge branch 'master' into LuaAPIHowaner2014-08-106-11/+102
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Renamed m_DoDaylightCycle to m_CycleDaylight.Howaner2014-08-082-7/+7
| * | | | | | | | | | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.Howaner2014-08-074-20/+56
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1316 from ChriPiv/masterAlexander Harkness2014-08-111-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add entry for bat in monsters.iniChristophe Piveteau2014-08-111-0/+6
|/ / / / / / / / / /
* | | / / / / / / / cProtocol172: Check return values.madmaxoft2014-08-111-4/+9
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1310 from mc-server/ChestFixMattes D2014-08-111-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed potential null dereferenceTycho2014-08-101-5/+5
* | | | | | | | | | Merge pull request #1301 from mc-server/OresMattes D2014-08-113-53/+120
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bunch of tweaks:STRWarrior2014-08-103-15/+15
| * | | | | | | | | | Added NaturalPatches generatorSTRWarrior2014-08-101-0/+22
| * | | | | | | | | | Added NetherOreNests.STRWarrior2014-08-101-0/+15
| * | | | | | | | | | Changed cStructGenOreNests to take a list of ores + the block to replace.STRWarrior2014-08-103-53/+83
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1312 from mc-server/unnamed-enumMattes D2014-08-116-12/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed tolua error with static initializationarchshift2014-08-112-3/+12
| * | | | | | | | | | Gave names to unnamed enumsarchshift2014-08-114-5/+5
| * | | | | | | | | | Player.cpp: change unnamed enum to constant integersarchshift2014-08-112-7/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1311 from mc-server/CMakeFixMattes D2014-08-101-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed circular dependecy luaState_Call.incTycho2014-08-101-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1309 from mc-server/coverity_fixesMattes D2014-08-101-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SpacesTycho2014-08-101-1/+1
| * | | | | | | | | | Fixed potential crash in Player.cppTycho2014-08-101-0/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1299 from mc-server/SlabsMattes D2014-08-101-0/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Changed comment.Howaner2014-08-101-3/+1
| * | | | | | | | | Added comment.Howaner2014-08-081-0/+3
| * | | | | | | | | Send the old slab to the client when the interact cancelled.Howaner2014-08-081-0/+11
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1305 from mc-server/FoodMattes D2014-08-101-4/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed swing arm animation when you ate.Howaner2014-08-101-4/+2
|/ / / / / / / /
* | | | / / / / Removed an old and outdated comment.STRWarrior2014-08-101-2/+0
| |_|_|/ / / / |/| | | | | |
* | | | | | | WebAdmin: Manually exported string conversion functions.madmaxoft2014-08-092-6/+64
* | | | | | | WebAdmin: Added GetURLEncodedString().madmaxoft2014-08-092-1/+36
|/ / / / / /
* | | | | | Merge pull request #1295 from mc-server/crystalMattes D2014-08-071-3/+3
|\ \ \ \ \ \
| * | | | | | On destroy ender crystal, create bedrock and firearchshift2014-08-061-3/+3
| |/ / / / /
* | | | | | Fixed nether wart digging.Howaner2014-08-071-0/+1
* | | | | | Removed debug message.Howaner2014-08-071-1/+0
|/ / / / /
* | | | | Merge pull request #1291 from mc-server/RedstoneCleanUpMattes D2014-08-066-21/+83
|\ \ \ \ \
| * | | | | Fixed style issuesTycho2014-08-063-5/+8
| * | | | | Fixed multiple inhertance being output by toluaTycho2014-08-062-6/+10
| * | | | | Removed dependecy of redstone simulator on NoteBlockTycho2014-08-054-12/+20
| * | | | | Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity DirectlyTycho2014-08-055-9/+56
* | | | | | Resending fire to the client when the interact cancelled.Howaner2014-08-061-0/+8
* | | | | | Merge pull request #1289 from mc-server/LuaAPIFranz Reiter2014-08-052-2/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Made lua clamp() compatible with all number types.Howaner2014-08-051-4/+4
| * | | | | Added api documentation for Clamp()Howaner2014-08-052-4/+5
| * | | | | Added Clamp() function to the lua api.Howaner2014-08-051-0/+28
|/ / / / /
* / / / / Fixed unsigned long comparison to size_tarchshift2014-08-051-1/+1
|/ / / /
* | | | MojangAPI: Fixed PlayerNameToUUID().madmaxoft2014-08-041-1/+1
* | | | Merge pull request #1287 from Howaner/BowFranz Reiter2014-08-041-0/+10
|\ \ \ \
| * | | | Changed arrow comment.Howaner2014-08-041-1/+1
| * | | | Added arrow consuming on shootingHowaner2014-08-041-0/+10
| | * | | Added new console command with cleanupTiger Wang2014-08-292-28/+45
| | * | | Improved explosion damageTiger Wang2014-08-292-48/+28
| | * | | Removed unused codeTiger Wang2014-08-293-3/+1
| | * | | Improved command block securityTiger Wang2014-08-291-6/+19
| |/ / / |/| | |
* | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-041-1/+1
|\| | |
| * | | Fixed #1286Howaner2014-08-041-1/+1
* | | | Fixed signs not staying on other signsTiger Wang2014-08-042-2/+4
* | | | Made AllToLua output consistentTiger Wang2014-08-041-2/+2
|/ / /
* | | Updated submodulesTiger Wang2014-08-042-0/+0
* | | CheckBasicStyle: multi-level indent change.madmaxoft2014-08-047-13/+33
* | | BasicStyleCheck: Dividers are exactly 80 slashes.madmaxoft2014-08-042-2/+18
* | | Merge pull request #1284 from Howaner/MonsterMattes D2014-08-042-18/+24
|\ \ \
| * \ \ Merge branch 'master' into MonsterHowaner2014-08-049-75/+69
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1285 from mc-server/StrCaseRefactorMattes D2014-08-047-47/+54
|\ \ \ \
| * | | | Refactored case-conversion functions.madmaxoft2014-08-047-47/+54
* | | | | Merge pull request #1283 from Howaner/GlobalFixesMattes D2014-08-041-6/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Changed properties for-loop.Howaner2014-08-041-1/+1
| * | | | Merge branch 'master' into GlobalFixesHowaner2014-08-032-0/+18
| |\ \ \ \
| * | | | | Fixed skins in mc 1.7.9/1.7.10Howaner2014-08-031-6/+5
* | | | | | Anvil: Wolf owner not saved if not present.madmaxoft2014-08-041-2/+8
* | | | | | Rewritten string case manipulation to use std::transform.madmaxoft2014-08-041-22/+4
| |/ / / / |/| | | |
| | * | | Changed /** to /*Howaner2014-08-041-3/+5
| | * | | Fixed warningsHowaner2014-08-041-3/+3
| | * | | Attempt to fix knockback and swimming.Howaner2014-08-042-18/+22
| |/ / / |/| | |
* | | | Attempting a compilation fix for gcc / clang.madmaxoft2014-08-032-0/+18
|/ / /
* | | Wolf uses UUID for owner.madmaxoft2014-08-035-17/+82
* | | Debuggers: Added a Name-from-UUID cMojangAPI test.madmaxoft2014-08-031-0/+7
* | | cMojangAPI: Added UUID-to-Name lookup.madmaxoft2014-08-036-71/+530
* | | Trailing whitespace fix.madmaxoft2014-08-031-1/+1
* | | Added cMojangAPI:GetUUIDFromPlayerName().madmaxoft2014-08-033-0/+36
* | | ToLua driver: disabled output buffering.madmaxoft2014-08-031-0/+3
* | | Added cPlayer::GetUUID().madmaxoft2014-08-031-0/+3
* | | Fixed a ToLua warning - operator = not supported.madmaxoft2014-08-038-8/+16
* | | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2014-08-033-101/+70
|\ \ \
| * | | Entity.cpp: Air timer comment fixarchshift2014-08-031-1/+1
| * | | Code reduction and clarity fixesarchshift2014-08-032-29/+16
| * | | Removed unused cPlayer::FoodPoison functionarchshift2014-08-032-12/+0
| * | | Entity.cpp: On portal check, use if-else for current dimensionarchshift2014-08-031-60/+54
* | | | VillageGen: Fixed a typo in commentSTRWarrior2014-08-031-1/+1
|/ / /
* | | Added proper trees and height for SwamplandM biomeSTRWarrior2014-08-023-2/+4
* | | Merge pull request #1275 from Howaner/BlockEntitysMattes D2014-08-022-1/+18
|\ \ \
| * | | Fixed a bug who can used from hacked clients.Howaner2014-08-022-1/+18
|/ / /
* | | Fixed issues with autocomplete and time loadingTiger Wang2014-08-011-7/+33
* | | Improved endermen code a littleTiger Wang2014-08-014-21/+57
* | | Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-0122-158/+859
|\ \ \
| * \ \ Merged branch 'master' into NameToUUID.madmaxoft2014-07-3171-442/+1568
| |\ \ \
| * | | | Removed trailing whitespace.madmaxoft2014-07-311-2/+2
| * | | | Fixed UUIDs handling in cPlayer.madmaxoft2014-07-312-6/+9
| * | | | MojangAPI: Moved the settings to a separate ini section.madmaxoft2014-07-311-2/+2
| * | | | MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames().madmaxoft2014-07-315-11/+55
| * | | | MojangAPI: Renamed cache file to MojangAPI.sqlite.madmaxoft2014-07-301-2/+2
| * | | | APIDump: Added notes about cache to cMojangAPI.madmaxoft2014-07-301-1/+7
| * | | | MojangAPI: Clarified the UUID conversion code.madmaxoft2014-07-302-4/+17
| * | | | ManualBindings: Fixed alignment.madmaxoft2014-07-301-3/+3
| * | | | APIDump: Fixed UUID-related documentation.madmaxoft2014-07-301-2/+2
| * | | | Debuggers: Updated for the new cMojangAPI changes.madmaxoft2014-07-301-1/+10
| * | | | MojangAPI: Implemented UUID shortening and dashing.madmaxoft2014-07-305-22/+40
| * | | | Exported cMojangAPI to Lua.madmaxoft2014-07-305-6/+46
| * | | | Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.madmaxoft2014-07-309-239/+564
| * | | | Fixed SQLiteCpp include paths for MSVC2010+.Mattes D2014-07-281-1/+1
| * | | | Fixed include directories for SQLiteCpp.madmaxoft2014-07-281-0/+6
| * | | | Added SQLiteCpp library.madmaxoft2014-07-285-0/+33
| * | | | Debuggers: Added an example for cClientHandle:GetUUIDsFromPlayerNames().madmaxoft2014-07-281-0/+31
| * | | | Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API.madmaxoft2014-07-282-3/+63
| * | | | cAuthenticator: Added GetUUIDsFromPlayerNames().madmaxoft2014-07-282-3/+116
* | | | | Merge pull request #1273 from Howaner/GlobalFixesMattes D2014-08-011-6/+14
|\ \ \ \ \
| * | | | | Added missing HOOK_BLOCK_SPREAD call.Howaner2014-08-011-6/+14
|/ / / / /
* | | | | Merge pull request #1272 from Howaner/FoodMattes D2014-08-018-48/+177
|\ \ \ \ \
| * | | | | Compile fix.Howaner2014-08-011-2/+1
| * | | | | Import Statistics.hHowaner2014-07-311-0/+1
| * | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.Howaner2014-07-318-48/+177
| | |/ / / | |/| | |
* | | | | Merge pull request #1269 from Howaner/BlockEntitysMattes D2014-08-0128-37/+891
|\ \ \ \ \
| * | | | | Use "default:" in switch.Howaner2014-07-311-3/+6
| * | | | | Updated documentation again.Howaner2014-07-311-4/+4
| * | | | | Renamed "select..." methods to "set..." and better IsValidEffect() function.Howaner2014-07-314-55/+19
| * | | | | Updated documentation.Howaner2014-07-312-8/+8
| * | | | | Renamed functions and added beacon json saving.Howaner2014-07-318-66/+84
| * | | | | Added window update.Howaner2014-07-301-0/+23
| * | | | | Added beacon load/save.Howaner2014-07-305-1/+74
| * | | | | Added beacon documentation.Howaner2014-07-302-0/+27
| * | | | | Changed return type from GetPrimaryPotion() and GetSecondaryPotion()Howaner2014-07-301-2/+2
| * | | | | Exported the beacon.Howaner2014-07-3011-17/+107
| * | | | | Added beacon.Howaner2014-07-3013-33/+689
* | | | | | Merge pull request #1270 from Howaner/OptionsMattes D2014-07-311-5/+5
|\ \ \ \ \ \
| * | | | | | Capitalised "incremental"Howaner2014-07-311-4/+4
| * | | | | | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.Howaner2014-07-311-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1271 from Howaner/GlobalFixesMattes D2014-07-312-2/+13
|\ \ \ \ \ \
| * | | | | | Changed IsSolid to FullyOccupiesVoxelHowaner2014-07-311-1/+1
| * | | | | | Fixed water from ice and removed packed ice drop.Howaner2014-07-312-2/+13
| |/ / / / /
* | | | | | Merge pull request #1047 from mc-server/EndermanTiger Wang2014-07-312-0/+121
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Comment suggestionsTiger Wang2014-07-311-9/+8
| * | | | | Added lighting code and added commentsSTRWarrior2014-07-301-0/+17
| * | | | | Removed lighting code in cEnderman::CheckEventSeePlayerSTRWarrior2014-07-301-9/+1
| * | | | | Changed commentworktycho2014-06-301-1/+1
| * | | | | Replaced strange algebra with dot product.worktycho2014-06-181-4/+6
| * | | | | Improved Enderman codeTiger Wang2014-06-182-14/+34
| * | | | | Swapped m_Player and m_EndermanPosSTRWarrior2014-06-181-2/+2
| * | | | | Enderman attacks a player if he's looking at him.STRWarrior2014-06-182-0/+91
* | | | | | Merge pull request #1267 from mc-server/RoofedForestTiger Wang2014-07-311-3/+61
|\ \ \ \ \ \
| * | | | | | SuggestionsSTRWarrior2014-07-301-2/+2
| * | | | | | Moved GetRoofedForestTreeImage content to GetDarkoakTreeImageSTRWarrior2014-07-302-66/+55
| * | | | | | Fixed doxy commentSTRWarrior2014-07-301-1/+1
| * | | | | | Fixed comment at the end of a for-loopSTRWarrior2014-07-301-1/+1
| * | | | | | Fixed compiling using ClangSTRWarrior2014-07-301-4/+2
| * | | | | | Added RoofedForest trees.STRWarrior2014-07-302-2/+73
* | | | | | | Merge pull request #1266 from mc-server/PreSimulatorConfigMattes D2014-07-303-6/+30
|\| | | | | | | |_|/ / / / |/| | | | |
| * | | | | PreSimulator: Added configurations.STRWarrior2014-07-303-6/+30
|/ / / / /
* | | | | Merged branch 'howaner/Options'.madmaxoft2014-07-308-42/+57
|\ \ \ \ \
| * | | | | Change Group->SetColor() again.Howaner2014-07-271-1/+1
| * | | | | Use AString(1, Color[0])Howaner2014-07-271-1/+1
| * | | | | Use Color[0].Howaner2014-07-271-1/+1
| * | | | | Fixed group color's.Howaner2014-07-272-16/+5
| * | | | | Add "Broadcasting" settings to world.iniHowaner2014-07-275-11/+22
| * | | | | Fixed plugin count and fixed plugin loading, when settings.ini was regenerated.Howaner2014-07-271-16/+30
* | | | | | Fixed "Dependency" typosarchshift2014-07-303-7/+7
* | | | | | Merge pull request #1262 from mc-server/CanBeTerraformedMattes D2014-07-304-44/+32
|\ \ \ \ \ \
| * | | | | | Added soulsand to the terraformed list.STRWarrior2014-07-291-0/+1
| * | | | | | Added cBlockInfo::CanBeTerraformed and made finishers use itSTRWarrior2014-07-294-44/+31
* | | | | | | Fixed FinishGen.h types.madmaxoft2014-07-301-2/+2
* | | | | | | Entity.h: Moved constants out of some unnamed enumarchshift2014-07-301-14/+14
* | | | | | | Merge pull request #1263 from Howaner/GlobalFixesarchshift2014-07-301-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Changed size_t to 'unsigned long'Howaner2014-07-301-2/+2
| * | | | | | Fixed compile error with clang.Howaner2014-07-301-2/+2
|/ / / / / /
* / / / / / Slight cleanup after portalsTiger Wang2014-07-298-20/+14
|/ / / / /
* | | | | Merge pull request #1061 from mc-server/portalsMattes D2014-07-2942-236/+673
|\ \ \ \ \
| * | | | | Detrailed whitespaceTiger Wang2014-07-291-3/+3
| * | | | | Merge branch 'master' into portalsTiger Wang2014-07-29123-696/+1749
| |\ \ \ \ \
| * | | | | | SuggestionsTiger Wang2014-07-236-24/+28
| * | | | | | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-228-61/+55
| * | | | | | Suggestion and failed merge fixTiger Wang2014-07-222-1/+6
| * | | | | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-22180-1499/+2560
| |\ \ \ \ \ \
| * | | | | | | SuggestionsTiger Wang2014-07-2110-127/+161
| * | | | | | | Bug and crash fixesTiger Wang2014-07-2012-65/+107
| * | | | | | | Fix failed merge and other issuesTiger Wang2014-07-1814-77/+28
| * | | | | | | Merge branch 'master' into portalsTiger Wang2014-07-18382-4731/+7710
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServer into portalsTiger Wang2014-06-2420-102/+297
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Conforms to standardsTiger Wang2014-06-221-1/+1
| * | | | | | | | | Merge branch 'master' into portalsTiger Wang2014-06-21103-3457/+5628
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed invalid iteratorsTiger Wang2014-06-217-39/+26
| * | | | | | | | | | More suggestionsTiger Wang2014-06-214-5/+7
| * | | | | | | | | | Implemented PR suggestionsarchshift2014-06-165-8/+6
| * | | | | | | | | | Reverted portal creation codeTiger Wang2014-06-142-103/+0
| * | | | | | | | | | Cauldrons check the heightmapTiger Wang2014-06-143-8/+12
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-1420-492/+791
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed order of initalisationTycho2014-06-122-5/+6
| * | | | | | | | | | | Removed unnessicary indirection from Entity iterator listTycho2014-06-122-6/+6
| * | | | | | | | | | | Fixed compileworktycho2014-06-121-1/+1
| * | | | | | | | | | | Portals animate and delay correctlyTiger Wang2014-06-1220-118/+175
| * | | | | | | | | | | Merge branch 'master' into portalsTiger Wang2014-06-1072-293/+2868
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Portal improvements and suggestionsTiger Wang2014-06-1010-54/+179
| * | | | | | | | | | | | Capitalisingworktycho2014-06-071-1/+1
| * | | | | | | | | | | | Fix reading 64 bit valuesworktycho2014-06-071-2/+5
| * | | | | | | | | | | | Fixed Time of dayworktycho2014-06-071-1/+1
| * | | | | | | | | | | | SuggestionsTiger Wang2014-06-057-14/+36
| * | | | | | | | | | | | Fixed decision failureTiger Wang2014-06-051-1/+1
| * | | | | | | | | | | | Fixed compilationTiger Wang2014-06-051-1/+1
| * | | | | | | | | | | | SuggestionsTiger Wang2014-06-042-2/+5
| * | | | | | | | | | | | Time and weather is saved, part of #1058Tiger Wang2014-06-042-3/+22
| * | | | | | | | | | | | Health of monsters is now savedTiger Wang2014-06-042-0/+2
| * | | | | | | | | | | | Fixed a NetherFinisher bugTiger Wang2014-06-043-24/+9
| * | | | | | | | | | | | Configurable portalsTiger Wang2014-06-044-14/+83
| * | | | | | | | | | | | SuggestionsTiger Wang2014-06-043-6/+10
| * | | | | | | | | | | | Removed use of autoTiger Wang2014-06-041-1/+1
| * | | | | | | | | | | | Added checks for no downfall biomesTiger Wang2014-06-043-3/+3
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-04130-1089/+22541
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Implemented bed homesTiger Wang2014-06-014-16/+42
| * | | | | | | | | | | | | Implemented end and nether portalsTiger Wang2014-05-3123-92/+254
| * | | | | | | | | | | | | Very minor code changesTiger Wang2014-05-293-3/+3
| * | | | | | | | | | | | | Cauldrons fillTiger Wang2014-05-294-3/+19
* | | | | | | | | | | | | | Merge pull request #1254 from mc-server/SingleTopBlockFinisherMattes D2014-07-293-22/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Some finishing touchesSTRWarrior2014-07-292-2/+2
| * | | | | | | | | | | | | | Fixed comment above cFinishGenSingleTopBlockSTRWarrior2014-07-291-1/+1
| * | | | | | | | | | | | | | SingleTopBlock: All blocktypes and biometypes get initialized properlySTRWarrior2014-07-291-2/+14
| * | | | | | | | | | | | | | Using suggestionsSTRWarrior2014-07-281-25/+20
| * | | | | | | | | | | | | | Forgot Mesa Plateau biome.STRWarrior2014-07-281-0/+1
| * | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlockSTRWarrior2014-07-283-20/+82
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1252 from mc-server/RoughRavinesGenMattes D2014-07-295-3/+451
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Added a missing include for abs(float).madmaxoft2014-07-271-0/+6
| * | | | | | | | | | | | | RoughRavines: Made floor and ceiling settings-adjustable.madmaxoft2014-07-274-20/+99
| * | | | | | | | | | | | | RoughRavines: Added per-height radius modifier. Ledges!madmaxoft2014-07-271-32/+73
| * | | | | | | | | | | | | RoughRavines: More settings - size, width, roughnessmadmaxoft2014-07-273-23/+84
| * | | | | | | | | | | | | RoughRavines: Initial generator implementation.madmaxoft2014-07-274-3/+264
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | DistortedHeightmap: Now generates gravel in deep ocean.STRWarrior2014-07-281-1/+1
* | | | | | | | | | | | | Hotfixed compilation problems.madmaxoft2014-07-272-2/+2
* | | | | | | | | | | | | Merge pull request #1236 from Howaner/Inventory2Mattes D2014-07-2717-72/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Derp.Howaner2014-07-261-1/+1
| * | | | | | | | | | | | | Rename function.Howaner2014-07-264-6/+6
| * | | | | | | | | | | | | Merge branch 'master' into Inventory2Howaner2014-07-26108-663/+952
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix item durability.Howaner2014-07-2316-69/+149
* | | | | | | | | | | | | | | NetherClumpGenerator: Fixed generating stuff on halfslabs and fencesSTRWarrior2014-07-271-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Updated NetherForts' weights.madmaxoft2014-07-271-2/+2
* | | | | | | | | | | | | | Merge pull request #1250 from mc-server/NetherCeilingMattes D2014-07-271-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed forgotten commentSTRWarrior2014-07-271-1/+1
| * | | | | | | | | | | | | | Made nether ceiling smooth.STRWarrior2014-07-271-1/+8
| * | | | | | | | | | | | | | Added a ceiling to disguise the bedrock above it.STRWarrior2014-07-271-1/+9
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | NetherClumpFoliage: Fixed assertSTRWarrior2014-07-271-8/+39
* | | | | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content.madmaxoft2014-07-271-37/+752
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1232 from mc-server/splash-entityMattes D2014-07-267-139/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SplashPotionEntity: Use `const cItem &` instead of a cItemarchshift2014-07-262-2/+2
| * | | | | | | | | | | | | Fixed indentations, removed redundant init code in SplashPotionEntity.cpparchshift2014-07-264-9/+7
| * | | | | | | | | | | | | Moved potion static functions to EntityEffect to create splash potions through worldarchshift2014-07-267-139/+164
* | | | | | | | | | | | | | Merge pull request #1207 from Howaner/InventoryMattes D2014-07-264-10/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Change comment.Howaner2014-07-261-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into InventoryHowaner2014-07-26257-2009/+3248
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Git: Ignore AllFiles.lst (generated by cmake)archshift2014-07-261-0/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Endianness.h: undefined ntohll before redefiningarchshift2014-07-261-0/+1
* | | | | | | | | | | | | Removed the new old-style-cast warning from error treatmentarchshift2014-07-261-1/+1
* | | | | | | | | | | | | Tweaks to NetherClumpFoliageSTRWarrior2014-07-251-34/+6
* | | | | | | | | | | | | Speed up the NetherClumpFoliage finisher.STRWarrior2014-07-251-8/+9
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/master'Tiger Wang2014-07-2484-229/+470
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1235 from mc-server/redundant-semisMattes D2014-07-2475-111/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Made redundant semi not an error, fixed one more.archshift2014-07-242-2/+2
| | * | | | | | | | | | | | | Removed redundant semicolons and re-added warningarchshift2014-07-2474-110/+110
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Added a queue for setting chunk data.madmaxoft2014-07-2411-118/+349
| * | | | | | | | | | | | | Made the cWorld::SpawnMobFinalize function more readable.STRWarrior2014-07-241-0/+10
* | | | | | | | | | | | | | Fixed block dropsTiger Wang2014-07-245-17/+59
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1237 from tonibm19/masterMattes D2014-07-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Moar view distance!tonibm192014-07-231-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | TallGrass: Less grass on mountains.STRWarrior2014-07-231-0/+11
* | | | | | | | | | | | | Fixed possible crash in the NetherClumpFoliage finisher.STRWarrior2014-07-231-0/+5
* | | | | | | | | | | | | BlockLeaves: Fixed comment style.madmaxoft2014-07-231-2/+2
* | | | | | | | | | | | | Fixed MSVC bindings regeneration.madmaxoft2014-07-221-1/+1
* | | | | | | | | | | | | Fixed Bindings generation in MSVC.madmaxoft2014-07-221-2/+2
* | | | | | | | | | | | | Merge pull request #1234 from mc-server/GeneratorTweaksarchshift2014-07-221-13/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Extreme Hills M variant only spawn with grass and stoneSTRWarrior2014-07-221-1/+1
| * | | | | | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass onlySTRWarrior2014-07-211-12/+2
* | | | | | | | | | | | | | Export SendEntityAnimation to ToLuaarchshift2014-07-221-1/+1
* | | | | | | | | | | | | | Fix misguided comment on bits...Tiger Wang2014-07-221-1/+1
* | | | | | | | | | | | | | Export BroadcastEntityAnimation with ToLuaarchshift2014-07-221-1/+1
* | | | | | | | | | | | | | Merge pull request #1216 from mc-server/saplingsandleavesTiger Wang2014-07-2210-141/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into saplingsandleavesTiger Wang2014-07-22111-937/+1094
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Updated prefabs to current Gallery content.madmaxoft2014-07-223-226/+243
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merged branch 'origin/Foliage'.madmaxoft2014-07-213-0/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed a missing enter.STRWarrior2014-07-211-0/+1
| * | | | | | | | | | | | | Removed y for-loop.STRWarrior2014-07-211-27/+27
| * | | | | | | | | | | | | Fixed indentationSTRWarrior2014-07-211-12/+12
| * | | | | | | | | | | | | Changed CubicNoiseXX to IntNoiseXXSTRWarrior2014-07-202-40/+49
| * | | | | | | | | | | | | Renamed cFinishGenFoliage to cFinishGenTallGrassSTRWarrior2014-07-203-17/+34
| * | | | | | | | | | | | | Fixed warningsSTRWarrior2014-07-202-5/+4
| * | | | | | | | | | | | | First attempt for a new foliage finisherSTRWarrior2014-07-203-0/+74
* | | | | | | | | | | | | | Defines.h: Fixed a warning.madmaxoft2014-07-211-1/+1
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | CheckBasicStyle: Added a lua shebang.madmaxoft2014-07-211-0/+1
* | | | | | | | | | | | | CheckBasicStyle: Doesn't require LuaFileSystem.madmaxoft2014-07-211-34/+10
* | | | | | | | | | | | | CMake: generates a list of all source files.madmaxoft2014-07-212-0/+21
* | | | | | | | | | | | | Normalized spaces after "catch".madmaxoft2014-07-212-3/+4
* | | | | | | | | | | | | CheckBasicStyle: Checks spaces after keywords, no space before ")".madmaxoft2014-07-211-1/+16
* | | | | | | | | | | | | Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-2194-535/+541
* | | | | | | | | | | | | Style: Normalized spaces after if, for and while.madmaxoft2014-07-2128-135/+137
* | | | | | | | | | | | | Cuboid: added explicit copy assignment operatorarchshift2014-07-212-0/+13
* | | | | | | | | | | | | Merge pull request #1213 from mc-server/chat-colorMattes D2014-07-206-57/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ChatColor.h: The @deprecated tag slipped. Oops.archshift2014-07-201-2/+2
| * | | | | | | | | | | | | Fixed attempts to call c_str on ChatColorsarchshift2014-07-192-6/+6
| * | | | | | | | | | | | | Removed references to deprecated cChatColor::Colorarchshift2014-07-192-2/+2
| * | | | | | | | | | | | | Refactored cChatColorarchshift2014-07-192-49/+51
* | | | | | | | | | | | | | Revert "Only one instance of server can be started"Tiger Wang2014-07-201-0/+2
* | | | | | | | | | | | | | Line tracer invalid chunk fixTiger Wang2014-07-202-26/+27
| | | * | | | | | | | | | | Merge branch 'master' into saplingsandleavesTiger Wang2014-07-20345-2335/+3502
| | | |\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | NBTChunkSerializer.cpp: Added break after serializing the splash potionarchshift2014-07-201-0/+1
* | | | | | | | | | | | | | Merge pull request #1231 from mc-server/ticks-aliveTiger Wang2014-07-203-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added m_TicksAlive to entities, allows projectiles to hit their creatorsarchshift2014-07-203-3/+14
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Added destroy-timer system to splash potion entitiesarchshift2014-07-202-3/+24
* | | | | | | | | | | | | | Merge pull request #1227 from mc-server/fixesMattes D2014-07-205-23/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | main.cpp: field style fixesarchshift2014-07-203-12/+12
| * | | | | | | | | | | | | | Socket: removed unused Socket destructorarchshift2014-07-192-10/+0
| * | | | | | | | | | | | | | main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATEDarchshift2014-07-193-6/+6
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / Monsters: Made IsUndead overridable by the respective mob classesarchshift2014-07-196-13/+11
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | CheckBasicStyle: Checks for braces not on separate lines.madmaxoft2014-07-191-2/+6
* | | | | | | | | | | | | Code style: Fixed braces on separate lines.madmaxoft2014-07-1914-20/+38
* | | | | | | | | | | | | CheckBasicStyle: Check spaces around commas.madmaxoft2014-07-191-6/+6
* | | | | | | | | | | | | Fixed spaces after commas in protocol data.madmaxoft2014-07-191-7/+7
* | | | | | | | | | | | | Fixed style: spaces after commas.madmaxoft2014-07-1942-101/+100
* | | | | | | | | | | | | Merge pull request #1214 from mc-server/anti-globMattes D2014-07-1916-214/+847
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed MSVC bindings generation.madmaxoft2014-07-192-4/+4
| * | | | | | | | | | | | | Moved Windows custom command to src/CMakeLists.txtarchshift2014-07-192-15/+20
| * | | | | | | | | | | | | CMakeLists: Moved Bindings-specific code to subdirarchshift2014-07-193-120/+125
| * | | | | | | | | | | | | Blocks/CMakeLists.txt: Fixed header list after merge of masterarchshift2014-07-192-10/+6
| * | | | | | | | | | | | | CMake: Add Bindings library from subdirectoryarchshift2014-07-192-23/+12
| * | | | | | | | | | | | | src/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-192-20/+180
| * | | | | | | | | | | | | Subdirs: Only add_library if not using MSVCarchshift2014-07-1913-19/+45
| * | | | | | | | | | | | | src/CMakeLists: Small changes for increased readabilityarchshift2014-07-191-5/+9
| * | | | | | | | | | | | | OSSupport/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+32
| * | | | | | | | | | | | | HTTPServer/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+20
| * | | | | | | | | | | | | Generating/Prefabs/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+22
| * | | | | | | | | | | | | Simulator/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+28
| * | | | | | | | | | | | | WorldStorage/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+26
| * | | | | | | | | | | | | Generating/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+54
| * | | | | | | | | | | | | BlockEntities/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+35
| * | | | | | | | | | | | | UI/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+9
| * | | | | | | | | | | | | Protocol/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+23
| * | | | | | | | | | | | | Blocks/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+92
| * | | | | | | | | | | | | Items/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+47
| * | | | | | | | | | | | | Entities/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+56
| * | | | | | | | | | | | | Mobs/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+69
* | | | | | | | | | | | | | Merge pull request #1223 from mc-server/fixesMattes D2014-07-1910-61/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | World.cpp: fixed not all enum fields being used in m_Dimension switcharchshift2014-07-191-1/+2
| * | | | | | | | | | | | | | Minecart: slimmed down SpawnOn by keeping subtype in the payload enumarchshift2014-07-192-20/+7
| * | | | | | | | | | | | | | Trees.cpp: removed unused "debug" fieldsarchshift2014-07-191-7/+1
| * | | | | | | | | | | | | | Fixed clamping issuesarchshift2014-07-196-33/+6
* | | | | | | | | | | | | | | Merge pull request #1224 from mc-server/fixes-potionsMattes D2014-07-195-14/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Splash potions: Renamed PotionParticleType to PotionColor for clarityarchshift2014-07-195-15/+15
| * | | | | | | | | | | | | | Fixed splash potion color on tossarchshift2014-07-192-0/+16
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Renamed AllToLua_lua script.madmaxoft2014-07-191-0/+0
* | | | | | | | | | | | | | Authenticator.cpp: Killed a global destructor warningarchshift2014-07-191-53/+56
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'Inventory2'madmaxoft2014-07-186-4/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Debuggers: Optimized and commented the /rmitem handler.madmaxoft2014-07-181-4/+8
| * | | | | | | | | | | | | APIDump: Documented RemoveItem().madmaxoft2014-07-181-0/+2
| * | | | | | | | | | | | | Clarified RemoveItem()'s comments.madmaxoft2014-07-182-2/+4
| * | | | | | | | | | | | | Added RemoveItem() function to the player inventory.Howaner2014-07-185-4/+93
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'Entities'madmaxoft2014-07-184-11/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed slime-related comments.madmaxoft2014-07-183-5/+10
| * | | | | | | | | | | | | Slime sizes are 1, 2 or 4 and not 1, 2 or 3.Howaner2014-07-183-4/+4
| * | | | | | | | | | | | | Split into more lines.Howaner2014-07-172-6/+10
| * | | | | | | | | | | | | Fixed many slime bugs.Howaner2014-07-173-7/+74
* | | | | | | | | | | | | | Merge branch 'Sign'madmaxoft2014-07-184-34/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Normalized code style for both sign handlers.madmaxoft2014-07-182-16/+20
| * | | | | | | | | | | | | Removed cBlockSignPostHandler descend.Howaner2014-07-181-2/+28
| * | | | | | | | | | | | | Added a extra wall sign handler.Howaner2014-07-184-27/+85
* | | | | | | | | | | | | | Monster fixesTiger Wang2014-07-188-35/+5
* | | | | | | | | | | | | | MCServer supports Minecraft v1.7.10archshift2014-07-181-1/+1
* | | | | | | | | | | | | | Fixed creative players not being able to drinkarchshift2014-07-181-3/+4
* | | | | | | | | | | | | | CheckBasicStyle: Proper spaces with commas.madmaxoft2014-07-181-21/+48
* | | | | | | | | | | | | | Fixed spaces before commas.madmaxoft2014-07-187-14/+14
* | | | | | | | | | | | | | Removed duplicate IPvX labels.madmaxoft2014-07-183-6/+6
* | | | | | | | | | | | | | Merge pull request #1208 from Howaner/MobInventoryMattes D2014-07-182-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Skeletons should spawn with a bow in the hand.Howaner2014-07-182-0/+17
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Moved ChatColor.h out of defines where it was not neededarchshift2014-07-182-1/+1
* | | | | | | | | | | | | | Merge pull request #1210 from Howaner/APIMattes D2014-07-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed special character in APIDumpHowaner2014-07-181-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1212 from mc-server/never-readMattes D2014-07-181-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ProtocolRecognizer.cpp: removed unused NumBytesReadarchshift2014-07-181-2/+0
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Generator: removed rnd definitions that are never readarchshift2014-07-182-2/+0
* | | | | | | | | | | | | | Merge pull request #1209 from Howaner/GlobalFixesarchshift2014-07-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Added me to the CONTRIBUTORS list. I hope it is ok.Howaner2014-07-181-0/+1
|/ / / / / / / / / / / / /
| | | * | | | | | | | | | Proper comment for DropBlock()Tiger Wang2014-07-201-2/+5
| | | * | | | | | | | | | Fixed issues relating to saplings and leavesTiger Wang2014-07-1710-139/+32
| | |/ / / / / / / / / / | |/| | | | | | | | | |
| | | * | | | | | | | | Add armor items directly to the armor slots.Howaner2014-07-203-3/+16
| | | * | | | | | | | | Moved comment.Howaner2014-07-181-1/+1
| | | * | | | | | | | | Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary.Howaner2014-07-182-9/+13
| | | * | | | | | | | | Items should first added to the first slot, not the latest.Howaner2014-07-181-3/+3
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Fixed NULL being passed instead of a double to AddEntityEffectarchshift2014-07-171-1/+1
* | | | | | | | | | | Fixed code style in Trees.cpp.madmaxoft2014-07-171-24/+24
* | | | | | | | | | | Fixed tabs used for alignment.madmaxoft2014-07-1729-99/+115
* | | | | | | | | | | More trailing whitespace fixes.madmaxoft2014-07-1713-25/+25
* | | | | | | | | | | Player.cpp: Fixed compile errorarchshift2014-07-171-1/+1
* | | | | | | | | | | Player.cpp: Added Wither death messagearchshift2014-07-171-0/+1
* | | | | | | | | | | Basic style fixes.madmaxoft2014-07-17130-286/+290
* | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServermadmaxoft2014-07-173-25/+12
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #1204 from Howaner/BlocksAlexander Harkness2014-07-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix sapling drop.Howaner2014-07-171-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Fixed mob knockbackTiger Wang2014-07-171-23/+8
| * | | | | | | | | | Fixed crash with entities in unloaded chunksTiger Wang2014-07-171-1/+3
* | | | | | | | | | | Initial version of a script to check basic style.madmaxoft2014-07-171-0/+188
* | | | | | | | | | | Normalized comments.madmaxoft2014-07-17173-867/+893
* | | | | | | | | | | Fixed spaces around single-line comments.madmaxoft2014-07-1734-139/+141
* | | | | | | | | | | Fixed basic whitespace problems.madmaxoft2014-07-1752-298/+306
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1183 from Howaner/SoundsTiger Wang2014-07-171-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Derp.Howaner2014-07-151-2/+2
| * | | | | | | | | | Reset meta to zero when the block explode.Howaner2014-07-141-4/+4
* | | | | | | | | | | Merge pull request #1079 from mc-server/potionsMattes D2014-07-1740-119/+1596
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed 3 MSVC warnings in SplashPotionEntity.madmaxoft2014-07-171-1/+1
| * | | | | | | | | | | Updated cPawn::KilledBy signature for custom death messages.madmaxoft2014-07-172-3/+3
| * | | | | | | | | | | Merge branch 'master' into potionsmadmaxoft2014-07-1721-41/+62
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1193 from mc-server/deathmessagesMattes D2014-07-1721-41/+62
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Resolved backwards compatibility issuesTiger Wang2014-07-167-9/+9
| * | | | | | | | | | | | Tailored death messagesTiger Wang2014-07-0420-40/+61
| | * | | | | | | | | | | Reformatted cItemPotionHandler.madmaxoft2014-07-172-48/+79
| | * | | | | | | | | | | Fixed formatting for cWitherSkullEntitymadmaxoft2014-07-172-3/+13
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potionsmadmaxoft2014-07-1716-124/+261
| | |\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Another fix for excessive food drainTiger Wang2014-07-162-1/+10
* | | | | | | | | | | | | Fixed a bug with bucketsTiger Wang2014-07-162-9/+10
* | | | | | | | | | | | | Fixed another redstone simulator crashTiger Wang2014-07-161-0/+7
* | | | | | | | | | | | | Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-1611-113/+233
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SuggestionsTiger Wang2014-07-161-2/+5
| * | | | | | | | | | | | | Function renameTiger Wang2014-07-162-3/+3
| * | | | | | | | | | | | | Unified functionsTiger Wang2014-07-162-34/+28
| * | | | | | | | | | | | | Store properties as Json::ValueTiger Wang2014-07-169-21/+44
| * | | | | | | | | | | | | Player properties are now retrievedTiger Wang2014-07-1411-116/+216
* | | | | | | | | | | | | | Fixed a DropSpenser AddFace bugTiger Wang2014-07-151-1/+1
| | | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potionsmadmaxoft2014-07-157-80/+246
| | | |\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1191 from Masy98/BlocksTiger Wang2014-07-151-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.Masy982014-07-151-1/+0
| * | | | | | | | | | | | | | Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.Masy982014-07-151-12/+0
* | | | | | | | | | | | | | | Merge pull request #1189 from Masy98/BlocksMattes D2014-07-152-63/+214
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Added Brick fence to m_TransparentMasy982014-07-151-0/+1
| * | | | | | | | | | | | | | Added various missing blocks in the lists in BlockInfo.cppMasy982014-07-152-64/+214
* | | | | | | | | | | | | | | Fixed code formatting.madmaxoft2014-07-152-6/+9
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/ClearMetaMixin'madmaxoft2014-07-154-12/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Added super typedefTycho2014-07-153-3/+6
| * | | | | | | | | | | | | | | COnverted Lilypad back to mixinTycho2014-07-151-8/+2
| * | | | | | | | | | | | | | | Revert "Converted some blockhandlers to use cClearMetaOnDrop"Tycho2014-07-159-21/+67
| * | | | | | | | | | | | | | | Added documentationTycho2014-07-141-0/+6
| * | | | | | | | | | | | | | | Converted some blockhandlers to use cClearMetaOnDropTycho2014-07-149-67/+21
| * | | | | | | | | | | | | | | Simplified ClearMetaOnDropTycho2014-07-141-1/+1
| * | | | | | | | | | | | | | | Added cClearOnDrop Mixin to cPumpkinTycho2014-07-141-2/+2
| * | | | | | | | | | | | | | | Added first implementation of cClearMetaOnDropTycho2014-07-142-2/+21
* | | | | | | | | | | | | | | | Merge pull request #1188 from mc-server/FindClosestPlayerFixMattes D2014-07-151-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed FindClosestPlayerTycho2014-07-151-3/+6
|/ / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | Restructured cSplashPotionEntity code.madmaxoft2014-07-155-72/+104
| | | | | * | | | | | | | | | Only the cEntityEffect::effXXX constants are Lua-exported.madmaxoft2014-07-152-72/+102
| | | | | * | | | | | | | | | Reformatted EntityEffect code.madmaxoft2014-07-151-25/+29
| | | | | * | | | | | | | | | Fixed a MSVC warning in cEntityEffect::CreateEntityEffect().madmaxoft2014-07-151-0/+1
| | | | | * | | | | | | | | | Merge branch 'master' into potionsmadmaxoft2014-07-1572-443/+699
| | | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Pass cItem by reference.madmaxoft2014-07-151-1/+1
* | | | | | | | | | | | | | | Added missing member initialization to cGridStructGen.madmaxoft2014-07-151-0/+1
* | | | | | | | | | | | | | | Fixed redstone simulator crashTiger Wang2014-07-152-8/+31
* | | | | | | | | | | | | | | Fixed some meta resetting bugsTiger Wang2014-07-146-27/+28
* | | | | | | | | | | | | | | Maybe improved arrow sinkingTiger Wang2014-07-141-2/+2
* | | | | | | | | | | | | | | Fixed placing liquids over liquidsTiger Wang2014-07-141-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1177 from mc-server/ChestFixMattes D2014-07-141-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ChestFixTycho2014-07-136-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed Issue with Comparing agast the wrong chest, potentially causing crashes.worktycho2014-07-131-7/+7
* | | | | | | | | | | | | | | | Merge pull request #1172 from mc-server/coverity_fixesMattes D2014-07-133-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Added parenthasiesworktycho2014-07-131-1/+1
| * | | | | | | | | | | | | | | | CopyPaste Errorworktycho2014-07-131-1/+1
| * | | | | | | | | | | | | | | | Another COpyPaste Errorworktycho2014-07-131-1/+1
| * | | | | | | | | | | | | | | | Fix CopyPaste error that ment a_MaxRelX wasdn't checkedworktycho2014-07-131-1/+1
| * | | | | | | | | | | | | | | | Check GridSize for 0worktycho2014-06-261-0/+10
| * | | | | | | | | | | | | | | | Add Null check to SendBlockToworktycho2014-06-261-1/+1
* | | | | | | | | | | | | | | | | Tolua driver: Fixed wrong indentation.madmaxoft2014-07-131-15/+15
| |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #1178 from mc-server/projectilefixMattes D2014-07-136-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Adjusted calls to CreateProjectile that passed ItemsTycho2014-07-132-2/+2
| * | | | | | | | | | | | | | | Made CreateProjectile a pointerworktycho2014-07-134-6/+7
|/ / / / / / / / / / / / / / /
* | | | | | / / / / / / / / / Fixed MSVC warnings in SoundEffect functions.madmaxoft2014-07-133-15/+7
| |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Update.Howaner2014-07-131-1/+1
* | | | | | | | | | | | | | Merge branch 'master' into SoundsHowaner2014-07-138-19/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1167 from Howaner/PluginsMattes D2014-07-131-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed diamond mover pluginHowaner2014-07-131-3/+5
| * | | | | | | | | | | | | | Merge pull request #1133 from Howaner/SheepMattes D2014-07-134-10/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Changed comments.Howaner2014-07-131-3/+5
| | * | | | | | | | | | | | | | Merge branch 'master' into SheepHowaner2014-07-13117-2034/+2670
| | |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add doxy-comments.Howaner2014-07-011-1/+4
| | * | | | | | | | | | | | | | Moved the random code to a function (cSheep::GenerateNaturalRandomColor())Howaner2014-06-302-36/+47
| | * | | | | | | | | | | | | | Code fixes.Howaner2014-06-291-1/+1
| | * | | | | | | | | | | | | | Save IsSheared from Sheep.Howaner2014-06-282-4/+14
| | * | | | | | | | | | | | | | Fix sheep color's, add shear sound.Howaner2014-06-283-3/+42
| * | | | | | | | | | | | | | | Merge pull request #1166 from Howaner/GlobalFixesMattes D2014-07-133-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE)Howaner2014-07-133-6/+6
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
* | / | | | | | | | | | | | | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-1336-83/+77
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Only one instance of server can be startedTiger Wang2014-07-131-2/+0
* | | | | | | | | | | | | | Revert failed fix for #31Tiger Wang2014-07-132-31/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-1326-218/+387
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cNBTChunkSerializer: Fixed alignment.madmaxoft2014-07-121-14/+14
| * | | | | | | | | | | | | cHopperEntity: Simplified chest conditions.madmaxoft2014-07-121-10/+4
| * | | | | | | | | | | | | cChestEntity: Renamed a member to avoid confusion.madmaxoft2014-07-122-8/+9
| * | | | | | | | | | | | | Fixed alignment.madmaxoft2014-07-121-2/+3
| * | | | | | | | | | | | | Suggestions and bug fixTiger Wang2014-07-127-30/+35
| * | | | | | | | | | | | | SuggestionsTiger Wang2014-07-113-2/+6
| * | | | | | | | | | | | | SuggestionsTiger Wang2014-07-114-14/+18
| * | | | | | | | | | | | | Improved LinkedPowering speedTiger Wang2014-07-111-15/+15
| * | | | | | | | | | | | | Made things consistentTiger Wang2014-07-082-6/+9
| * | | | | | | | | | | | | Fixed compilation and pressure platesTiger Wang2014-07-071-8/+4
| * | | | | | | | | | | | | Implemented trapped chests & othersTiger Wang2014-07-0726-179/+340
* | | | | | | | | | | | | | Comment grammar correctionTiger Wang2014-07-121-1/+1
* | | | | | | | | | | | | | Simplified buckets code slightlyTiger Wang2014-07-121-32/+15
* | | | | | | | | | | | | | Merge pull request #1162 from daniel0916/FixesTiger Wang2014-07-121-23/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Changesdaniel09162014-07-121-5/+4
| * | | | | | | | | | | | | | Changesdaniel09162014-07-111-24/+16
| * | | | | | | | | | | | | | Changesdaniel09162014-07-101-20/+22
| * | | | | | | | | | | | | | Maybe fixed whitespacesdaniel09162014-07-101-7/+7
| * | | | | | | | | | | | | | Maybe fixed whitespacesdaniel09162014-07-101-1/+1
| * | | | | | | | | | | | | | Fixed Bucket Placingdaniel09162014-07-101-6/+57
| * | | | | | | | | | | | | | Fixed Bucket placingdaniel09162014-07-091-1/+1
| | | | | | * | | | | | | | | ItemHandler.cpp: removed redundant food and drink checksarchshift2014-07-141-33/+0
| | | | | | * | | | | | | | | Readability and clarity changesarchshift2014-07-144-59/+68
| | | | | | * | | | | | | | | OnEntityAddEffect.lua: Removed Originator paramarchshift2014-07-141-1/+0
| | | | | | * | | | | | | | | EntityEffect: Inlined functions, added explicit copy constructor and operator.archshift2014-07-142-20/+29
| | | | | | * | | | | | | | | Changed separating comment style from asterisks to slashes.archshift2014-07-142-93/+93
| | | | | | * | | | | | | | | Added splash potions to NBT serialization and retrievalarchshift2014-07-126-1/+50
| | | | | | * | | | | | | | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-1214-161/+400
| | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Simplified the player data loading.madmaxoft2014-07-111-9/+8
* | | | | | | | | | | | | | | Player data filenames are based on UUID.madmaxoft2014-07-114-67/+155
* | | | | | | | | | | | | | | Fixed a missing return value.madmaxoft2014-07-111-0/+2
* | | | | | | | | | | | | | | Preparation for player UUID-based storage: LoadFromFile()madmaxoft2014-07-112-21/+42
* | | | | | | | | | | | | | | Fixed style consistency.madmaxoft2014-07-102-61/+64
* | | | | | | | | | | | | | | APIDump: Documented cWorld:SetChunkAlwaysTicked.madmaxoft2014-07-101-0/+1
* | | | | | | | | | | | | | | Debuggers: Added forced chunk ticking test.madmaxoft2014-07-101-0/+28
* | | | | | | | | | | | | | | Implemented support for forced chunk ticking.madmaxoft2014-07-106-8/+95
* | | | | | | | | | | | | | | Merge pull request #1159 from mc-server/VectorFloorFixMattes D2014-07-101-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed a missing "inline" keyword.madmaxoft2014-07-101-1/+1
| * | | | | | | | | | | | | | | Fixed Vector3.h compilation in MSVC2008.madmaxoft2014-07-101-0/+9
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Removed lilypad from plains village prefabs.madmaxoft2014-07-101-7/+8
| | | | | | * | | | | | | | | For now, removed creator member from Entity Effect for pointer safetyarchshift2014-07-1212-104/+94
| | | | | | * | | | | | | | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-10156-5178/+7390
| | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1157 from Howaner/WindowMattes D2014-07-093-41/+237
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Removed unused include line.Howaner2014-07-091-1/+0
| * | | | | | | | | | | | | | | Added inventory number click.Howaner2014-07-092-1/+43
| * | | | | | | | | | | | | | | Added drop window action.Howaner2014-07-063-25/+113
| * | | | | | | | | | | | | | | Add middle click.Howaner2014-07-052-21/+88
* | | | | | | | | | | | | | | | Fixed bow chargeTiger Wang2014-07-091-11/+2
* | | | | | | | | | | | | | | | Fixed arrow collection animationTiger Wang2014-07-095-33/+4
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-0919-110/+272
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Added extra space before commentsTiger Wang2014-07-071-6/+6
| * | | | | | | | | | | | | | | Changed everything to callbacksTiger Wang2014-07-054-82/+53
| * | | | | | | | | | | | | | | Crash and compile fixTiger Wang2014-07-043-5/+10
| * | | | | | | | | | | | | | | Compile fixTiger Wang2014-07-041-1/+1
| * | | | | | | | | | | | | | | SuggestionsTiger Wang2014-07-047-11/+20
| * | | | | | | | | | | | | | | Various fixedTiger Wang2014-07-044-17/+111
| * | | | | | | | | | | | | | | Eps comparisonTiger Wang2014-07-042-2/+2
| * | | | | | | | | | | | | | | SuggestionsTiger Wang2014-07-024-19/+31
| * | | | | | | | | | | | | | | Vector clamping fixesTiger Wang2014-07-012-21/+24
| * | | | | | | | | | | | | | | Implemented Vector3<>::Floor()Tiger Wang2014-06-302-10/+19
| * | | | | | | | | | | | | | | SuggestionsTiger Wang2014-06-293-3/+20
| * | | | | | | | | | | | | | | An unification of code styleTiger Wang2014-06-281-1/+1
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bettered zombie and skeleton AITiger Wang2014-06-222-6/+4
| * | | | | | | | | | | | | | Some Entity.cpp style improvementsTiger Wang2014-06-222-13/+8
| * | | | | | | | | | | | | | Fixed multiple issues with projectilesTiger Wang2014-06-228-63/+112
* | | | | | | | | | | | | | | Updated generator prefabs to current Gallery contents.madmaxoft2014-07-083-7/+8
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed OpenSSL programs and tests being generated when testing disabled.tycho2014-07-061-2/+2
* | | | | | | | | | | | | | Merge pull request #1144 from mc-server/LuaCodeGenMattes D2014-07-065-624/+227
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Tolua generates LuaState_Call.inc file.madmaxoft2014-07-014-624/+31
| * | | | | | | | | | | | | | Initial codegen for LuaState_Call.inc.madmaxoft2014-07-011-0/+196
* | | | | | | | | | | | | | | Fixed crafting grid updating.Mattes D2014-07-062-2/+21
* | | | | | | | | | | | | | | Fixed slime handling in cMonster::StringToMobType().madmaxoft2014-07-061-1/+1
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1151 from mc-server/immediatesocketrebindMattes D2014-07-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | MCS WebAdmin sockets rebinds instantlyTiger Wang2014-07-041-0/+2
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | cPluginManager: Reformatted the switch statement.madmaxoft2014-07-041-7/+34
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/HandleCommand'madmaxoft2014-07-043-32/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed useless sentence in cPluginManager:ExecuteCommand description.STRWarrior2014-07-041-1/+1
| * | | | | | | | | | | | | | Moved sending error messages to cPluginManager:CallHookChatSTRWarrior2014-07-041-4/+6
| * | | | | | | | | | | | | | Fixed ExecuteCommand description.STRWarrior2014-07-041-1/+1
| * | | | | | | | | | | | | | Fixed doxycommentsSTRWarrior2014-06-281-3/+3
| * | | | | | | | | | | | | | (Force)ExecuteCommand returns the CommandResult enumsSTRWarrior2014-06-183-10/+25
| * | | | | | | | | | | | | | Added crBlocked and crNoPermissionSTRWarrior2014-06-172-2/+4
| * | | | | | | | | | | | | | HandleCommand now returns an CommandResult enum.STRWarrior2014-06-172-23/+19
| * | | | | | | | | | | | | | Fixed possible confusion.STRWarrior2014-06-172-2/+8
* | | | | | | | | | | | | | | Fixed c1deda5d8f01811efa5094e9375166acb69d50edTiger Wang2014-07-041-2/+2
* | | | | | | | | | | | | | | Removed world-saving log messages.madmaxoft2014-07-043-35/+5
* | | | | | | | | | | | | | | APIDump: Updated OnWeatherChanging docs after latest code changes.madmaxoft2014-07-031-4/+7
* | | | | | | | | | | | | | | Changed OnWeatherChanging hook to always read the returned weather.madmaxoft2014-07-033-4/+18
* | | | | | | | | | | | | | | CMake: Changed slash format to support MSYS.madmaxoft2014-07-031-1/+1
* | | | | | | | | | | | | | | SetFlags.cmake: don't use ${} expansion on if STREQUALarchshift2014-07-031-1/+2
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1138 from mc-server/enderchestMattes D2014-07-027-113/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | SuggestionTiger Wang2014-07-021-13/+13
| * | | | | | | | | | | | | | Removed unneeded codeTiger Wang2014-06-304-38/+1
| * | | | | | | | | | | | | | Removed bad commentTiger Wang2014-06-291-1/+0
| * | | | | | | | | | | | | | Properly implemented enderchestsTiger Wang2014-06-2910-99/+102
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master'Tiger Wang2014-07-029-30/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1139 from Howaner/HooksMattes D2014-07-028-28/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update documentationHowaner2014-07-021-3/+3
| | * | | | | | | | | | | | | | | Removed foodlevel-change possibility. Plugins can cancel the event and use cPlayer:SetFoodLevel()Howaner2014-07-025-6/+6
| | * | | | | | | | | | | | | | | Change documentationHowaner2014-07-011-5/+10
| | * | | | | | | | | | | | | | | Fixes.Howaner2014-06-302-4/+4
| | * | | | | | | | | | | | | | | Add documentation.Howaner2014-06-301-0/+22
| | * | | | | | | | | | | | | | | Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGEHowaner2014-06-306-26/+67
| | * | | | | | | | | | | | | | | Unnecessary returnHowaner2014-06-301-2/+0
| * | | | | | | | | | | | | | | | CMake: Use cmake for file-copying.madmaxoft2014-07-021-1/+1
* | | | | | | | | | | | | | | | | Fixed player teleport food drainTiger Wang2014-07-022-1/+14
* | | | | | | | | | | | | | | | | Redstone simulator is alerted to lever unpoweringTiger Wang2014-07-024-1/+6
|/ / / / / / / / / / / / / / / /
* | | | / / / / / / / / / / / / Fixed printf formats for Win buildsmadmaxoft2014-07-012-4/+4
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed a possibly unused variable.madmaxoft2014-07-011-1/+1
* | | | | | | | | | | | | | | Merge pull request #1122 from mc-server/LuaProxyMattes D2014-07-016-0/+324
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | LuaProxy compilation under MinGW.Mattes D2014-07-011-1/+4
| * | | | | | | | | | | | | | | Merge branch 'master' into LuaProxyMattes D2014-07-0159-1147/+1191
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Added a missing endline.madmaxoft2014-06-241-1/+1
| * | | | | | | | | | | | | | | | Added the Lua Proxy DLL.madmaxoft2014-06-246-0/+321
* | | | | | | | | | | | | | | | | Merge pull request #1141 from Howaner/GlobalFixesMattes D2014-07-012-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Only fixes the server crash.Howaner2014-07-012-7/+1
| * | | | | | | | | | | | | | | | Fix server-crash with non-existing items.Howaner2014-07-012-2/+8
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #1140 from mc-server/FixMingwMattes D2014-07-016-13/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Proper sqlite dependency fix.Mattes D2014-07-011-1/+2
| * | | | | | | | | | | | | | | | Ignore Code:::Blocks project files.Mattes D2014-07-011-0/+1
| * | | | | | | | | | | | | | | | Fixed linking order under MinGW.Mattes D2014-07-012-3/+9
| * | | | | | | | | | | | | | | | typoworktycho2014-06-301-1/+1
| * | | | | | | | | | | | | | | | Added dependecy of tolualib on luaworktycho2014-06-301-0/+1
| * | | | | | | | | | | | | | | | Fixed size_t printfing under MinGW.Mattes D2014-06-301-3/+18
| * | | | | | | | | | | | | | | | Fixed lua compilation under MinGW.Mattes D2014-06-301-8/+4
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Fixed cFile compilation under MinGW.madmaxoft2014-06-301-0/+3
* | | | | | | | | | | | | | | | Fixed tolua linking order.Mattes D2014-06-301-3/+1
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed respawningTiger Wang2014-06-2912-19/+19
* | | | | | | | | | | | | | | Fixed offline UUID generator.Mattes D2014-06-291-2/+4
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1136 from Howaner/GlobalFixesMattes D2014-06-292-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Send statistics to the player, when he logged in.Howaner2014-06-292-2/+4
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1132 from mc-server/RemoveMD5Mattes D2014-06-297-499/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed a silly path error in #include.Mattes D2014-06-281-1/+1
| * | | | | | | | | | | | | | CMake: Added polarssl include dir as non-system.Mattes D2014-06-281-1/+2
| * | | | | | | | | | | | | | Changed include folders to work for Bindings, too.Mattes D2014-06-281-3/+3
| * | | | | | | | | | | | | | Added PolarSSL dependency to Bindings.Mattes D2014-06-271-1/+1
| * | | | | | | | | | | | | | Removed the md5 library, obsoleted by PolarSSL.Mattes D2014-06-277-494/+16
* | | | | | | | | | | | | | | Likely fixed too quick food depletionTiger Wang2014-06-281-1/+1
* | | | | | | | | | | | | | | Fixed issue with breaking blocks at -1 coordinatesTiger Wang2014-06-281-6/+1
* | | | | | | | | | | | | | | Implemented tripwire(s) (hooks)Tiger Wang2014-06-289-17/+324
* | | | | | | | | | | | | | | Added more block exceptions to torchesTiger Wang2014-06-281-0/+4
* | | | | | | | | | | | | | | Minor change to buttons and leversTiger Wang2014-06-282-3/+3
* | | | | | | | | | | | | | | Fixed bad water/redstone simulator communicationTiger Wang2014-06-281-32/+22
* | | | | | | | | | | | | | | Fixed server forcing players afloatTiger Wang2014-06-281-1/+4
| |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Added generic entity-collecting.Mattes D2014-06-2717-25/+36
* | | | | | | | | | | | | | Merge pull request #1129 from mc-server/CodeCoverageConditionworktycho2014-06-271-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Added MSVC guardworktycho2014-06-271-4/+6
| * | | | | | | | | | | | | Update SetFlags.cmakeworktycho2014-06-271-1/+1
| * | | | | | | | | | | | | Update SetFlags.cmakeworktycho2014-06-271-1/+1
| * | | | | | | | | | | | | CMake: Added log message for coverage.madmaxoft2014-06-271-0/+1
| * | | | | | | | | | | | | Moved CodeCoverage into a separate cmake condition.madmaxoft2014-06-271-2/+6
* | | | | | | | | | | | | | CMake: pthread is used only on Unix.madmaxoft2014-06-271-4/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merged branch 'howaner/Bow'.Mattes D2014-06-264-23/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add comment.Howaner2014-06-261-0/+1
| * | | | | | | | | | | | | GameMode checkHowaner2014-06-261-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into BowHowaner2014-06-2682-3427/+5264
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | derpHowaner2014-06-171-3/+3
| * | | | | | | | | | | | | | The same: Float, not DoubleHowaner2014-06-171-1/+1
| * | | | | | | | | | | | | | Float, not DoubleHowaner2014-06-171-1/+1
| * | | | | | | | | | | | | | Split Broadcast Sound Effect function call in multiple lines.Howaner2014-06-162-3/+24
| * | | | | | | | | | | | | | This isn't neededHowaner2014-06-161-1/+0
| * | | | | | | | | | | | | | Fix bow sound and creative arrow pickup.Howaner2014-06-162-19/+30
| * | | | | | | | | | | | | | Add bow charging animationHowaner2014-06-162-2/+6
* | | | | | | | | | | | | | | Merged branch 'howaner/Pickups'.Mattes D2014-06-262-7/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed a comment and changed CombineCount to short.Howaner2014-06-261-2/+2
| * | | | | | | | | | | | | | | Merge branch 'master' into PickupsHowaner2014-06-264-397/+382
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Optimize combining.Howaner2014-06-241-3/+3
| * | | | | | | | | | | | | | | Better combining.Howaner2014-06-241-3/+20
| * | | | | | | | | | | | | | | Fix pickup combining over the maximum stack size.Howaner2014-06-242-5/+9
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | FurnaceRecipe parsing: Fixed whitespace removing.Mattes D2014-06-261-1/+1
* | | | | | | | | | | | | | | Fixed misformed trimming.Mattes D2014-06-261-1/+1
* | | | | | | | | | | | | | | FurnaceRecipe: Moved the parsing into separate functions for clarity.Mattes D2014-06-262-60/+68
* | | | | | | | | | | | | | | FurnaceRecipe parser: Made the parser more forgiving.Mattes D2014-06-261-2/+2
* | | | | | | | | | | | | | | FurnaceRecipe parser: Added an else branch, changed to a switch.Mattes D2014-06-261-45/+69
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/furnaceparsing'Mattes D2014-06-262-92/+170
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Parenthesised comparisonTiger Wang2014-06-231-1/+1
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/furnaceparsing' into furnaceparsingTiger Wang2014-06-222-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixed compile errorsworktycho2014-06-221-2/+2
| * | | | | | | | | | | | | | | | SuggestionsTiger Wang2014-06-221-6/+7
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | SuggestionsTiger Wang2014-06-222-40/+30
| * | | | | | | | | | | | | | | Removed debugging codeTiger Wang2014-06-211-1/+0
| * | | | | | | | | | | | | | | Rewrote furnace recipe parserTiger Wang2014-06-212-93/+181
* | | | | | | | | | | | | | | | Merged branch 'tonibm19/master'.Mattes D2014-06-262-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added pig riding.tonibm192014-06-202-0/+14
* | | | | | | | | | | | | | | | Merge pull request #1126 from mc-server/BlockInfoInitMattes D2014-06-252-381/+374
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | BlockInfo is now a proper C++ singleton.madmaxoft2014-06-252-381/+374
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1125 from Howaner/Entitiesworktycho2014-06-242-16/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add entity health saving.Howaner2014-06-242-16/+8
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Fixed BlockInfo initialization.madmaxoft2014-06-241-15/+6
* | | | | | | | | | | | | | Added asserts for cChunk::GetBlockEntity() coords.Mattes D2014-06-241-0/+6
* | | | | | | | | | | | | | Fixed crashes in HopperEntity.Mattes D2014-06-241-19/+58
* | | | | | | | | | | | | | Debuggers: Fixed the Blaze rod query tool.madmaxoft2014-06-241-2/+2
* | | | | | | | | | | | | | VoronoiMap: Added a missing initializer.madmaxoft2014-06-231-1/+3
* | | | | | | | | | | | | | Added a (disabled) block meta mirror / rotate test code.madmaxoft2014-06-231-2/+87
* | | | | | | | | | | | | | Fixed the slab vertical mirroring.madmaxoft2014-06-231-9/+6
* | | | | | | | | | | | | | Fixed sign and lever rotations.madmaxoft2014-06-232-8/+9
* | | | | | | | | | | | | | Prefabs don't draw into chunk if they don't intersect.madmaxoft2014-06-231-0/+11
* | | | | | | | | | | | | | Merge pull request #1105 from Howaner/BlocksMattes D2014-06-223-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Changed 0xFFFFFFFB to ~0x04Howaner2014-06-221-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into BlocksHowaner2014-06-171-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Fix fence gate sound (Redstone simulator).Howaner2014-06-171-4/+10
| * | | | | | | | | | | | | Add fence gate sound.Howaner2014-06-171-0/+1
| * | | | | | | | | | | | | Add UNUSED() TagsHowaner2014-06-171-0/+6
| * | | | | | | | | | | | | Add door soundHowaner2014-06-171-0/+1
* | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-06-225-6/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed missing breakworktycho2014-06-221-0/+1
| * | | | | | | | | | | | | | Fixed invalid iteratorworktycho2014-06-221-2/+3
| * | | | | | | | | | | | | | Added cClientHandle::IsUUIDOnline function.madmaxoft2014-06-213-2/+41
| * | | | | | | | | | | | | | Restored style continuity.Alexander Harkness2014-06-211-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed another daylight sensor bugTiger Wang2014-06-221-20/+23
* | | | | | | | | | | | | | Chests don't open if obstructedTiger Wang2014-06-221-0/+13
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2014-06-216-2/+669
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added a TestRails generator.madmaxoft2014-06-215-0/+667
| * | | | | | | | | | | | | Fixed a caching bug in GridStructGen.madmaxoft2014-06-211-2/+2
* | | | | | | | | | | | | | Updated CONTRIBUTORS fileSTRWarrior2014-06-211-0/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Updated prefabs to the latest Gallery content.madmaxoft2014-06-214-2049/+2644
* | | | | | | | | | | | | Updated all prefabs to current Gallery content.madmaxoft2014-06-202-650/+824
* | | | | | | | | | | | | MCA saver marks chunks as populated.madmaxoft2014-06-201-0/+3
* | | | | | | | | | | | | Fixed the BiomeVisualiser project.madmaxoft2014-06-201-1/+17
* | | | | | | | | | | | | Optimized Voronoi calculation.madmaxoft2014-06-204-21/+81
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1112 from mc-server/danglingptrsMattes D2014-06-1935-18/+75
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Nullify deleted pointers.archshift2014-06-1935-18/+75
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1096 from mc-server/redstonerefactorAlexander Harkness2014-06-183-140/+79
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | FIxed second weird enumTycho2014-06-161-20/+1
| * | | | | | | | | | | Refactored reversing logic into seperate functionTycho2014-06-162-16/+16
| * | | | | | | | | | | Fixed tigers weird enumsTycho2014-06-161-14/+6
| * | | | | | | | | | | Merge branch 'master' into redstonerefactorTycho2014-06-1635-469/+899
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Moved repeater handling to seperate passTycho2014-06-162-97/+64
* | | | | | | | | | | | | Merge pull request #1045 from Howaner/GlobalFixesMattes D2014-06-1812-61/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into GlobalFixesHowaner2014-06-17224-2010/+26942
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Check block type from cBlockEntityHowaner2014-06-171-8/+8
| * | | | | | | | | | | | | Add more documentation.Howaner2014-06-171-0/+2
| * | | | | | | | | | | | | Add comment.Howaner2014-06-171-0/+1
| * | | | | | | | | | | | | Revert "Fix right click bugs."Howaner2014-06-171-41/+40
| * | | | | | | | | | | | | The motion is already set in AddBasicEntity()Howaner2014-06-171-5/+0
| * | | | | | | | | | | | | Add DoWithBlockEntityAt() to WorldInterface.hHowaner2014-06-174-40/+64
| * | | | | | | | | | | | | Wrong arrow commit.Howaner2014-05-301-4/+0
| * | | | | | | | | | | | | Code improvementsHowaner2014-05-283-12/+4
| * | | | | | | | | | | | | Fix hay place sound.Howaner2014-05-282-1/+31
| * | | | | | | | | | | | | Fix fire break.Howaner2014-05-282-18/+19
| * | | | | | | | | | | | | Add throw sound and fix arrow server crash.Howaner2014-05-284-5/+16
| * | | | | | | | | | | | | Fix Y-Position from arrow entity.Howaner2014-05-281-0/+1
| * | | | | | | | | | | | | Fix right click bugs.Howaner2014-05-281-40/+41
| * | | | | | | | | | | | | Fix skull bugs.Howaner2014-05-282-2/+46
* | | | | | | | | | | | | | Merge pull request #1100 from Howaner/Slabsarchshift2014-06-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix doubleslab meta.Howaner2014-06-161-0/+1
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | | | | | | * | | | | | EntityEffects.x -> EntityEffect.x, Object-Oriented effectsarchshift2014-06-1915-320/+748
| | | | | | | * | | | | | Entity effects: changed User to Creator, removed pawn pass-by-valuearchshift2014-06-176-36/+20
| | | | | | | * | | | | | APIDump: Added OnEntityAddEffect hook documentation.madmaxoft2014-06-171-0/+34
| | | | | | | * | | | | | Added the OnEntityAddEffect hook.madmaxoft2014-06-177-0/+57
| | | | | | | * | | | | | Entity Effects: Clarified user, added it to AddEntityEffectarchshift2014-06-177-15/+32
| | | | | | | * | | | | | Changed the AddEntityEffect() params for easier calls.madmaxoft2014-06-177-50/+52
| | | | | | | * | | | | | Entity Effect: Separates total duration and ticks of activityarchshift2014-06-173-22/+23
| | | | | | | * | | | | | Fixed MSVC compilation.madmaxoft2014-06-173-14/+17
| | | | | | | * | | | | | Pawn: renamed HandleEntityEffects to HandleEntityEffectarchshift2014-06-178-10/+15
| | | | | | | * | | | | | Cave spider now poisons its victim, added IsPawn function to Entityarchshift2014-06-175-5/+24
| | | | | | | * | | | | | Added wither damage type, wither entity effect.archshift2014-06-174-1/+21
| | | | | | | * | | | | | Monster: added IsUndead(), undead-specific entity effectsarchshift2014-06-173-6/+71
| | | | | | | * | | | | | Applies splash potion effects to mobs as well as playersarchshift2014-06-172-8/+12
| | | | | | | * | | | | | Removed long function wrappingarchshift2014-06-172-12/+3
| | | | | | | * | | | | | ItemHandler: changed IsDrinkable() to take a short argumentarchshift2014-06-175-18/+14
| | | | | | | * | | | | | Splash potion: Adjusted speed, fixed spawn positionarchshift2014-06-171-6/+3
| | | | | | | * | | | | | Entity effect type: use 'eff' as a prefix instead of 'ef'archshift2014-06-175-74/+74
| | | | | | | * | | | | | Added splash potion functionalityarchshift2014-06-176-15/+122
| | | | | | | * | | | | | Entity: only fire critical hit if damage type is physicalarchshift2014-06-171-1/+2
| | | | | | | * | | | | | Player: made healing instantaneousarchshift2014-06-172-2/+2
| | | | | | | * | | | | | Implemented drinkable potions, noeffect entity effect,archshift2014-06-178-6/+165
| | | | | | | * | | | | | Implemented milk, added documentation to Pawn.harchshift2014-06-177-5/+86
| | | | | | | * | | | | | Pawn.cpp: fixed effect iterator BAD_ACCESSarchshift2014-06-172-9/+14
| | | | | | | * | | | | | Pawn: Enabled entity effect broadcast, added typedefarchshift2014-06-172-4/+6
| | | | | | | * | | | | | EntityEffect: read-only getters, added user and distance modifier fieldsarchshift2014-06-173-11/+35
| | | | | | | * | | | | | Player: Removed food-poisoning-specific code, set duration to 30 secondsarchshift2014-06-173-27/+3
| | | | | | | * | | | | | Entity effects: Added handlers for entity effectsarchshift2014-06-174-13/+138
| | | | | | | * | | | | | Added iterator on tick to manage entity effect durationarchshift2014-06-171-1/+18
| | | | | | | * | | | | | cPawn: Remove unused m_bBurnablearchshift2014-06-172-2/+0
| | | | | | | * | | | | | Moved Effects.h to EntityEffects.h, added initial implarchshift2014-06-179-36/+115
| | | | | | | * | | | | | Added classes for splash potions and wither skullsarchshift2014-06-175-0/+149
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1101 from Howaner/FenceGateworktycho2014-06-171-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix fence gate redstone simulator.Howaner2014-06-171-2/+1
* | | | | | | | | | | | Merge pull request #1099 from Howaner/BlocksMattes D2014-06-171-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Glass shouldn't drop.Howaner2014-06-161-0/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1102 from Howaner/PressurePlateMattes D2014-06-173-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add parenthesisHowaner2014-06-171-2/+2
| * | | | | | | | | | | Add end lines to BlockPressurePlate.hHowaner2014-06-171-1/+5
| * | | | | | | | | | | Add pressure plate handlerHowaner2014-06-173-0/+41
|/ / / / / / / / / / /
* | | | | | | | | | | Fixed GCC compilation.madmaxoft2014-06-161-1/+1
* | | | | | | | | | | Fixed MSVC builds.madmaxoft2014-06-161-9/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #883 from mc-server/CutOffLightingworktycho2014-06-163-16/+96
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed link errorsTycho2014-04-121-0/+9
| * | | | | | | | | | Fixed member construction order.madmaxoft2014-04-121-2/+2
| * | | | | | | | | | Lighting reads blocktypes only for blocks under heightmap.madmaxoft2014-04-122-16/+87
* | | | | | | | | | | Fixed gcc compilation.madmaxoft2014-06-161-1/+1
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #1024 from worktycho/AllocationPoolMattes D2014-06-1612-55/+281
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Added overrideTycho2014-06-161-3/+3
| | * | | | | | | | | Changed names of callbacksTycho2014-06-142-10/+10
| | * | | | | | | | | Removed spacesTycho2014-06-141-2/+2
| | * | | | | | | | | Documented starvation callbacksTycho2014-06-141-0/+7
| | * | | | | | | | | Documented cAllocationPoolTycho2014-06-141-0/+5
| | * | | | | | | | | Reformated ChunkMap.hTycho2014-06-142-4/+10
| | * | | | | | | | | Moved m_SectionsTycho2014-06-141-1/+2
| | * | | | | | | | | Added generic Allocation Pool InterfaceTycho2014-06-1412-69/+110
| | * | | | | | | | | reverted accedental android changesTycho2014-06-141-2/+1
| | * | | | | | | | | fixed spacesTycho2014-06-148-14/+16
| | * | | | | | | | | fixed spacesTycho2014-06-148-16/+16
| | * | | | | | | | | fixed compileTycho2014-06-142-2/+10
| | * | | | | | | | | fixed const issueTycho2014-06-141-3/+3
| | * | | | | | | | | Fill with buffer on startupTycho2014-06-141-0/+10
| | * | | | | | | | | Fixed commentsTycho2014-06-142-6/+6
| | * | | | | | | | | Added loggingTycho2014-06-141-3/+12
| | * | | | | | | | | merge masterTycho2014-06-14194-2164/+25270
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed bad mergeTycho2014-05-253-10/+17
| | * | | | | | | | | | Merge branch 'chunksparsing/structs' into AllocationPoolTycho2014-05-2589-1603/+2713
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed bug in freeing NULL pointersTycho2014-05-251-13/+15
| | * | | | | | | | | | | Implemented Allocation Pool use by cChunkDataTycho2014-05-2311-45/+125
| | * | | | | | | | | | | Use placement new to initalise objectsTycho2014-05-231-2/+5
| | * | | | | | | | | | | Merge branch 'chunksparsing/structs' into AllocationPoolTycho2014-05-2316-144/+228
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Added callback for stopping starvation modeTycho2014-05-211-0/+4
| | * | | | | | | | | | | | Implemented Allocation PoolTycho2014-05-211-0/+50
| * | | | | | | | | | | | | Fixed a copypasta error in WormNestCaves generator settings.madmaxoft2014-06-161-1/+1
| * | | | | | | | | | | | | Updated the SandFlatRoofVillage prefabs.madmaxoft2014-06-161-288/+381
| * | | | | | | | | | | | | Added random offsets to cGridStructGen.madmaxoft2014-06-1517-85/+127
| * | | | | | | | | | | | | Merge pull request #1090 from mc-server/saveoncrashMattes D2014-06-152-2/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Players are saved regularlyTiger Wang2014-06-152-2/+22
| * | | | | | | | | | | | | | Fixed bad comparison crashTiger Wang2014-06-151-2/+2
| * | | | | | | | | | | | | | Fixed daylight sensor unpoweringTiger Wang2014-06-151-6/+28
| * | | | | | | | | | | | | | Merge pull request #1019 from mc-server/cPlayerSetSpeedMattes D2014-06-144-31/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Removed an unused tolua_end and tolua_begin pair.madmaxoft2014-06-141-2/+0
| | * | | | | | | | | | | | | Simplified speed clamping.madmaxoft2014-06-141-8/+3
| | * | | | | | | | | | | | | Refactored speed-setting to use a common function for all cases.madmaxoft2014-06-144-93/+44
| | * | | | | | | | | | | | | Merge branch 'master' into cPlayerSetSpeedmadmaxoft2014-06-14216-1988/+26550
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Player.h: Moved doxy-comments to Entity.harchshift2014-06-112-3/+10
| | * | | | | | | | | | | | | | Added doxy-commentsSTRWarrior2014-05-221-6/+8
| | * | | | | | | | | | | | | | cEntity::SetSpeed(a_Vector3d) isn't virtualized anymoreSTRWarrior2014-05-222-2/+2
| | * | | | | | | | | | | | | | cPlayer overrides the SetSpeedXX functionsSTRWarrior2014-05-223-4/+53
| | * | | | | | | | | | | | | | Both SetSpeed functions are now overridden by cPlayerSTRWarrior2014-05-223-6/+32
* | | | | | | | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-1635-469/+900
| |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fix a few warningsTycho2014-06-161-3/+3
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1093 from mc-server/BindingsFixMattes D2014-06-143-9/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed bindings generation for Win64 builds.Mattes D2014-06-143-9/+29
| * | | | | | | | | | | | | | Fixed MSVC Bindings generation.Mattes D2014-06-141-0/+3
|/ / / / / / / / / / / / / /
* | / / / / / / / / / / / / Remove windows bindings crutchworktycho2014-06-141-10/+0
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fixed a repeater issueTiger Wang2014-06-142-17/+16
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Reduced cPluginManager code duplicationTiger Wang2014-06-141-286/+178
* | | | | | | | | | | | Fixed ChunkWorx stop button giving an errorSTRWarrior2014-06-131-1/+1
* | | | | | | | | | | | Merge pull request #1089 from mc-server/tolua-autoMattes D2014-06-132-84/+85
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | automaticlly build tolua and generate bindings as part of build.tycho2014-06-122-84/+85
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Removed an unused fwd declaration.madmaxoft2014-06-131-1/+0
* | | | | | | | | | | | APIDump: Added the Info.lua article.madmaxoft2014-06-132-0/+247
* | | | | | | | | | | | Typo CorrectionAlexander Harkness2014-06-121-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Fixed two redstone bugsTiger Wang2014-06-121-0/+6
* | | | | | | | | | | Merge pull request #1082 from mc-server/cauldronfixesAlexander Harkness2014-06-124-73/+112
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed constnessworktycho2014-06-113-72/+79
| * | | | | | | | | | | Compile fixTiger Wang2014-06-111-1/+1
| * | | | | | | | | | | Reduced code duplicationTiger Wang2014-06-111-4/+4
| * | | | | | | | | | | IsWeatherSunnyAt does something useful :DTiger Wang2014-06-111-9/+5
| * | | | | | | | | | | Update APIDesc.luaAlexander Harkness2014-06-111-0/+1
| * | | | | | | | | | | Update APIDesc.luaTiger Wang2014-06-111-3/+6
| * | | | | | | | | | | SMICOLOSLAlexander Harkness2014-06-111-4/+4
| * | | | | | | | | | | Updated unnecessary function :/Tiger Wang2014-06-111-1/+5
| * | | | | | | | | | | Add DoxyComments to he weather things. Alexander Harkness2014-06-111-7/+24
| * | | | | | | | | | | Add new IsWeatherWet hook for cauldrons.Alexander Harkness2014-06-111-1/+12
* | | | | | | | | | | | Merge pull request #1086 from qaisjp/patch-1Mattes D2014-06-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix typo in handy_functions.luaQais Patankar2014-06-121-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1084 from mc-server/PlankRoadsSTRWarrior2014-06-111-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Roads in villages are made out of wooden planks if they generate on water.STRWarrior2014-06-111-4/+17
* | | | | | | | | | | | | DispenserEntity code cleanup after PR merge.madmaxoft2014-06-112-30/+30
* | | | | | | | | | | | | Merge remote-tracking branch 'joannis/master'madmaxoft2014-06-112-19/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | - Fixed a lot of alignmentJoannisO2014-06-051-7/+7
| * | | | | | | | | | | | | - Removed the code that removed fireworks from a dispenser even thoughtJoannisO2014-06-041-3/+0
| * | | | | | | | | | | | | - Fixed variable names in a function.JoannisO2014-06-041-2/+2
| * | | | | | | | | | | | | - Fixed a lot of astethicsJoannisO2014-06-042-14/+17
| * | | | | | | | | | | | | - Fixed an issue where there were 2 "DispChunk"-s in the same function.JoannisO2014-06-031-16/+5
| * | | | | | | | | | | | | - Fixed a bug where I didn't return anything in the GetShootVectorJoannisO2014-06-031-0/+2
| * | | | | | | | | | | | | - Fixed a bug where I used the FireCharge ITEM instead of the ProjectileJoannisO2014-06-031-1/+1
| * | | | | | | | | | | | | - Cleaned up the code massivelyJoannisO2014-06-032-90/+31
| * | | | | | | | | | | | | - Added doxy comments and exported to luaJoannis2014-06-032-22/+64
| * | | | | | | | | | | | | - Changed the name of the ProjectileLookVector method.JoannisO2014-05-312-3/+3
| * | | | | | | | | | | | | - Prefixed all args with "a_"JoannisO2014-05-292-6/+10
| * | | | | | | | | | | | | - Removed breaks. I thought it wouldn't compile without them but theJoannisO2014-05-281-2/+0
| * | | | | | | | | | | | | - Fixed an issue where dispensers would only shoot arrows (appearantlyJoannisO2014-05-281-33/+24
| * | | | | | | | | | | | | - Implemented vertical dispensing for projectiles.Joannis2014-05-282-16/+40
| * | | | | | | | | | | | | - Fixed the ampersands and asterisks to fit the format.Joannis2014-05-272-8/+8
| * | | | | | | | | | | | | - Added support for more types of projectiles in the DispenserJoannisO2014-05-262-38/+51
| * | | | | | | | | | | | | Added Arrow- and FireCharge-Dispensing to DispenserEntity.JoannisO2014-05-262-27/+95
* | | | | | | | | | | | | | Changed the teleport permissions to the new ones.Alexander Harkness2014-06-111-1/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | APIDump: Documented cBlockArea:GetCoordRange().madmaxoft2014-06-111-1/+2
* | | | | | | | | | | | | Added cBlockArea:GetCoordRange to Lua API.madmaxoft2014-06-111-0/+32
* | | | | | | | | | | | | Revert "Initial Mesa Bryce implementation."madmaxoft2014-06-114-116/+4
* | | | | | | | | | | | | Added coverity badgeworktycho2014-06-111-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Removed assert that is now informed by type systemworktycho2014-06-111-1/+0
* | | | | | | | | | | | Update GETTING-STARTED.mdworktycho2014-06-111-11/+11
* | | | | | | | | | | | Update GETTING-STARTED.mdAlexander Harkness2014-06-111-1/+1
* | | | | | | | | | | | TestAlexander Harkness2014-06-111-1/+0
* | | | | | | | | | | | Removed derpbadge.Alexander Harkness2014-06-111-1/+1
* | | | | | | | | | | | Initial Mesa Bryce implementation.madmaxoft2014-06-104-4/+116
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Fixed clang warnings about abs() in Noise.cpp.madmaxoft2014-06-101-2/+2
* | | | | | | | | | | Fixed a race condition when adding a player to a world.madmaxoft2014-06-103-4/+29
* | | | | | | | | | | Fixed gcc compilation.madmaxoft2014-06-101-2/+2
* | | | | | | | | | | Added an experimental height generator, Mountains.madmaxoft2014-06-092-0/+87
* | | | | | | | | | | Added cRidgedMultiNoise, fixed cPerlinNoise.madmaxoft2014-06-092-1/+233
* | | | | | | | | | | Added Y coord checks and documentation to cBlockDoorHandler.madmaxoft2014-06-091-19/+40
* | | | | | | | | | | Merge remote-tracking branch 'howaner/Redstone'madmaxoft2014-06-093-35/+62
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Moved the IsDoor check before the meta get.Howaner2014-05-311-2/+1
| * | | | | | | | | | | Add doxy-commentHowaner2014-05-311-3/+4
| * | | | | | | | | | | Better SetOpen() and IsOpen() function from the doors.Howaner2014-05-302-77/+27
| * | | | | | | | | | | Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug.Howaner2014-05-292-13/+90
| |/ / / / / / / / / /
* | | | | | | | | | | docs/Generator: Fixed typo.madmaxoft2014-06-091-1/+1
* | | | | | | | | | | Fixed debugging code in tolua++ driver script.madmaxoft2014-06-091-1/+1
* | | | | | | | | | | ToLua can now be run in pure-lua mode.madmaxoft2014-06-096-8/+127
* | | | | | | | | | | docs/Generator: Added SmallFoliage illlustrations.madmaxoft2014-06-094-0/+4
* | | | | | | | | | | Fixed a crash when creating negative-size blockareas.madmaxoft2014-06-091-0/+8
* | | | | | | | | | | Fixed deadlock when moving players to other worlds.Mattes D2014-06-0832-96/+204
* | | | | | | | | | | Added queue for adding entities to cWorld.Mattes D2014-06-086-7/+42
* | | | | | | | | | | Small change for easier understanding.Alexander Harkness2014-06-081-1/+1
* | | | | | | | | | | Proper fix for long interaction.madmaxoft2014-06-081-7/+14
* | | | | | | | | | | Merge pull request #1077 from mc-server/fuelfixesworktycho2014-06-071-15/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Corrected the furnace fuels. Solves #1071Alexander Harkness2014-06-071-15/+27
|/ / / / / / / / / / /
* | | | | | | | | | | docs/Generator: fixed grass confusion.Mattes D2014-06-071-2/+2
* | | | | | | | | | | docs/Generator: Added the easy Finishers.madmaxoft2014-06-072-3/+130
* | | | | | | | | | | Added RainbowRoads finisher generator.madmaxoft2014-06-075-3/+1594
* | | | | | | | | | | Further improvements on redstone speedTiger Wang2014-06-073-68/+81
* | | | | | | | | | | Fixed mob hitbox sizes, removed TODOsarchshift2014-06-073-5/+2
* | | | | | | | | | | Fixed a typo.Mattes D2014-06-071-1/+1
* | | | | | | | | | | Further reduced redstone idle CPU consumptionTiger Wang2014-06-061-7/+27
* | | | | | | | | | | Grammarworktycho2014-06-061-1/+1
* | | | | | | | | | | Expanded GPU sectionworktycho2014-06-061-1/+2
* | | | | | | | | | | Fixed numbersworktycho2014-06-061-1/+2
* | | | | | | | | | | typoworktycho2014-06-061-1/+1
* | | | | | | | | | | docs/Generator: Added basic terrain composition.madmaxoft2014-06-054-1/+31
* | | | | | | | | | | Typographical errorTiger Wang2014-06-051-1/+1
* | | | | | | | | | | Start of GPU section.worktycho2014-06-051-0/+5
* | | | | | | | | | | docs/Generator: Added the TerrainHeight section.madmaxoft2014-06-054-0/+54
* | | | | | | | | | | Redstone fixes and improvements [SEE DESC]Tiger Wang2014-06-053-61/+96
* | | | | | | | | | | Merge pull request #1011 from SphinxC0re/SomeWarningFixesMattes D2014-06-044-3/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update IncrementalRedstoneSimulator.cppJulian Laubstein2014-06-041-8/+8
| * | | | | | | | | | | Update Globals.hJulian Laubstein2014-06-031-1/+1
| * | | | | | | | | | | Changed the m_slotarea positionJulian Laubstein2014-05-191-2/+2
| * | | | | | | | | | | Fixed warnings in IncrementalRedstoneSimulatorJulian Laubstein2014-05-191-1/+7
| * | | | | | | | | | | Fixed some warnings in Server.cpp, and in UI/Julian Laubstein2014-05-193-3/+11
| * | | | | | | | | | | Rolled some changes backJulian Laubstein2014-05-191-12/+2
| * | | | | | | | | | | Fixed some warningsJulian Laubstein2014-05-192-2/+13
* | | | | | | | | | | | Merge pull request #1060 from Howaner/InventoryMattes D2014-06-041-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix itemframe break.Howaner2014-06-041-1/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1059 from mc-server/coverity_fixesworktycho2014-06-044-4/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | derpworktycho2014-06-041-1/+1
| * | | | | | | | | | | Fixed bad coordinateworktycho2014-06-041-1/+1
| * | | | | | | | | | | Make sure m_StackSizeToBeUsedInRepair Always has a valid valueworktycho2014-06-041-1/+3
| * | | | | | | | | | | Removed unused field testworktycho2014-06-041-1/+0
| * | | | | | | | | | | Initialise m_Callbacks field to NULL in empty constructor.worktycho2014-06-041-1/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Fixed buffer overflow in JSON.madmaxoft2014-06-041-1/+1
* | | | | | | | | | | Exploded creepers drop nothing, part of #1058Tiger Wang2014-06-041-2/+8
* | | | | | | | | | | Fixed mob loading, part of #1058Tiger Wang2014-06-041-1/+1
* | | | | | | | | | | Fixed #1057Tiger Wang2014-06-041-1/+1
* | | | | | | | | | | docs/Generator: Re-fixed the wording.madmaxoft2014-06-031-1/+1
* | | | | | | | | | | Player permissions aren't logged to console anymore.madmaxoft2014-06-031-7/+0
* | | | | | | | | | | Merge remote-tracking branch 'howaner/Inventory'madmaxoft2014-06-032-2/+133
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Players can't set items in the result slot, when they shift a item.Howaner2014-06-012-0/+39
| * | | | | | | | | | | Add HandleSmeltItem() call for achievements.Howaner2014-06-011-7/+11
| * | | | | | | | | | | Missing return;Howaner2014-06-011-0/+1
| * | | | | | | | | | | Set DraggingItem to Slot directly.Howaner2014-05-311-1/+1
| * | | | | | | | | | | Fix DBL bug.Howaner2014-05-311-5/+4
| * | | | | | | | | | | Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0"Howaner2014-05-311-1/+1
| * | | | | | | | | | | Fix the furnace result slot.Howaner2014-05-301-2/+90
* | | | | | | | | | | | Fixed OnProjectileHitBlock bindings.madmaxoft2014-06-033-82/+111
* | | | | | | | | | | | docs/Generator: Updated PerlinRivers with better images.madmaxoft2014-06-035-1/+5
* | | | | | | | | | | | Merge pull request #1028 from mc-server/pistonfixesMattes D2014-06-0315-457/+401
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/pistonfixes'Tiger Wang2014-06-0215-457/+401
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Suggestions twoTiger Wang2014-06-012-10/+12
| | * | | | | | | | | | | | SuggestionsTiger Wang2014-05-291-1/+6
| | * | | | | | | | | | | | More comments!Tiger Wang2014-05-291-5/+4
| | * | | | | | | | | | | | Revert "Fixed a food saturation issue"Tiger Wang2014-05-291-1/+1
| | * | | | | | | | | | | | Changed block send queue to use vectorsTiger Wang2014-05-293-21/+29
| | * | | | | | | | | | | | Fixed piston power checkingTiger Wang2014-05-291-11/+6
| | * | | | | | | | | | | | Fixed a food saturation issueTiger Wang2014-05-251-1/+1
| | * | | | | | | | | | | | Hopefully fixed piston duplication issuesTiger Wang2014-05-2515-437/+372
* | | | | | | | | | | | | | docs/Generator: Shrunk the hand-drawn images by 50 %.madmaxoft2014-06-0313-0/+0
* | | | | | | | | | | | | | Merge branch 'GeneratorArticle'madmaxoft2014-06-0327-47/+374
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Generator article: Added TOC with links.madmaxoft2014-06-031-7/+44
| * | | | | | | | | | | | | | Generator article: fixed bad wording.madmaxoft2014-06-021-2/+2
| * | | | | | | | | | | | | | Generator article: Finished the Biome-gen section and images.madmaxoft2014-06-028-14/+25
| * | | | | | | | | | | | | | AnvilStats: Added new biome colors.Mattes D2014-06-012-34/+3
| * | | | | | | | | | | | | | Generator article now has all biome genertors and most their imgs.Mattes D2014-06-0115-8/+156
| * | | | | | | | | | | | | | Hot-fixed AnvilStats compilation for MSVC2013.Mattes D2014-06-013-13/+56
| * | | | | | | | | | | | | | Merge branch 'master' into GeneratorArticleMattes D2014-06-01138-910/+20904
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Initial commit of the Generator article.Mattes D2014-05-301-0/+119
* | | | | | | | | | | | | | | | Merge pull request #1052 from mc-server/UnderwaterBaseGenMattes D2014-06-025-0/+2489
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update UnderwaterBase prefabs.madmaxoft2014-06-011-12/+378
| * | | | | | | | | | | | | | | Updated UnderwaterBase prefabs.madmaxoft2014-06-011-103/+123
| * | | | | | | | | | | | | | | Added an initial version of the underwater base generator.madmaxoft2014-05-315-0/+2103
* | | | | | | | | | | | | | | | Small tweak for mobsSTRWarrior2014-06-021-4/+14
* | | | | | | | | | | | | | | | cBlockArea reading hotfix.madmaxoft2014-06-021-63/+109
* | | | | | | | | | | | | | | | APIDump: Fixed crashSTRWarrior2014-06-021-1/+1
* | | | | | | | | | | | | | | | Added OnProjectileHitBlock example in DebuggersSTRWarrior2014-06-021-1/+13
* | | | | | | | | | | | | | | | Updated OnProjectileHitBlock documentation.STRWarrior2014-06-021-0/+5
* | | | | | | | | | | | | | | | Merge pull request #844 from mc-server/ProjectileHitBlockMattes D2014-06-016-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Made a_BlockHitPos a referenceSTRWarrior2014-06-015-6/+6
| * | | | | | | | | | | | | | | | Used recommendationsSTRWarrior2014-05-316-9/+8
| * | | | | | | | | | | | | | | | Using recommendations (I think)STRWarrior2014-03-306-6/+7
| * | | | | | | | | | | | | | | | Added a BlockHitPos parameter to OnProjectileHitBlockSTRWarrior2014-03-306-9/+9
| * | | | | | | | | | | | | | | | Added a blockface parameter to the OnProjectileHitBlock hook.STRWarrior2014-03-306-8/+8
* | | | | | | | | | | | | | | | | abort does not take a parameter.worktycho2014-06-011-2/+2
* | | | | | | | | | | | | | | | | Use abort in SIGSEGV and SIGABRT handlersworktycho2014-06-011-2/+2
| |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Updated AlchemistVillage prefabs.madmaxoft2014-06-011-103/+105
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1018 from mc-server/VillageGenMattes D2014-05-3125-23/+17115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Updated PlainsVillage prefabs.madmaxoft2014-05-311-73/+85
| * | | | | | | | | | | | | | | Fixed a memory leak in VillagGen.madmaxoft2014-05-311-0/+5
| * | | | | | | | | | | | | | | Updated PlainsVillage and AlchemistVillage.madmaxoft2014-05-302-239/+1270
| * | | | | | | | | | | | | | | Fixed a memory leak in cPOCPieceGeneratormadmaxoft2014-05-291-0/+5
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into VillageGenmadmaxoft2014-05-294-1/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed a crash in message formatter.madmaxoft2014-05-281-1/+2
| * | | | | | | | | | | | | | | Merge branch 'master' into VillageGenmadmaxoft2014-05-2714-79/+157
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added AlchemistVillage prefabs (Thanks, KingsCraftAu).madmaxoft2014-05-273-9/+3007
| * | | | | | | | | | | | | | | Fixed testing weights in PlainsVillages.madmaxoft2014-05-271-3/+3
| * | | | | | | | | | | | | | | cPieceGenerator chooses starting pieces based on weights.madmaxoft2014-05-274-1/+44
| * | | | | | | | | | | | | | | Biome generators: biome lists can contain spaces.madmaxoft2014-05-271-1/+1
| * | | | | | | | | | | | | | | Fixed prefab test initialization.madmaxoft2014-05-261-0/+3
| * | | | | | | | | | | | | | | Added support for Miners' Village.madmaxoft2014-05-2510-2234/+4438
| * | | | | | | | | | | | | | | Added Japanese village prefabs.madmaxoft2014-05-245-4/+2442
| * | | | | | | | | | | | | | | Merge branch 'master' into VillageGenMattes D2014-05-2312-19/+177
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Updated plains village prefabs.madmaxoft2014-05-221-186/+171
| * | | | | | | | | | | | | | | | Villages have min and max density setting.madmaxoft2014-05-225-17/+110
| * | | | | | | | | | | | | | | | Updated plains village prefabs.madmaxoft2014-05-221-44/+43
| * | | | | | | | | | | | | | | | Changed desert village roads to gravel.madmaxoft2014-05-211-1/+1
| * | | | | | | | | | | | | | | | Added second kind of desert village (FlatRoof).madmaxoft2014-05-213-4/+1535
| * | | | | | | | | | | | | | | | Merged branch 'master' into VillageGen.madmaxoft2014-05-1860-328/+1589
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Updated SandVillage prefabs to latest Gallery content.madmaxoft2014-05-181-12/+12
| * | | | | | | | | | | | | | | | | Village roads are drawn properly.madmaxoft2014-05-172-8/+35
| * | | | | | | | | | | | | | | | | Village houses are height-adjusted onto the terrain.madmaxoft2014-05-175-7/+67
| * | | | | | | | | | | | | | | | | Updated PlainsVillage prefabs to the latest Gallery contents.madmaxoft2014-05-171-2265/+2892
| * | | | | | | | | | | | | | | | | Fixed a NULL ptr failure in GridStructGen.madmaxoft2014-05-152-9/+42
| * | | | | | | | | | | | | | | | | Changed village generator defaults to more reasonable values.madmaxoft2014-05-151-2/+2
| * | | | | | | | | | | | | | | | | Changed village road generation to use multiple prefabs.madmaxoft2014-05-153-39/+38
| * | | | | | | | | | | | | | | | | VillageGen rewritten using BFSPieceGenerator.madmaxoft2014-05-155-412/+406
| * | | | | | | | | | | | | | | | | cPrefab can be constructed in code.madmaxoft2014-05-152-0/+51
| * | | | | | | | | | | | | | | | | VillageGen: Added well placement and the general algorithm description.madmaxoft2014-05-123-6/+152
| * | | | | | | | | | | | | | | | | Initial VillageGen implementation.madmaxoft2014-05-116-0/+5807
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #951 from worktycho/chunksparsing/structsMattes D2014-05-3140-484/+1844
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Reduced the number of cChunkData::CopyBlockTypes() tests, added progress.Mattes D2014-05-301-7/+16
| * | | | | | | | | | | | | | | | Fix bugs in testTycho2014-05-301-3/+5
| * | | | | | | | | | | | | | | | Added a cChunkData::CopyBlockTypes() unit test.Mattes D2014-05-302-0/+68
| * | | | | | | | | | | | | | | | removed NULL assignment to const valueTycho2014-05-301-1/+0
| * | | | | | | | | | | | | | | | removed unneded addressofTycho2014-05-301-7/+11
| * | | | | | | | | | | | | | | | Fixed cChunkData nibble copying.madmaxoft2014-05-302-13/+13
| * | | | | | | | | | | | | | | | Test failures break into MSVC debugger.madmaxoft2014-05-301-0/+6
| * | | | | | | | | | | | | | | | Test failures are reported verbosely and into the debug console on Win.madmaxoft2014-05-302-3/+19
| * | | | | | | | | | | | | | | | Fixed sign comparison.madmaxoft2014-05-301-1/+1
| * | | | | | | | | | | | | | | | Fixed test return values.madmaxoft2014-05-302-38/+41
| * | | | | | | | | | | | | | | | Fixed wrong copy sizes in cChunkData.madmaxoft2014-05-301-10/+10
| * | | | | | | | | | | | | | | | Attempt at fixing an unresolved symbol in gcc / clang.madmaxoft2014-05-291-1/+1
| * | | | | | | | | | | | | | | | Fix bug when a_Idx is not a multiple of SectionBLockCountworktycho2014-05-291-1/+1
| * | | | | | | | | | | | | | | | Derpworktycho2014-05-291-1/+1
| * | | | | | | | | | | | | | | | fix underflowworktycho2014-05-291-1/+1
| * | | | | | | | | | | | | | | | Fixed wrong block sizes for copying / setting.madmaxoft2014-05-293-58/+52
| * | | | | | | | | | | | | | | | Fixed Wrong types in nibble sizeofsworktycho2014-05-291-3/+3
| * | | | | | | | | | | | | | | | Fixed test compilation.madmaxoft2014-05-292-16/+16
| * | | | | | | | | | | | | | | | Fixed overflow bugworktycho2014-05-291-6/+9
| * | | | | | | | | | | | | | | | Added comments, reformatted code.madmaxoft2014-05-296-280/+226
| * | | | | | | | | | | | | | | | Add commentworktycho2014-05-291-0/+4
| * | | | | | | | | | | | | | | | Fixed forgotten changes.madmaxoft2014-05-291-3/+3
| * | | | | | | | | | | | | | | | cChunkData: Normalized code style.madmaxoft2014-05-282-89/+106
| * | | | | | | | | | | | | | | | Fixed cChunkData formatting.madmaxoft2014-05-282-39/+101
| * | | | | | | | | | | | | | | | Fix cmake errors in msvcworktycho2014-05-281-1/+5
| * | | | | | | | | | | | | | | | Fixed test globals to work with precompiled headersTycho2014-05-277-159/+40
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | inject TestGlobals.h correctlyTycho2014-05-243-5/+10
| * | | | | | | | | | | | | | | Moved accessors to cpp fileTycho2014-05-242-216/+241
| * | | | | | | | | | | | | | | Implemented style changesTycho2014-05-249-268/+182
| * | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-2478-1170/+2341
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Ignore CTest filesTycho2014-05-231-0/+1
| * | | | | | | | | | | | | | | Fixed if spacesTycho2014-05-212-22/+23
| * | | | | | | | | | | | | | | Fixed reversed comparisons to nullTycho2014-05-212-17/+17
| * | | | | | | | | | | | | | | Added space to ChunkData.cppTycho2014-05-211-20/+100
| * | | | | | | | | | | | | | | Changed cChunkData::SetMeta to return a bool indicating whether the value changedTycho2014-05-212-7/+9
| * | | | | | | | | | | | | | | Fixed stylistic issuesTycho2014-05-214-25/+25
| * | | | | | | | | | | | | | | Renamed cChunkBuffer to cChunkDataTycho2014-05-2115-87/+87
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed minor style issuesTycho2014-05-214-7/+7
| * | | | | | | | | | | | | | Fixed issue with types not being defined for an unused parameterTycho2014-05-188-107/+111
| * | | | | | | | | | | | | | derpTycho2014-05-171-1/+1
| * | | | | | | | | | | | | | C++11Tycho2014-05-171-0/+8
| * | | | | | | | | | | | | | fixed assignment bugs and Skylight bugTycho2014-05-172-4/+6
| * | | | | | | | | | | | | | Fix assignment operators testworktycho2014-05-171-3/+3
| * | | | | | | | | | | | | | Fix assignment ops 2worktycho2014-05-171-3/+8
| * | | | | | | | | | | | | | Add test for zerosworktycho2014-05-171-0/+35
| * | | | | | | | | | | | | | Fix assignment operatorsworktycho2014-05-171-10/+14
| * | | | | | | | | | | | | | Add tests for assignment operatorworktycho2014-05-171-0/+11
| * | | | | | | | | | | | | | Rewrote array copies testworktycho2014-05-171-36/+51
| * | | | | | | | | | | | | | excluding tests excludes everythingworktycho2014-05-171-1/+1
| * | | | | | | | | | | | | | test code does not need testingworktycho2014-05-171-1/+1
| * | | | | | | | | | | | | | Don't start mcserver up in coverage buildsworktycho2014-05-171-1/+3
| * | | | | | | | | | | | | | Added some more testsTycho2014-05-112-116/+242
| * | | | | | | | | | | | | | Added several more testsfor arrays and coordinatesTycho2014-05-113-5/+21
| * | | | | | | | | | | | | | Fixed bug that caused Array Setters to always create segmentsTycho2014-05-111-4/+4
| * | | | | | | | | | | | | | test 0 valuesTycho2014-05-111-0/+45
| * | | | | | | | | | | | | | SkyLight defaults to 0xFFTycho2014-05-111-1/+1
| * | | | | | | | | | | | | | Cerated array copy tests for block and skylightTycho2014-05-111-0/+36
| * | | | | | | | | | | | | | Fixed a bug in writting zeros to a non-allocated sectionTycho2014-05-113-93/+134
| * | | | | | | | | | | | | | Coverage builds are called MCServer not MCServer_debugTycho2014-05-101-1/+1
| * | | | | | | | | | | | | | Fixed stupid errorTycho2014-05-101-1/+1
| * | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-102-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fail build on errorTycho2014-05-101-1/+3
| * | | | | | | | | | | | | | | Don't run start test under gcovTycho2014-05-102-2/+2
| * | | | | | | | | | | | | | | quite gcov take 4Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | Fixed stupid buffer overflow in array setblocksTycho2014-05-103-13/+13
| * | | | | | | | | | | | | | | Add arries copies testsTycho2014-05-101-0/+53
| * | | | | | | | | | | | | | | Added new testTycho2014-05-101-0/+4
| * | | | | | | | | | | | | | | Added some more testsTycho2014-05-102-6/+100
| * | | | | | | | | | | | | | | Fixed bug in setting metasTycho2014-05-102-19/+7
| * | | | | | | | | | | | | | | quieted gcov 4Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | quieted gcov 3Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | quieted gcov 2Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | Relocate gcda files so gcov can find them 3Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | rewrote exclustionsTycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | quieted gcovTycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | Relocate gcda files so gcov can find them take 2Tycho2014-05-101-2/+2
| * | | | | | | | | | | | | | | Relocate gcda files so gcov can find themTycho2014-05-102-0/+4
| * | | | | | | | | | | | | | | Add qutes to scriptsTycho2014-05-102-2/+2
| * | | | | | | | | | | | | | | Fix spaces in bashTycho2014-05-102-2/+2
| * | | | | | | | | | | | | | | Make scripts executableTycho2014-05-102-0/+0
| * | | | | | | | | | | | | | | Fixed missing Dollar signsTycho2014-05-102-2/+2
| * | | | | | | | | | | | | | | Fixed pathsTycho2014-05-101-2/+2
| * | | | | | | | | | | | | | | Fix bash ifsTycho2014-05-103-3/+4
| * | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-10105-940/+2002
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Maybe coverage working?Tycho2014-05-109-33/+409
| * | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-0336-92/+198
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | cCHunkBuffer that compiles with TestGlobals.hTycho2014-05-037-2/+27
| * | | | | | | | | | | | | | | | | Fixed polarssl programs includedTycho2014-05-011-1/+2
| * | | | | | | | | | | | | | | | | Tests off by default take 2Tycho2014-05-011-1/+1
| * | | | | | | | | | | | | | | | | Disable polarssl tests by defaultTycho2014-05-011-0/+1
| * | | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-01129-2393/+4043
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Added Testing capabilityTycho2014-04-275-2/+30
| * | | | | | | | | | | | | | | | | | Fixed bad commentTycho2014-04-271-1/+1
| * | | | | | | | | | | | | | | | | | Fixed a couple of segfaults and made Free a seperate functionTycho2014-04-272-6/+39
| * | | | | | | | | | | | | | | | | | Added other half of implementationTycho2014-04-271-14/+133
| * | | | | | | | | | | | | | | | | | Fixed issues with gccTycho2014-04-271-6/+7
| * | | | | | | | | | | | | | | | | | Fixed MobProximity Counter to remove chunk copysTycho2014-04-272-5/+4
| * | | | | | | | | | | | | | | | | | Fixed bad mergeTycho2014-04-271-13/+9
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-04-27188-4917/+11174
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Implemented Chunk Sparsing with segmentsTycho2014-04-2617-401/+610
* | | | | | | | | | | | | | | | | | | | Fixed bindings for cCompositeChat:SetMessageType().madmaxoft2014-05-301-2/+2
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Cmake system name not System nameworktycho2014-05-281-1/+1
* | | | | | | | | | | | | | | | | | | derpworktycho2014-05-281-1/+1
* | | | | | | | | | | | | | | | | | | FreeBSD requires __POSIX_VISIBLE macro to be definedworktycho2014-05-281-0/+4
* | | | | | | | | | | | | | | | | | | for compiliers other than msvc we need to tell lua that its building as a dllworktycho2014-05-281-0/+6
* | | | | | | | | | | | | | | | | | | Fixed a memory leak in cPrefabPiecePool.madmaxoft2014-05-282-1/+34
| |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Stuff.Alexander Harkness2014-05-271-1/+1
* | | | | | | | | | | | | | | | | | Merge pull request #1041 from mc-server/fixesMattes D2014-05-271-22/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | ClientHandle.cpp: Process look before posarchshift2014-05-271-1/+1
| * | | | | | | | | | | | | | | | | | ClientHandle.cpp: remove redundant codearchshift2014-05-261-22/+2
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Update main.cssAlexander Harkness2014-05-261-1/+2
* | | | | | | | | | | | | | | | | | Revert "Add more move checks"madmaxoft2014-05-262-59/+17
* | | | | | | | | | | | | | | | | | Minor fixes.Alexander Harkness2014-05-261-3/+3
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-261-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-261-1/+1
* | | | | | | | | | | | | | | | | | Merge pull request #1003 from Howaner/GlobalFixesMattes D2014-05-262-17/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add more move checksHowaner2014-05-162-17/+59
* | | | | | | | | | | | | | | | | | | SEMICOLONS!Alexander Harkness2014-05-251-2/+2
* | | | | | | | | | | | | | | | | | | Update GroupManager.hworktycho2014-05-251-2/+2
* | | | | | | | | | | | | | | | | | | Merge pull request #1030 from mc-server/betterthan950worktycho2014-05-251-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | A fix that is better than #950.Alexander Harkness2014-05-251-5/+15
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-251-0/+2
* | | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-251-1/+1
* | | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-251-1/+1
* | | | | | | | | | | | | | | | | | | Updated the installation instructions in the README.Alexander Harkness2014-05-251-11/+8
* | | | | | | | | | | | | | | | | | | Merge pull request #1013 from mc-server/achievementtranslateMattes D2014-05-256-32/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into achievementtranslateTiger Wang2014-05-2513-22/+163
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update CompositeChat.hTiger Wang2014-05-201-2/+4
| * | | | | | | | | | | | | | | | | | Update Player.cppAlexander Harkness2014-05-201-19/+19
| * | | | | | | | | | | | | | | | | | Fixed a cactus Y position issueTiger Wang2014-05-191-2/+3
| * | | | | | | | | | | | | | | | | | Simplified cacti conditionsTiger Wang2014-05-191-2/+2
| * | | | | | | | | | | | | | | | | | cCompositeChat message type is now formattedTiger Wang2014-05-194-5/+13
| * | | | | | | | | | | | | | | | | | Added client translation to achievementsTiger Wang2014-05-194-4/+70
* | | | | | | | | | | | | | | | | | | Updated CoreTiger Wang2014-05-251-0/+0
| |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Standardised a badge.Alexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-2/+2
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+3
| |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #1022 from mc-server/FixMineshaftsMattes D2014-05-232-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fixed Mineshaft system size.Mattes D2014-05-231-1/+1
| * | | | | | | | | | | | | | | | | Auto-enlargement for cGridStructGen cache.Mattes D2014-05-231-0/+9
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | / / / / / / Fixed datatype conversion warning.Mattes D2014-05-231-2/+2
| |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fixed profiling flags for MSVC.Mattes D2014-05-231-2/+2
* | | | | | | | | | | | | | | | Merge pull request #1015 from mc-server/Statsxdot2014-05-217-15/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed cWither::KilledByandrew2014-05-212-1/+3
| * | | | | | | | | | | | | | | Cleaned up cPlayer::UpdateMovementStats; Wither achievementsandrew2014-05-207-15/+128
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed MCADefrag compilation.madmaxoft2014-05-201-0/+15
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1010 from mc-server/cactidamageAlexander Harkness2014-05-193-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | DerpAlexander Harkness2014-05-191-1/+1
| * | | | | | | | | | | | | Should have fixed assumptions about entity width.Alexander Harkness2014-05-191-4/+5
| * | | | | | | | | | | | | Fixed clanging errors.Alexander Harkness2014-05-191-5/+5
| * | | | | | | | | | | | | Implemented cacti damageTiger Wang2014-05-183-2/+29
* | | | | | | | | | | | | | There's no "round" function in MSVC2008.madmaxoft2014-05-182-4/+4
* | | | | | | | | | | | | | Fixed datatype truncation in Diff() template.madmaxoft2014-05-181-1/+1
* | | | | | | | | | | | | | Merge pull request #998 from mc-server/StatManagerMattes D2014-05-1824-61/+711
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixesandrew2014-05-135-20/+23
| * | | | | | | | | | | | | Movement Statisticsandrew2014-05-126-14/+101
| * | | | | | | | | | | | | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-128-10/+143
| * | | | | | | | | | | | | Fixed compilationandrew2014-05-111-0/+2
| * | | | | | | | | | | | | Fixed stat serializationandrew2014-05-114-24/+44
| * | | | | | | | | | | | | Statistic Managerandrew2014-05-1116-43/+448
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1005 from SphinxC0re/LoadPluginfolderworktycho2014-05-181-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | removed the <list> includeJulian Laubstein2014-05-181-1/+0
| * | | | | | | | | | | | Added unload <pluginname> commandJulian Laubstein2014-05-181-5/+9
| * | | | | | | | | | | | Added load cmdJulian Laubstein2014-05-171-5/+29
| * | | | | | | | | | | | Added load command in the cServer classJulian Laubstein2014-05-171-0/+6
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1002 from tonibm19/patch-1Mattes D2014-05-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed anvil exp removingtonibm192014-05-161-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #994 from Howaner/GlobalFixesMattes D2014-05-155-36/+125
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix compile error.Howaner2014-05-151-1/+1
| * | | | | | | | | | | Move radius check.Howaner2014-05-151-25/+40
| * | | | | | | | | | | Rename HandleBlockDigCancel to FinishDigAnimtion.Howaner2014-05-112-5/+5
| * | | | | | | | | | | Add block place/break distance check.Howaner2014-05-092-0/+31
| * | | | | | | | | | | Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break.Howaner2014-05-094-36/+79
| |/ / / / / / / / / /
* | | | | | | | | | | Added doxy-comment requirementMattes D2014-05-131-1/+1
* | | | | | | | | | | Merge pull request #999 from mc-server/fixesMattes D2014-05-126-54/+80
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | More switch warnings.archshift2014-05-122-7/+34
| * | | | | | | | | | | Fixed a few more switch warnings.archshift2014-05-123-32/+35
| * | | | | | | | | | | Fixed a warning and a complaint about a never-read variable.archshift2014-05-112-15/+11
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #972 from mc-server/SslWebAdminMattes D2014-05-1128-174/+637
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into SslWebAdminMattes D2014-05-10131-1841/+2756
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #993 from mc-server/GridStructGenMattes D2014-05-1012-838/+581
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Merged branch 'master' into GridStructGen.Mattes D2014-05-099-31/+38
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed unused constants from MineShafts and Ravines.Mattes D2014-05-092-9/+0
| * | | | | | | | | | | Removed an unused NetherFortGen variable.Mattes D2014-05-091-6/+0
| * | | | | | | | | | | Removed an unused macro.Mattes D2014-05-091-7/+0
| * | | | | | | | | | | Ravines rewritten using cGridStructGen.Mattes D2014-05-092-182/+40
| * | | | | | | | | | | cWormNestCaves rewritten using cGridStructGen.Mattes D2014-05-092-223/+29
| * | | | | | | | | | | Mineshafts generator rewritten to use GridStructGen.Mattes D2014-05-092-156/+33
| * | | | | | | | | | | Fixed cGridStructGen.Mattes D2014-05-081-18/+6
| * | | | | | | | | | | Merge branch 'master' into GridStructGenMattes D2014-05-0886-347/+1151
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed MSVC 64-bit build warnings.Mattes D2014-05-0847-159/+176
| * | | | | | | | | | | | cNetherFortGen uses cGridStructGen.madmaxoft2014-05-075-264/+42
| * | | | | | | | | | | | Initial cPrefabPiecePool refactoring.madmaxoft2014-05-072-0/+196
| * | | | | | | | | | | | Initial cGridStructGen refactoring.madmaxoft2014-05-062-0/+262
* | | | | | | | | | | | | Fixed the console saying no plugins are loaded.STRWarrior2014-05-101-1/+1
* | | | | | | | | | | | | Merge pull request #995 from mc-server/Portal_PigmanMattes D2014-05-101-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fixed compile problem.STRWarrior2014-05-101-1/+1
| * | | | | | | | | | | | A portal block now chooses a number between 2000 and 0STRWarrior2014-05-101-1/+1
| * | | | | | | | | | | | Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman.STRWarrior2014-05-101-0/+14
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #992 from mc-server/coverity_fixesMattes D2014-05-092-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Range Check on schematic sizeworktycho2014-05-091-1/+1
| * | | | | | | | | | | Check the height and width values read.worktycho2014-05-091-0/+8
* | | | | | | | | | | | Fixed size_t in FireworksSerializer.Mattes D2014-05-091-2/+2
* | | | | | | | | | | | Fixed message formatting.Mattes D2014-05-091-2/+2
* | | | | | | | | | | | Even more size_t fixes.Mattes D2014-05-091-4/+4
* | | | | | | | | | | | More size_t fixes.Mattes D2014-05-092-6/+6
* | | | | | | | | | | | Build fixes after the last size_t batch.Mattes D2014-05-096-15/+15
* | | | | | | | | | | | World pre-generation distance is settable in world.ini.Mattes D2014-05-091-2/+6
* | | | | | | | | | | | Lighting thread disabled its chunkstays before deleting them.Mattes D2014-05-091-0/+2
* | | | | | | | | | | | Fixed MSVC 64-bit build warnings.Mattes D2014-05-0947-159/+176
|/ / / / / / / / / / /
* | / / / / / / / / / Initialise m_HasTeleported in both constructorsworktycho2014-05-091-0/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #989 from Howaner/AnvilMattes D2014-05-079-55/+118
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Missing commaHowaner2014-05-071-2/+2
| * | | | | | | | | | Send item back to the client when the item get damage.Howaner2014-05-071-0/+1
| * | | | | | | | | | Change m_RepairCost to int.Howaner2014-05-076-16/+10
| * | | | | | | | | | Where is the problem with clang?Howaner2014-05-071-1/+1
| * | | | | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-078-57/+125
* | | | | | | | | | | Merge pull request #853 from Howaner/SlabsMattes D2014-05-0711-4/+53
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Superfluous method override.Howaner2014-05-071-6/+0
| * | | | | | | | | | | Add lava and water check to block handlers.Howaner2014-05-072-2/+14
| * | | | | | | | | | | Rename CanChangeDirtToGrass to CanDirtGrowGrassHowaner2014-05-076-9/+9
| * | | | | | | | | | | Merge branch 'master' into SlabsHowaner2014-05-07274-7330/+16184
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove old importHowaner2014-04-062-3/+2
| * | | | | | | | | | | | Merge branch 'master' into SlabsHowaner2014-04-0656-334/+540
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add CanChangeDirtToGrass function to Block Handlers.Howaner2014-04-069-4/+45
| * | | | | | | | | | | | | Merge branch 'master' into SlabsHowaner2014-04-03335-6807/+18153
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove old functionHowaner2014-04-031-6/+0
| * | | | | | | | | | | | | | Grass now grows under up-side-down slabsHowaner2014-04-031-3/+12
* | | | | | | | | | | | | | | Merge pull request #990 from Howaner/EntitiesTiger Wang2014-05-072-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix MagmaCube save.Howaner2014-05-072-3/+9
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Fixed wires powering wires diagonally below themTiger Wang2014-05-071-5/+1
* | | | | | | | | | | | | | Merge pull request #985 from Howaner/AnvilMattes D2014-05-0616-3/+671
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count()Howaner2014-05-069-34/+33
| * | | | | | | | | | | | | Simplified the HandleAnvilItemName() code.Howaner2014-05-061-7/+2
| * | | | | | | | | | | | | Change int to size_t return.Howaner2014-05-052-3/+3
| * | | | | | | | | | | | | Fix SetRepairedItemName() in SlotArea.cppHowaner2014-05-051-1/+1
| * | | | | | | | | | | | | Add comments to CanTakeResultItem()Howaner2014-05-051-5/+5
| * | | | | | | | | | | | | Add doxycomments to cSlotAreaAnvil functions.Howaner2014-05-051-0/+2
| * | | | | | | | | | | | | Changed HandleAnvilItemName() length to size_t in ClientHandle.hHowaner2014-05-051-1/+1
| * | | | | | | | | | | | | Add anvil shift click.Howaner2014-05-052-5/+86
| * | | | | | | | | | | | | This isn't a enchantment table :DHowaner2014-05-051-1/+1
| * | | | | | | | | | | | | Add clicks, exp subtraction, item check, ...Howaner2014-05-057-18/+210
| * | | | | | | | | | | | | Add MC|ItemName plugin message.Howaner2014-05-056-8/+51
| * | | | | | | | | | | | | Add anvil window and slot area.Howaner2014-05-0513-0/+356
* | | | | | | | | | | | | | Merge pull request #927 from mc-server/fixesMattes D2014-05-0612-155/+160
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into fixesTiger Wang2014-05-0621-510/+743
| |\| | | | | | | | | | | |
| * | | | | | | | | | | | | Suggestions'd #2Tiger Wang2014-05-062-1/+6
| * | | | | | | | | | | | | Suggestions'dTiger Wang2014-05-063-7/+11
| * | | | | | | | | | | | | A bit of reformatting.madmaxoft2014-05-021-5/+10
| * | | | | | | | | | | | | Merge branch 'master' into fixes.madmaxoft2014-05-02181-2524/+4641
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | A tiny speed improvement in ApplyFoodExhaustion()Tiger Wang2014-04-271-5/+5
| * | | | | | | | | | | | | | More comments!Tiger Wang2014-04-272-3/+10
| * | | | | | | | | | | | | | Implemented suggestionsTiger Wang2014-04-241-7/+6
| * | | | | | | | | | | | | | Merge branch 'master' into fixesTiger Wang2014-04-2478-565/+3146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Some change to Entity.cppTiger Wang2014-04-237-123/+105
| * | | | | | | | | | | | | | | Small changesTiger Wang2014-04-234-12/+15
* | | | | | | | | | | | | | | | Changed cPieceGenerator to support pairings.madmaxoft2014-05-053-57/+104
* | | | | | | | | | | | | | | | Prefabs can specify that they don't want flooring.madmaxoft2014-05-051-30/+33
* | | | | | | | | | | | | | | | Fixed a flipped condition in cBlockArea::Merge().madmaxoft2014-05-051-2/+2
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #978 from mc-server/VectorAssignmentOperatorMattes D2014-05-051-12/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Removed convert-assign operator.madmaxoft2014-05-041-8/+0
| * | | | | | | | | | | | | | | Removed the controversial Vector3::operator <.madmaxoft2014-05-031-6/+0
| * | | | | | | | | | | | | | | Fixed float comparison warnings in Vector3.madmaxoft2014-05-031-5/+23
| * | | | | | | | | | | | | | | Implemented a true assignment operator for Vector3.madmaxoft2014-05-031-1/+9
| * | | | | | | | | | | | | | | Attempted fix for CLang warnings in Vector3.h.madmaxoft2014-05-021-1/+9
* | | | | | | | | | | | | | | | Fixed crash on creating a world during plugin initialisationworktycho2014-05-051-1/+1
* | | | | | | | | | | | | | | | Fixed formattingTiger Wang2014-05-051-4/+5
* | | | | | | | | | | | | | | | Merge pull request #956 from mc-server/redstoneimprovementsTiger Wang2014-05-049-458/+627
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fixed 027efe09ea3d3222c3cbf169643e57773c1614aeTiger Wang2014-05-041-3/+49
| * | | | | | | | | | | | | | | | Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-04145-2323/+4081
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fixed lever and button powering directionTiger Wang2014-05-041-16/+8
| * | | | | | | | | | | | | | | | | Redstone simulator now directly accesses cChunkTiger Wang2014-04-2710-453/+586
* | | | | | | | | | | | | | | | | | Fixed ProtoProxy compilation in MSVC2013.madmaxoft2014-05-041-1/+1
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fixed pressure plate oversightsTiger Wang2014-05-041-2/+8
* | | | | | | | | | | | | | | | | Fixed portal Z direction loop coding failureTiger Wang2014-05-041-10/+9
* | | | | | | | | | | | | | | | | Hotfixed Chunked transfer encoding in Yggdrasil.madmaxoft2014-05-031-1/+1
* | | | | | | | | | | | | | | | | Fixed connection encryption.madmaxoft2014-05-031-1/+1
* | | | | | | | | | | | | | | | | Fixed vanilla fluid simulator.madmaxoft2014-05-031-4/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Seperate instructions for OSX and Linuxarchshift2014-05-031-3/+38
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed vanilla fluid simulator.madmaxoft2014-05-024-14/+20
* | | | | | | | | | | | | | | Fixed a buffer overflow in cChunk:SetLight().madmaxoft2014-05-021-2/+2
* | | | | | | | | | | | | | | Open files in shared mode on windows, so that other tools may read them.madmaxoft2014-05-021-2/+2
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed MagmaCube spawning.madmaxoft2014-05-021-0/+4
* | | | | | | | | | | | | | Added a sanitizer for Spawn egg damage value.madmaxoft2014-05-021-1/+39
* | | | | | | | | | | | | | APIDump: Updated the OnDisconnect hook docs.madmaxoft2014-05-021-7/+17
* | | | | | | | | | | | | | APIDump: Improved error handling in API file loader.madmaxoft2014-05-021-1/+5
* | | | | | | | | | | | | | HOOK_DISCONNECT has cClientHandle as its first parameter.madmaxoft2014-05-026-10/+10
* | | | | | | | | | | | | | Fixed warnings in ManualBindings.madmaxoft2014-05-011-20/+20
* | | | | | | | | | | | | | Fixed warnings in Lua helpers.madmaxoft2014-05-012-3/+3
| | | | | | | * | | | | | | Client cert is not requested.Mattes D2014-05-101-1/+1
| | | | | | | * | | | | | | Fixed cert filename in Linux script.madmaxoft2014-05-072-2/+2
| | | | | | | * | | | | | | Fixed an extra space.madmaxoft2014-05-061-1/+1
| | | | | | | * | | | | | | WebAdmin outputs a log message about HTTP / HTTPS status.madmaxoft2014-05-021-18/+31
| | | | | | | * | | | | | | Made the cert generation script executable on LinuxMattes D2014-05-021-0/+0
| | | | | | | * | | | | | | Merged branch 'master' into SslWebAdmin.madmaxoft2014-05-0117-31/+34
| | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed a warning in Noise.madmaxoft2014-05-011-1/+1
* | | | | | | | | | | | | | More ClientHandle fixes.madmaxoft2014-05-012-3/+3
* | | | | | | | | | | | | | Fixed warnings in ClientHandle.madmaxoft2014-05-018-9/+9
* | | | | | | | | | | | | | Fixed warnings in cByteBuffer.madmaxoft2014-05-012-14/+14
* | | | | | | | | | | | | | Fixed warning in BlockID.madmaxoft2014-05-011-1/+1
* | | | | | | | | | | | | | Fixed warnings in cBlockArea.madmaxoft2014-05-011-2/+2
* | | | | | | | | | | | | | Fixed warnings in FastNBT.madmaxoft2014-05-011-2/+2
* | | | | | | | | | | | | | Fixed warning in cCallbackSslContext::cDataCallbacks.madmaxoft2014-05-011-0/+3
* | | | | | | | | | | | | | Fixed warning in cBlockArea.madmaxoft2014-05-011-1/+1
| | | | | | | * | | | | | | Merge branch 'master' into SslWebAdminmadmaxoft2014-05-015-2/+13
| | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #973 from mc-server/ItemNoCopyConstructorMattes D2014-05-011-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Removed the explicit copy constructor for cItem.madmaxoft2014-05-011-0/+6
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Fixed MSVC2013 compilation.Mattes D2014-05-011-1/+1
* | | | | | | | | | | | | Merge pull request #971 from worktycho/polarssl-localworktycho2014-05-012-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merged change to enable testing to be disabledTycho2014-05-011-0/+0
| * | | | | | | | | | | | | Changed polarssl repo to point to cloned copy of polarsslTycho2014-05-011-1/+1
* | | | | | | | | | | | | | Anvil saver pads data to 4K boundaries.madmaxoft2014-05-011-0/+5
| | | | | | | | * | | | | | Added a missing return statement.madmaxoft2014-05-011-0/+1
| | | | | | | | * | | | | | cSslContext has virtual destructor now.madmaxoft2014-05-011-1/+1
| | | | | | | | * | | | | | ProtoProxy: Renamed PublicKey to CryptoKey.madmaxoft2014-05-012-4/+4
| | | | | | | | * | | | | | Renamed PublicKey to CryptoKey in CMakeLists.txtMattes D2014-05-011-3/+2
| | | | | | | | * | | | | | Renamed cPublicKey to cCryptoKey.madmaxoft2014-05-019-41/+40
| | | | | | | | * | | | | | Fixed crashes in the SSL HTTP connection.madmaxoft2014-05-019-23/+36
| | | | | | | | * | | | | | Added a mention to run as admin.madmaxoft2014-05-011-0/+2
| | | | | | | | * | | | | | Added scripts for generating HTTPS cert and key.madmaxoft2014-05-012-0/+19
| | | | | | | | * | | | | | Implemented SSL connection for WebAdmin.madmaxoft2014-05-015-2/+195
| | | | | | | | * | | | | | Fixed HTTP message parsing, prepared for SSL.madmaxoft2014-05-012-3/+4
| | | | | | | | * | | | | | Added a (disabled) test of low-security ciphersuites.madmaxoft2014-05-011-0/+12
| | | | | | | | * | | | | | Fixed BufferedSslContext's buffer reading and writing.madmaxoft2014-05-011-2/+2
| | | | | | | | * | | | | | cSslContext supports setting own cert / privkey.madmaxoft2014-05-015-7/+187
| | | | | | | | * | | | | | Added cBufferedSslContext implementation.madmaxoft2014-05-012-20/+51
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | If webadmin.ini doesn't exist, example one is written immediately.madmaxoft2014-04-301-0/+1
* | | | | | | | | | | | | Fixed a warning when an empty item is being created.madmaxoft2014-04-301-1/+1
* | | | | | | | | | | | | Ladders set as transparent.madmaxoft2014-04-301-0/+1
* | | | | | | | | | | | | Removed the unused cBlockingTCPLink class.madmaxoft2014-04-303-171/+0
* | | | | | | | | | | | | Merge pull request #965 from mc-server/SslWrappersMattes D2014-04-3044-874/+2129
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Removed unneeded #includes.madmaxoft2014-04-291-6/+0
| * | | | | | | | | | | | | Moved the rest of the Crypto objects into their own respective files.madmaxoft2014-04-2917-436/+477
| * | | | | | | | | | | | | Moved cPublicKey to its separate file in PolarSSL++.madmaxoft2014-04-298-109/+127
| * | | | | | | | | | | | | Merge branch 'master' into SslWrappersmadmaxoft2014-04-293-12/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added BiomeToString() API function.madmaxoft2014-04-292-81/+106
| * | | | | | | | | | | | | | Fixed ProtoProxy.madmaxoft2014-04-294-3/+25
| * | | | | | | | | | | | | | Added missing initialization.madmaxoft2014-04-291-2/+5
| * | | | | | | | | | | | | | Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.madmaxoft2014-04-299-225/+244
| * | | | | | | | | | | | | | Merged branch 'master' into SslWrappers.madmaxoft2014-04-28114-1350/+2209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Added the G1 root cert.madmaxoft2014-04-281-2/+29
| * | | | | | | | | | | | | | Added a debug cert printing function.madmaxoft2014-04-282-0/+65
| * | | | | | | | | | | | | | Reordered constructors.madmaxoft2014-04-271-2/+2
| * | | | | | | | | | | | | | Fixed a late-night typo.madmaxoft2014-04-271-2/+2
| * | | | | | | | | | | | | | Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes.madmaxoft2014-04-271-91/+45
| * | | | | | | | | | | | | | PolarSSL wrappers for the SSL context.madmaxoft2014-04-2710-5/+847
| * | | | | | | | | | | | | | cSocket creates the socket in Connect if no socket is present yet.madmaxoft2014-04-271-2/+8
| * | | | | | | | | | | | | | Fixed C++11 check for SharedPtr.madmaxoft2014-04-251-1/+1
| * | | | | | | | | | | | | | Added shared_ptr handling for C++03 mode.madmaxoft2014-04-251-3/+7
| * | | | | | | | | | | | | | Replaced MSVC-specific decorators with our universal ones.madmaxoft2014-04-242-2/+2
| * | | | | | | | | | | | | | cByteBuffer uses void * instead of char * in data interface.madmaxoft2014-04-242-5/+6
| * | | | | | | | | | | | | | Declared a SharedPtr that hopefully resolves on all platforms.madmaxoft2014-04-241-1/+9
| * | | | | | | | | | | | | | Fixed filename case.madmaxoft2014-04-241-1/+1
| * | | | | | | | | | | | | | Attempted CMake inclusion for PolarSSL++.madmaxoft2014-04-242-2/+19
| * | | | | | | | | | | | | | Authenticator uses some C++ SSL objects.madmaxoft2014-04-241-19/+40
| * | | | | | | | | | | | | | Initial C++ SSL classes.madmaxoft2014-04-247-2/+248
* | | | | | | | | | | | | | | Delayed sending the KeepAlive packet for 3 seconds after login.madmaxoft2014-04-291-0/+5
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Added BiomeToString() API function.madmaxoft2014-04-292-81/+106
* | | | | | | | | | | | | | Disabled MSVC warnings about constant bool expressions.madmaxoft2014-04-281-2/+19
* | | | | | | | | | | | | | Hopefully fixed repeated clang warnings.madmaxoft2014-04-281-9/+9
* | | | | | | | | | | | | | Fixed a MSVC warning.madmaxoft2014-04-281-1/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-2826-68/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Withers now use the new invulnerable."Howaner2014-04-282-10/+26
| * | | | | | | | | | | | | Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-285-28/+4
| * | | | | | | | | | | | | Changed the old invulnerable methods from the wither to the new.Howaner2014-04-265-4/+28
| * | | | | | | | | | | | | Withers now use the new invulnerable.Howaner2014-04-262-26/+10
| * | | | | | | | | | | | | FixesHowaner2014-04-268-23/+26
| * | | | | | | | | | | | | Change m_InvulnerableTicks description again again :DHowaner2014-04-261-1/+1
| * | | | | | | | | | | | | Change m_InvulnerableTicks description again.Howaner2014-04-261-1/+1
| * | | | | | | | | | | | | Change m_InvulnerableTicks descriptionHowaner2014-04-261-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into GlobalFixesHowaner2014-04-262-11/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add entity invulnerableHowaner2014-04-2622-50/+111
* | | | | | | | | | | | | | | Fixed braces.madmaxoft2014-04-281-1/+5
* | | | | | | | | | | | | | | Fixed missing return value warning in MSVC.madmaxoft2014-04-281-0/+1
* | | | | | | | | | | | | | | Merge remote-tracking branch 'worktycho/master'madmaxoft2014-04-287-177/+225
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Removed static from combinators.Tycho2014-04-281-7/+7
| * | | | | | | | | | | | | | Fixed unbraced ifsTycho2014-04-281-10/+40
| * | | | | | | | | | | | | | Removed inlines from combinatorsTycho2014-04-281-7/+7
| * | | | | | | | | | | | | | Template MagicTycho2014-04-284-173/+183
| * | | | | | | | | | | | | | Worked around const pointerTycho2014-04-271-2/+3
| * | | | | | | | | | | | | | Fixes to uninitallsed array access in Noise.cppTycho2014-04-271-0/+2
| * | | | | | | | | | | | | | Initalize counter in fastrandomTycho2014-04-271-1/+2
| * | | | | | | | | | | | | | Initialised MetaArrays in BlockAreaTycho2014-04-271-2/+6
| * | | | | | | | | | | | | | Removed unneeded assertTycho2014-04-271-1/+1
* | | | | | | | | | | | | | | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-2827-857/+932
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed projectile source filenames, indentationsarchshift2014-04-2826-80/+80
| * | | | | | | | | | | | | | | Fixed ToLua errors, added newlinesarchshift2014-04-2718-19/+19
| * | | | | | | | | | | | | | | Fixed ToLua issuesarchshift2014-04-279-19/+24
| * | | | | | | | | | | | | | | Moved cFireworkEntity out of ProjectileEntity.harchshift2014-04-275-115/+116
| * | | | | | | | | | | | | | | Moved cGhastFireballEntity out of ProjectileEntity.harchshift2014-04-276-74/+85
| * | | | | | | | | | | | | | | Moved cFireChargeEntity out of ProjectileEntity.harchshift2014-04-276-82/+90
| * | | | | | | | | | | | | | | Moved cThrownSnowballEntity out of ProjectileEntity.harchshift2014-04-275-74/+84
| * | | | | | | | | | | | | | | Moved cExpBottleEntity out of ProjectileEntity.harchshift2014-04-274-52/+61
| * | | | | | | | | | | | | | | Moved cThrownEnderPearl out of ProjectileEntity.harchshift2014-04-275-86/+95
| * | | | | | | | | | | | | | | Moved cThrownEggEntity out of ProjectileEntity.harchshift2014-04-275-91/+100
| * | | | | | | | | | | | | | | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-2710-284/+297
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed warnings.madmaxoft2014-04-272-2/+3
* | | | | | | | | | | | | | | Fixed player spawning #953.madmaxoft2014-04-271-1/+4
* | | | | | | | | | | | | | | Merge pull request #958 from worktycho/bugfixMattes D2014-04-273-8/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Removed Old AssertsTycho2014-04-271-2/+0
| * | | | | | | | | | | | | | | Removed old unused codeTycho2014-04-271-5/+0
| * | | | | | | | | | | | | | | Fixed OnPluginMessage hook not exiting early.Tycho2014-04-271-1/+1
* | | | | | | | | | | | | | | | Merge pull request #959 from mc-server/fixes-2worktycho2014-04-274-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Revert "Creative players cannot throw ender pearls."archshift2014-04-271-16/+0
| * | | | | | | | | | | | | | | Creative players cannot throw ender pearls.archshift2014-04-271-0/+16
| * | | | | | | | | | | | | | | Added static const, initialized fields.archshift2014-04-274-2/+7
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Update CoverityModel.cppworktycho2014-04-271-3/+15
* | | | | | | | | | | | | | | Create CoverityModel.cppworktycho2014-04-271-0/+5
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #864 from mc-server/StatMattes D2014-04-272-0/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added some commentsandrew2014-04-272-2/+2
| * | | | | | | | | | | | | | Statistic/Achievement defsandrew2014-04-072-0/+255
* | | | | | | | | | | | | | | Another attempt at #889.madmaxoft2014-04-271-3/+5
* | | | | | | | | | | | | | | Merge pull request #948 from jfhumann/staticFixesMattes D2014-04-275-3/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed unitialized member in gZipFile (CID 43673)jfhumann2014-04-261-1/+1
| * | | | | | | | | | | | | | Fixed a memory leak in tolua_cWorld_ChunkStay. (CID 43618)jfhumann2014-04-261-1/+4
| * | | | | | | | | | | | | | Fixes resource leaks in the yggdrasil authenticator. (CID 43617)jfhumann2014-04-261-0/+33
| * | | | | | | | | | | | | | Fix for minor resource leak (CID 43616)jfhumann2014-04-261-1/+9
| * | | | | | | | | | | | | | Should fix CIDs 43631, 43632 and 43633jfhumann2014-04-251-0/+2
* | | | | | | | | | | | | | | Merge pull request #941 from archshift/masterMattes D2014-04-2619-174/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | More small fixes.archshift2014-04-263-11/+11
| * | | | | | | | | | | | | | Moar alignment.archshift2014-04-261-7/+7
| * | | | | | | | | | | | | | Further refactored, Reverted Minecart changearchshift2014-04-2611-90/+62
| * | | | | | | | | | | | | | Fixed mobs that don't naturally spawn.archshift2014-04-263-7/+11
| * | | | | | | | | | | | | | Moved switch{} out of GetArmorCoverAgainst().archshift2014-04-262-5/+29
| * | | | | | | | | | | | | | Removed unused assignments.archshift2014-04-263-6/+2
| * | | | | | | | | | | | | | Fixed a couple more warnings.archshift2014-04-262-21/+17
| * | | | | | | | | | | | | | Moved the weather picker out of TickWeather(), squashing a warning and improving readability.archshift2014-04-262-25/+30
| * | | | | | | | | | | | | | Removed impossible default case.archshift2014-04-261-6/+0
| * | | | | | | | | | | | | | Removed extraneous switch{} in Start()archshift2014-04-262-17/+3
| * | | | | | | | | | | | | | Moved huge conditional out of InStateChasing(), improving readabilityarchshift2014-04-262-1/+20
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'archshift2014-04-2518-17/+201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Small changes; warning fixing.archshift2014-04-256-14/+12
| * | | | | | | | | | | | | | | Oops, fixed that.archshift2014-04-251-0/+2
| * | | | | | | | | | | | | | | Giants!archshift2014-04-252-7/+12
| * | | | | | | | | | | | | | | Refactored SendChat(), placing the message-type formatting into its own function.archshift2014-04-252-84/+81
* | | | | | | | | | | | | | | | Merge pull request #863 from mc-server/chunkysparsingMattes D2014-04-263-67/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Implemented commentsTiger Wang2014-04-253-33/+52
| * | | | | | | | | | | | | | | | Fixed indentTiger Wang2014-04-241-1/+1
| * | | | | | | | | | | | | | | | Another small speed improvement?Tiger Wang2014-04-241-12/+2
| * | | | | | | | | | | | | | | | Implemented suggestionsTiger Wang2014-04-242-89/+16
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Replaced all the .data() calls so the code compiles in VS2008Tycho2014-04-101-5/+5
| * | | | | | | | | | | | | | | Maybe speed improvements?Tiger Wang2014-04-072-48/+29
| * | | | | | | | | | | | | | | Attempt to fix errorsTiger Wang2014-04-072-12/+12
| * | | | | | | | | | | | | | | Blocklight and skylight now compressedTiger Wang2014-04-073-32/+90
| * | | | | | | | | | | | | | | Nibbletypes are compressedTiger Wang2014-04-053-18/+110
| * | | | | | | | | | | | | | | Speed and memory improvementsTiger Wang2014-04-042-62/+15
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into chunkysparsingTiger Wang2014-04-03154-1003/+6127
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fixed some bugsTiger Wang2014-04-031-3/+5
| * | | | | | | | | | | | | | | | Performance improvements and chunk flipping fixedTiger Wang2014-04-021-30/+32
| * | | | | | | | | | | | | | | | Sort of implementation of chunk sparsingTiger Wang2014-03-232-18/+93
* | | | | | | | | | | | | | | | | Merge pull request #936 from archshift/patch-1Mattes D2014-04-261-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Needs the -stdlib linker flag too.archshift2014-04-261-0/+1
| * | | | | | | | | | | | | | | | Move to line 47.archshift2014-04-251-3/+1
| * | | | | | | | | | | | | | | | Use libc++ on OSXarchshift2014-04-251-0/+3
* | | | | | | | | | | | | | | | | Merge pull request #920 from axisd/masterMattes D2014-04-251-7/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix formattingr.ramazanov2014-04-251-9/+15
| * | | | | | | | | | | | | | | | | Fix for clangr.ramazanov2014-04-251-5/+1
| * | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining & Mob Knockback is far too muchr.ramazanov2014-04-251-8/+5
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-2513-24/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-244-9/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-2358-531/+1259
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-231-9/+30
| * | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-211-5/+12
* | | | | | | | | | | | | | | | | | | | | Updated MSVC side of CMake files after recent changes.madmaxoft2014-04-251-4/+2
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #935 from archshift/projectile-fixesMattes D2014-04-252-7/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Creator not user.archshift2014-04-252-5/+5
| * | | | | | | | | | | | | | | | | | | | Comments for TrySpawnChicken() and TeleportUser().archshift2014-04-251-0/+2
| * | | | | | | | | | | | | | | | | | | | Rename spawn chicken method, Initialize m_HasTeleported.archshift2014-04-252-4/+5
| * | | | | | | | | | | | | | | | | | | | Chicken eggs and ender pearls can hit entities.archshift2014-04-252-7/+66
| | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #938 from archshift/xcode-oopsMattes D2014-04-257-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Missed these CMakeLists.archshift2014-04-257-3/+17
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #937 from archshift/xcode-headersworktycho2014-04-2512-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Cmake generated projects for IDEs include headers in project files.archshift2014-04-2512-0/+12
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #932 from Howaner/InventoryMattes D2014-04-256-17/+189
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add commit what the code is doing.Howaner2014-04-251-0/+1
| * | | | | | | | | | | | | | | | | Add unkown armor warning and fix armor stacks.Howaner2014-04-251-2/+14
| * | | | | | | | | | | | | | | | | Add armor to switch() in ItemHandler.cppHowaner2014-04-242-7/+26
| * | | | | | | | | | | | | | | | | Fix armor in survival mode.Howaner2014-04-246-17/+157
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #929 from archshift/masterMattes D2014-04-2411-22/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed class capitalization for the cave spider.archshift2014-04-244-7/+7
| * | | | | | | | | | | | | | | Fixed references to renamed files.archshift2014-04-246-9/+9
| * | | | | | | | | | | | | | | Rename mob source files to fit CamelCase.archshift2014-04-246-6/+0
| |/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / / Changed cByteBuffer constructor to take a size_t instead of int.madmaxoft2014-04-242-2/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Updated docs for StringToEnchantmentID.madmaxoft2014-04-232-2/+2
* | | | | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content.madmaxoft2014-04-231-7/+29
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | The new leaves don't decay anymore.STRWarrior2014-04-231-0/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #925 from archshift/masterMattes D2014-04-234-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Renamed getter and setter for IsFireproof.archshift2014-04-233-4/+4
| * | | | | | | | | | | | Declaration that a mob is not fireproof is implicit.archshift2014-04-231-21/+0
| * | | | | | | | | | | | Added IsFireproof hook for monsters.iniarchshift2014-04-232-0/+29
| * | | | | | | | | | | | Fireproof status getter and setter.archshift2014-04-232-0/+16
* | | | | | | | | | | | | Updated NetherFort prefabs from the Gallery server.madmaxoft2014-04-221-274/+785
* | | | | | | | | | | | | Merge pull request #923 from archshift/masterMattes D2014-04-223-5/+17
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Fixed indentation and changed m_Fireproof to m_IsFireproof.archshift2014-04-222-14/+14
| * | | | | | | | | | | | Fixed capitalization issuesarchshift2014-04-221-2/+2
| * | | | | | | | | | | | Lay foundation for fireproof entities.archshift2014-04-222-3/+15
* | | | | | | | | | | | | Revert moving gcc to g++11 in 18c3b1worktycho2014-04-221-8/+0
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #909 from jfhumann/fixesMattes D2014-04-2248-218/+263
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | reverted the revert of the minecart collision detection fix.jfhumann2014-04-211-2/+1
| * | | | | | | | | | | Fixed Flint and Steel, reverted Minecart change, renamed a parameter namejfhumann2014-04-194-9/+10
| * | | | | | | | | | | Declared one mutex as mutable in order to allow for const correct get accessors.jfhumann2014-04-193-7/+7
| * | | | | | | | | | | Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does.jfhumann2014-04-182-2/+2
| * | | | | | | | | | | Small style changesjfhumann2014-04-184-9/+9
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-1846-811/+2166
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-1848-212/+257
* | | | | | | | | | | | | Added prefab hitboxes.madmaxoft2014-04-213-11/+138
* | | | | | | | | | | | | Added enchantment combining into cEnchantments.madmaxoft2014-04-212-16/+33
* | | | | | | | | | | | | Replaced X.size() with X.empty(), where applicable.madmaxoft2014-04-211-3/+3
* | | | | | | | | | | | | Fixed a warning in CraftingRecipes.Mattes D2014-04-211-1/+1
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Allow 1.6.4 Forge clients to log in.Mattes D2014-04-212-0/+20
* | | | | | | | | | | | Fixed enchanting return values.Mattes D2014-04-211-3/+3
* | | | | | | | | | | | Updated the nightbuild script.madmaxoft2014-04-201-1/+1
* | | | | | | | | | | | Fixed MSVC compilation.madmaxoft2014-04-201-1/+1
* | | | | | | | | | | | Merge pull request #890 from daniel0916/EnchantingMattes D2014-04-2018-9/+1509
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed Codedaniel09162014-04-192-145/+148
| * | | | | | | | | | | | Merge branch 'master' into Enchantingdaniel09162014-04-1910-29/+377
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | APIDump: Added a ChunkStay article.madmaxoft2014-04-193-27/+195
* | | | | | | | | | | | | Fixed formatting, made function static.madmaxoft2014-04-192-13/+18
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/Beacons'madmaxoft2014-04-194-0/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Some tweaksSTRWarrior2014-04-121-5/+17
| * | | | | | | | | | | | Removed debug message.STRWarrior2014-04-121-1/+0
| * | | | | | | | | | | | Simplefied GetPyramidLevelSTRWarrior2014-04-121-10/+3
| * | | | | | | | | | | | Implemented the skeleton code for the beacon.STRWarrior2014-04-124-0/+155
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Compilation fixTiger Wang2014-04-181-1/+1
* | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-04-182-0/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Fixed #906Tiger Wang2014-04-182-1/+12
* | | | | | | | | | | | Fixed #904Tiger Wang2014-04-182-1/+6
| | | * | | | | | | | | Fixed Code (2)daniel09162014-04-191-97/+93
| | | * | | | | | | | | Fixed Codedaniel09162014-04-195-411/+418
| | | * | | | | | | | | Merge branch 'master' into Enchantingdaniel09162014-04-1829-426/+1507
| | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Added performance test of the nether fort generator.madmaxoft2014-04-182-0/+35
|/ / / / / / / / / / /
* | | | | | | | | | | Removed unsupported C++11 features.madmaxoft2014-04-181-13/+19
* | | | | | | | | | | Merge pull request #891 from mc-server/fixesMattes D2014-04-1718-330/+457
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Compile fix?Tiger Wang2014-04-172-2/+10
| * | | | | | | | | | | Implemented weighted pressure platesTiger Wang2014-04-173-29/+175
| * | | | | | | | | | | Rewrote redstone powering to use power levelsTiger Wang2014-04-156-183/+157
| * | | | | | | | | | | Entities handle chunks properly againTiger Wang2014-04-1210-123/+123
| * | | | | | | | | | | Simplified pickup speed randomisationTiger Wang2014-04-121-4/+3
* | | | | | | | | | | | Added area flooring.madmaxoft2014-04-171-1/+42
* | | | | | | | | | | | Added new AI rulesTiger Wang2014-04-177-55/+67
* | | | | | | | | | | | Added Prefab initializers to SELFTEST code.madmaxoft2014-04-171-1/+13
* | | | | | | | | | | | Prefabs can have per-piece per-placement weights.madmaxoft2014-04-175-32/+752
* | | | | | | | | | | | Merge pull request #896 from axisd/masterMattes D2014-04-171-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Mobs rotationr.ramazanov2014-04-171-4/+6
* | | | | | | | | | | | | Added asserts for proper game state.madmaxoft2014-04-161-5/+131
|/ / / / / / / / / / / /
| | | * | | | | | | | | Fixed Errorsdaniel09162014-04-183-5/+23
| | | * | | | | | | | | Removed old includedaniel09162014-04-182-2/+1
| | | * | | | | | | | | Fixed some Errors (not all)daniel09162014-04-174-20/+21
| | | * | | | | | | | | Modified many thingsdaniel09162014-04-1710-918/+1000
| | | * | | | | | | | | Fixed conflicting enchantments checkingdaniel09162014-04-162-24/+24
| | | * | | | | | | | | Added deletions from merge conflictdaniel09162014-04-161-0/+875
| | | * | | | | | | | | Merge branch 'master' into Enchantingdaniel09162014-04-1624-382/+696
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Attempted fix for the client crash with the new protocols.madmaxoft2014-04-152-6/+16
* | | | | | | | | | | | Added support for per-piece per-placement weights in cPieceGenerator.madmaxoft2014-04-152-28/+48
* | | | | | | | | | | | NetherFortPrefabs: Fixed a connector in MidStaircase.madmaxoft2014-04-151-1/+1
* | | | | | | | | | | | Merge pull request #888 from mc-server/Proto176Mattes D2014-04-1516-333/+571
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-1410-128/+198
| * | | | | | | | | | | | A client UUID is generated when the server is in offline mode.madmaxoft2014-04-143-5/+40
| * | | | | | | | | | | | Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176madmaxoft2014-04-1410-296/+362
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fixed mistakedaniel09162014-04-132-2/+2
| | * | | | | | | | | | | | Fixed Error?daniel09162014-04-131-2/+2
| | * | | | | | | | | | | | Code Updatedaniel09162014-04-131-4/+5
| | * | | | | | | | | | | | Added Yggdrasil Authentication Systemdaniel09162014-04-139-295/+360
| * | | | | | | | | | | | | Initial 1.7.6 protocol support.madmaxoft2014-04-144-2/+69
|/ / / / / / / / / / / / /
* | | | | / / / / / / / / ProtoProxy: Fixed weird gcc compilation errors.madmaxoft2014-04-141-16/+22
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | ProtoProxy: Added 1.7.9 compatibility.madmaxoft2014-04-141-0/+29
* | | | | | | | | | | | ChunkStay must be disabled while being deleted.ProtoProxy_1.7.2_001madmaxoft2014-04-123-4/+6
* | | | | | | | | | | | Fixed chunkstays not being removed on auto-delete.madmaxoft2014-04-122-10/+19
|/ / / / / / / / / / /
| | | * | | | | | | | Fixed merge conflictdaniel09162014-04-161-877/+0
| | | * | | | | | | | Fixed double enchanting itemsdaniel09162014-04-161-2/+2
| | | * | | | | | | | Code Optimizationdaniel09162014-04-152-358/+183
| | | * | | | | | | | Added Book Enchantingdaniel09162014-04-152-2/+311
| | | * | | | | | | | Add more checks to cSlotAreaEnchantingHowaner2014-04-153-99/+212
| | | * | | | | | | | Modified namesdaniel09162014-04-152-49/+49
| | | * | | | | | | | Add linux compatibilityHowaner2014-04-151-61/+71
| | | * | | | | | | | Added ItemPlaceCount in SlotAreadaniel09162014-04-142-0/+35
| | | * | | | | | | | Removed Debug Messagedaniel09162014-04-141-2/+0
| | | * | | | | | | | Added/Modified last things for Enchanting Systemdaniel09162014-04-141-15/+53
| | | * | | | | | | | Blocked enchanting a item twicedaniel09162014-04-142-8/+10
| | | * | | | | | | | Fixed Bookshelf Checkingdaniel09162014-04-141-8/+10
| | | * | | | | | | | Bug fixesdaniel09162014-04-144-26/+21
| | | * | | | | | | | Fixed invisibility enchantmentsdaniel09162014-04-134-1/+8
| | | * | | | | | | | Fixed mistakedaniel09162014-04-131-1/+1
| | | * | | | | | | | Fixed Server Crashdaniel09162014-04-131-0/+6
| | | * | | | | | | | Some Fixesdaniel09162014-04-132-2/+9
| | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-1212-2057/+3454
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Updated the NetherFort prefabs to current Gallery contents.madmaxoft2014-04-123-1958/+3329
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fixed issues with 64-bit MSVC compilation.madmaxoft2014-04-113-21/+35
|/ / / / / / / / /
* | | | | | | | | Fixed enchantment parsing.madmaxoft2014-04-101-12/+17
* | | | | | | | | InfoReg uses cCompositeChat for subcommand lists.madmaxoft2014-04-101-6/+6
* | | | | | | | | Merge pull request #878 from mc-server/mobexpMattes D2014-04-101-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed GitHuB WebEdit fail.Alexander Harkness2014-04-101-0/+1
| * | | | | | | | | Update Monster.cppAlexander Harkness2014-04-101-2/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #871 from worktycho/worldstorageMattes D2014-04-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed check for enqueuing a chunk that is already enqueued to be loadedTycho2014-04-081-1/+1
* | | | | | | | | | cRedstoneSimulator.cpp style improvementsTiger Wang2014-04-081-40/+41
* | | | | | | | | | Merge pull request #872 from worktycho/bugfixAlexander Harkness2014-04-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed missing - that caused all neighbour lookups to go to the chunkmapTycho2014-04-081-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #870 from wiseoldman95/patch-1Alexander Harkness2014-04-081-10/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Uppercased Zwiseoldman952014-04-081-3/+3
| * | | | | | | | | | Comments: Inverted Z axis.wiseoldman952014-04-081-9/+10
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #869 from wiseoldman95/patch-1Alexander Harkness2014-04-081-9/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added comments regarding latching and orientationwiseoldman952014-04-081-9/+31
|/ / / / / / / / / /
* | | | | | | | | | Fixed the thing properly.Alexander Harkness2014-04-081-8/+8
* | | | | | | | | | Merge pull request #862 from mc-server/redstonefixAlexander Harkness2014-04-081-23/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed #859Tiger Wang2014-04-071-23/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #865 from wiseoldman95/patch-2Alexander Harkness2014-04-071-13/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed IsOnwiseoldman952014-04-071-3/+2
| * | | | | | | | | | Removed stray IsLockedwiseoldman952014-04-071-2/+2
| * | | | | | | | | | Removed unneeded spacingswiseoldman952014-04-071-6/+3
| * | | | | | | | | | Slight cleanupwiseoldman952014-04-071-13/+17
|/ / / / / / / / / /
| | | * | | | | | | Fixed Bookshelves Checking (not completly)daniel09162014-04-121-7/+10
| | | * | | | | | | Added complete Enchanting Systemdaniel09162014-04-128-147/+803
| | | * | | | | | | Modified commentdaniel09162014-04-071-1/+1
| | | * | | | | | | Fixed Errorsdaniel09162014-04-072-3/+3
| | | * | | | | | | Added deleted things for mergingdaniel09162014-04-071-0/+3
| | | * | | | | | | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-07711-62011/+38666
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fixed some more minor issues with the redstone simulator.Alexander Harkness2014-04-071-34/+39
* | | | | | | | | | Improved the speed a little more.Alexander Harkness2014-04-071-1/+1
* | | | | | | | | | Fixed the redstone simulator.Alexander Harkness2014-04-071-49/+40
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Fix some of the comments in the PR tycho just did.Alexander Harkness2014-04-071-8/+6
* | | | | | | | | Merge pull request #861 from worktycho/simulatorAlexander Harkness2014-04-072-2/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added support for redstone latchingTycho2014-04-062-2/+65
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Fixed HTTP chunked encoding.madmaxoft2014-04-071-1/+1
* | | | | | | | | Added the generated ZBS API file to ignore list.madmaxoft2014-04-061-0/+2
* | | | | | | | | Fixed 1.6.4 client crash on composite chat messages.madmaxoft2014-04-062-0/+14
* | | | | | | | | Fixed crash in protocols sending 64-bit ints.madmaxoft2014-04-061-1/+1
* | | | | | | | | Updated the tolua executable for Windows.madmaxoft2014-04-061-0/+0
* | | | | | | | | Merge remote-tracking branch 'worktycho/override'madmaxoft2014-04-067-1325/+1648
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Added forgoten lua fileTycho2014-04-061-0/+1476
| * | | | | | | | Merge branch 'master' into overrideTycho2014-04-05200-1373/+6707
| |\| | | | | | |
| * | | | | | | | Fixed tolua++ override supportTycho2014-04-025-1319/+164
| * | | | | | | | Added override specifier to functions declared in cWorldTycho2014-03-221-8/+8
| * | | | | | | | FIrst attempt at adding override support to toluaTycho2014-03-221-5/+6
* | | | | | | | | Updated cWorld::CreateProjectile() documentationTiger Wang2014-04-061-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Fixed Endiannes conversion routines for floats and doubles.madmaxoft2014-04-052-3/+3
* | | | | | | | Fixed double projectile spawning.madmaxoft2014-04-051-1/+0
* | | | | | | | Removed debugging log from entity physics handling.madmaxoft2014-04-051-1/+2
* | | | | | | | Added more API documentation to cCompositeChat.madmaxoft2014-04-051-1/+17
* | | | | | | | Added cPlayer:SendRotation() API function.madmaxoft2014-04-052-0/+17
* | | | | | | | Merge pull request #840 from Howaner/NewBlocksMattes D2014-04-043-5/+152
|\ \ \ \ \ \ \ \
| * | | | | | | | Change CanBeAt() from big flowerHowaner2014-04-031-5/+1
| * | | | | | | | Add "a_RelY < cChunkDef::Height" to BlockBigFlowerHowaner2014-03-291-0/+1
| * | | | | | | | Add tallgrass drop to big flowers.Howaner2014-03-282-8/+59
| * | | | | | | | door -> flowerHowaner2014-03-281-1/+1
| * | | | | | | | Add tall flower handler.Howaner2014-03-282-0/+99
* | | | | | | | | Merge branch 'master' into HTTPSizeTmadmaxoft2014-04-0439-581/+359
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Explicit change record size.madmaxoft2014-04-041-1/+1
| * | | | | | | | | Changed cNoise seed to signed.madmaxoft2014-04-042-4/+4
| * | | | | | | | | Fixed format string mismatch.madmaxoft2014-04-041-1/+1
| * | | | | | | | | More Clang warning fixes in the protocols.madmaxoft2014-04-046-81/+82
| * | | | | | | | | Fixed CreateHexDump's format string.madmaxoft2014-04-041-2/+2
| * | | | | | | | | Fixed CreateHexDump's signedness.madmaxoft2014-04-043-11/+11
| * | | | | | | | | More Clang warning fixes in the protocols.madmaxoft2014-04-043-30/+39
| * | | | | | | | | Fixed silly Clang's warnings in FastNBT.madmaxoft2014-04-041-28/+28
| * | | | | | | | | Fixed some Clang warnings in protocols.madmaxoft2014-04-0413-43/+51
| * | | | | | | | | Fixed Clang warnings in itemhandlers.madmaxoft2014-04-046-20/+21
| * | | | | | | | | ProtoProxy: Fixed a few Clang and MSVC warnings.madmaxoft2014-04-042-4/+8
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | APIDump: Added angular specifics.madmaxoft2014-04-031-2/+2
| * | | | | | | | Documented the units and range for entity rotations.madmaxoft2014-04-032-10/+10
| * | | | | | | | Removed unneeded asserts.madmaxoft2014-04-031-2/+0
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fixed a few MSVC type warnings.Mattes D2014-04-033-2/+5
| * | | | | | | Removed the bindings to set old g_BlockXXX arrays.Mattes D2014-04-031-297/+65
| * | | | | | | Merge pull request #849 from mc-server/minorfixesMattes D2014-04-026-48/+34
| |\ \ \ \ \ \ \
| | * | | | | | | With eXtra line!Tiger Wang2014-04-021-0/+1
| | * | | | | | | Removed extra bracketsTiger Wang2014-04-021-5/+2
| | * | | | | | | Final realisation of suggestionsTiger Wang2014-03-311-5/+7
| | * | | | | | | Realised suggestionsTiger Wang2014-03-312-6/+12
| | * | | | | | | Simplified and fixed slabs, fixes #835Tiger Wang2014-03-313-36/+13
| | * | | | | | | Fixed a few Y too high/low assertsTiger Wang2014-03-313-12/+15
* | | | | | | | | Merge branch 'master' into HTTPSizeTTycho2014-04-0224-30/+45
|\| | | | | | | |
| * | | | | | | | Fixed boat placement code.madmaxoft2014-04-021-9/+17
| * | | | | | | | Fixed more virtual destructors for interfaces.madmaxoft2014-04-024-0/+12
| * | | | | | | | Merge branch 'MacFixes'Tycho2014-04-0219-19/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future.Samuel Barney2014-03-2516-15/+20
| | * | | | | | | | Added one more missing newline.Samuel Barney2014-03-251-1/+1
| | * | | | | | | | Added newlines. Without them, the files would not compile.Samuel Barney2014-03-254-4/+4
* | | | | | | | | | Merge branch 'master' into HTTPSizeTTycho2014-04-0214-18/+375
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into globalsTycho2014-04-02178-4454/+11512
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #831 from mc-server/WitherMattes D2014-04-025-3/+153
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed clang compilationandrew2014-03-252-14/+17
| | | * | | | | | | | | Fixed wither summoningandrew2014-03-253-3/+37
| | | * | | | | | | | | Protocol: Wither metadataandrew2014-03-255-3/+116
| | * | | | | | | | | | Debuggers: Added a Base64 API roundtrip test.madmaxoft2014-04-021-4/+23
| | * | | | | | | | | | Added schematic string serializer self-test.madmaxoft2014-04-021-0/+33
| | * | | | | | | | | | Fixed StringCompression's GZIP handling for larger strings.madmaxoft2014-04-022-5/+7
| | * | | | | | | | | | Exported the Base64 encoding and decoding functions to Lua API.madmaxoft2014-04-012-2/+48
| | * | | | | | | | | | Merged branch 'msDifference'.madmaxoft2014-04-013-1/+52
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | APIDump: Gave msDifference it's own table.STRWarrior2014-04-011-9/+21
| | | * | | | | | | | | | Added extra table which should make it more clear what msDifference does.STRWarrior2014-03-311-1/+3
| | | * | | | | | | | | | Fixed typoSTRWarrior2014-03-311-1/+1
| | | * | | | | | | | | | Documented msDifferenceSTRWarrior2014-03-311-6/+8
| | | * | | | | | | | | | Added new merge strategy "msDifference"STRWarrior2014-03-312-0/+35
| | * | | | | | | | | | | cBlockArea: Added the msMask merge strategy.madmaxoft2014-04-013-3/+59
| * | | | | | | | | | | | Merge branch 'master' into globalsTycho2014-03-1511-40/+146
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into globalsTycho2014-03-144-11/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Disable global constructors and exit-time destructors warningsTycho2014-03-141-2/+2
* | | | | | | | | | | | | | | Fixed All signedness warnings in HTTPServer.cppTycho2014-04-0210-14/+17
* | | | | | | | | | | | | | | Fixed format string in HTTPConnectionTycho2014-04-021-1/+1
* | | | | | | | | | | | | | | Fixed Comparison to -1 in HTTPMessage.hTycho2014-04-021-1/+1
* | | | | | | | | | | | | | | Rewritten HTTPServer to use size_t for data lengths.madmaxoft2014-04-0116-90/+97
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Removed the exit-time-destructors flag from clang.madmaxoft2014-04-011-1/+1
* | | | | | | | | | | | | | More cFile warning fixes.madmaxoft2014-04-011-1/+1
* | | | | | | | | | | | | | Merge branch 'RemoveClangFlags'madmaxoft2014-04-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Attempt at disabling the useless clang warnings.madmaxoft2014-04-011-0/+1
* | | | | | | | | | | | | | | Fixed clang warnings in cGZipFile.madmaxoft2014-04-011-2/+2
* | | | | | | | | | | | | | | Fixed clang warnings in BlockHandlers.madmaxoft2014-04-014-5/+6
* | | | | | | | | | | | | | | Fixed clang warnings in cFile.madmaxoft2014-04-011-10/+10
* | | | | | | | | | | | | | | Simplified the anvil placement code.madmaxoft2014-04-011-11/+9
* | | | | | | | | | | | | | | Removed an unneeded code branch.madmaxoft2014-04-011-5/+0
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | LOG() API reads the LogLevel from the cCompositeChat's MessageType.madmaxoft2014-04-016-24/+81
* | | | | | | | | | | | | | APIDump: Documented the cCompositeChat support in logging functions.madmaxoft2014-03-311-5/+25
* | | | | | | | | | | | | | Console logging supports cCompositeChat as its parameters.madmaxoft2014-03-315-34/+78
* | | | | | | | | | | | | | APIDump: Added code completion support file to ZBS tutorial.madmaxoft2014-03-311-1/+2
* | | | | | | | | | | | | | APIDump: Renamed the ZBS API dump file to mcserver_api.lua.madmaxoft2014-03-311-2/+2
* | | | | | | | | | | | | | cCompositeChat has a MessageType param in the constructor.madmaxoft2014-03-312-3/+3
* | | | | | | | | | | | | | Fixed a few Clang warnings in BlockHandlers.madmaxoft2014-03-3011-48/+54
| |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fixed a few clang warnings.madmaxoft2014-03-304-7/+13
* | | | | | | | | | | | | Merge branch 'NetherFortGen'.madmaxoft2014-03-3012-26/+3248
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Added all current NetherFort prefabs.madmaxoft2014-03-301-3/+1547
| * | | | | | | | | | | | Added asserts for critical data in cPrefab.madmaxoft2014-03-301-0/+4
| * | | | | | | | | | | | Re-fixed nether fort piece count check.madmaxoft2014-03-301-2/+2
| * | | | | | | | | | | | Fixed chest rotator.madmaxoft2014-03-301-2/+2
| * | | | | | | | | | | | NetherForts have a minimum number of pieces.madmaxoft2014-03-301-2/+5
| * | | | | | | | | | | | Merge branch 'master' into NetherFortGenmadmaxoft2014-03-2917-27/+285
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | NetherFortGen: Added several more prefabs.madmaxoft2014-03-282-2/+783
| * | | | | | | | | | | | | Added Prefabs to *nix builds.madmaxoft2014-03-281-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into NetherFortGenmadmaxoft2014-03-2811-37/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Implemented the msSpongePrint merge strategy.madmaxoft2014-03-284-13/+68
| * | | | | | | | | | | | | | NetherFort: Added BalconyTee2 prefab.madmaxoft2014-03-281-29/+158
| * | | | | | | | | | | | | | Fixed a memory leak in NetherFortGen.madmaxoft2014-03-281-0/+7
| * | | | | | | | | | | | | | Sponged the netherfort balcony prefab.madmaxoft2014-03-281-30/+31
| * | | | | | | | | | | | | | Merge branch 'master' into NetherFortGenmadmaxoft2014-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Initial NetherFortGen import.madmaxoft2014-03-288-15/+713
* | | | | | | | | | | | | | | APIDump: Added article: Setting up ZeroBrane Studio.madmaxoft2014-03-304-0/+46