summaryrefslogtreecommitdiffstats
path: root/src/World.h (follow)
Commit message (Expand)AuthorAgeFilesLines
* Makes tall grass and large flowers bonemealableQUSpilPrgm2016-06-031-0/+2
* Update Dispensers and let them act more like in VanillaQUSpilPrgm2016-06-031-6/+10
* 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)Pokechu222016-05-141-1/+2
* Reduced unnecessary block updatesLogicParrot2016-04-221-2/+1
* Updated cChunk::SetMeta, fixed grass growth, reduced markDirty/setMeta usageLogicParrot2016-04-161-1/+2
* Proper entity destruction in non-ticking chunksLogicParrot2016-02-191-1/+0
* Bulk clearing of whitespaceLogicParrot2016-02-051-127/+127
* Exported GetSeed to lua and added file extension opendb to .gitignore.Lukas Pioch2016-01-121-0/+3
* Merge pull request #2542 from Haxi52/pinkstoneTiger Wang2015-12-191-8/+0
|\
| * Reorganised the redstone simulatorTiger Wang2015-12-181-8/+0
* | Revised the explosion-related Lua API and docs.Mattes D2015-12-181-14/+5
|/
* Add enum for Sound and Particle EffectsDave Tucker2015-11-241-1/+2
* Improved spawn location calculations.samoatesgames2015-11-131-1/+5
* Implemented brewingLukas Pioch2015-11-031-0/+8
* Added weather intervals to world.ini settings.Mattes D2015-09-281-0/+3
* Prepared ScheduleTask for threading refactorTiger Wang2015-09-251-103/+4
* Add new "ForEach" function: ForEachLoadedChunk.tycho2015-09-241-1/+4
* Unified the doxy-comment format.Mattes D2015-07-311-7/+8
* Merge pull request #2363 from scribblemaniac/improve-spider-aiTiger Wang2015-07-161-0/+1
|\
| * Improved spider AIscribblemaniac2015-07-161-0/+1
* | Spawn baby mobshallucino2015-07-161-1/+1
|/
* Merge pull request #2224 from cuberite/ChunkQueueCollapsingworktycho2015-07-041-1/+1
|\
| * Reinstate "Chunk queue collapsing"Tiger Wang2015-06-101-1/+1
* | Added a size check for portals.STRWarrior2015-06-281-0/+18
* | Buttons no longer click on when already on. Buttons now play sound when clicking off.Hax522015-06-241-0/+22
|/
* Revert "Chunk queue collapsing"worktycho2015-06-071-1/+1
* Moved Chunk Broadcasts over to the regular queuetycho2015-06-051-1/+1
* Made cLightingThread own its callbackstycho2015-05-301-2/+2
* Made -Weverything an error.tycho2015-05-241-1/+1
* Merge branch 'master' into PreventNewWarningstycho2015-05-231-4/+4
|\
| * Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-231-4/+4
* | Fixed a lot of warningstycho2015-05-191-1/+1
|/
* More style checking.Mattes D2015-05-091-3/+3
* Added support for additional data in the ParticleEffect Packettycho2015-05-071-1/+6
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-241-20/+28
|\
| * Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-211-20/+28
* | Changed linked world name variables and setters / getters.Mattes D2015-03-211-15/+16
* | Added cPluginLua::cResettable interface, used for scheduled tasks.Mattes D2015-03-201-12/+8
|/
* Monsters will now attack. Additional checks have been added when generating spawn.tumultenrx2015-03-131-0/+3
* Converted cServer to use the cNetwork API.Mattes D2015-01-271-3/+6
* cWorld: Fixed a type warning.Mattes D2015-01-181-1/+1
* Fix trailing whitespaceTycho2015-01-111-1/+1
* Initial convertion of a_Dt to std::chronoTycho2015-01-111-15/+13
* Refactored all player block placing to go through hooks.Mattes D2014-12-241-0/+5
* Merge branch 'master' into redstoneTiger Wang2014-12-131-7/+26
|\
| * Merge pull request #1657 from mc-server/PrepareChunkMattes D2014-12-111-0/+6
| |\
| | * Added a cWorld:PrepareChunk function.Mattes D2014-12-101-0/+6
| * | Merge pull request #1623 from p-mcgowan/issue_1253Mattes D2014-12-101-1/+1
| |\ \ | | |/ | |/|
| | * removed GetUsernames() from WorldVincent2014-11-301-3/+0
| | * fixed naming of strings and changed from i to IVincent2014-11-291-1/+2
| | * issue 1253 - prevent multiple logins with same usernameVincent2014-11-291-0/+2
| * | Merged branch 'origin/master' into c++11.Mattes D2014-12-041-1/+2
| |\ \
| | * | Improved comments for cWorld::DoWithPlayer().Mattes D2014-11-301-1/+2
| | |/
| | * cWorld: Rewritten spawn preparation.Mattes D2014-11-221-0/+2
| * | Merge remote-tracking branch 'origin-master' into c++11Tiger Wang2014-11-261-0/+2
| * | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-231-4/+14
| |\|
| | * Merge pull request #1598 from mc-server/SignEditorMattes D2014-11-181-4/+1
| | |\
| | | * Fixed a security problem with signs.Howaner2014-11-151-4/+1
| | * | Merge branch 'master' into ViewDistanceHowaner2014-11-141-0/+3
| | |\|
| | | * Fixed trailing whitespace.Mattes D2014-11-121-1/+1
| | | * renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDumpLukas Pioch2014-11-051-2/+2
| | | * Added FindAndDoWithUUIDLukas Pioch2014-11-021-0/+3
| | * | ... in this worldHowaner2014-10-301-1/+1
| | * | Added a MaxViewDistance option.Howaner2014-10-301-0/+10
| | |/
| * | Merged branch 'master' into c++11.Mattes D2014-10-241-3/+3
| |\|
| * | En masse NULL -> nullptr replaceTiger Wang2014-10-201-45/+45
| * | Migrated random generators to std::randomTiger Wang2014-10-191-1/+1
* | | Cleaned up simulatorsTiger Wang2014-10-251-4/+3
| |/ |/|
* | Merge branch 'master' into ChunkLoaderHowaner2014-10-231-183/+187
|\ \
| * | En masse NULL -> nullptr replaceTiger Wang2014-10-231-185/+189
* | | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-143/+139
|\| |
| * | Merged branch 'master' of git://github.com/sriehl/MCServerMattes D2014-10-211-144/+140
| |\ \ | | |/ | |/|
| | * convert old style casts to fix warningsSteven Riehl2014-10-121-144/+140
* | | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-12/+13
|\| |
| * | Functions in cPluginManager get references instead of pointers.Mattes D2014-10-151-1/+1
| * | Fixed style.Mattes D2014-10-131-1/+2
| * | Aligned simulatorsworktycho2014-10-121-5/+5
| * | Moved a few objects to unique_ptrtycho2014-10-101-9/+9
| |/
* / Stream 4 chunks per tick. Added priority.Howaner2014-10-061-2/+2
|/
* Merge branch 'master' into FixesHowaner2014-09-261-5/+6
|\
| * Merge branch 'master' into redstoneTestsTycho2014-09-251-27/+34
| |\
| * \ Merge branch 'master' into redstoneTestsTycho2014-09-171-1/+1
| |\ \
| * | | Added first test to show the object can be createdTycho2014-09-171-2/+2
| * | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-111-3/+4
* | | | Fixed players custom name in 1.8Howaner2014-09-261-1/+1
| |_|/ |/| |
* | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-191-0/+3
|\ \ \
| * | | Update World.hnesco2014-09-171-1/+1
| * | | Preparing 1.8 update nesco2014-09-161-0/+3
| | |/ | |/|
* | | Exported player list states to extra functions.Howaner2014-09-181-27/+31
* | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-1/+1
|\| |
| * | Spawn exp if you break a mob spawner.Howaner2014-09-121-1/+1
| |/
* | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-3/+3
|\|
| * TimeOfDay does not need to be an Int64Tycho2014-09-081-3/+3
* | 1.8: Added ParticleEffect packet.Howaner2014-09-111-1/+1
* | Added the player list to the 1.8 protocol.Howaner2014-09-091-1/+1
|/
* Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-051-7/+7
* Merge remote-tracking branch 'origin/master' into EntitiesInBoxmadmaxoft2014-09-041-4/+4
|\
| * fix chunk regeneratingLO1ZB2014-08-291-1/+1
| * remove y-coord from chunksLO1ZB2014-08-281-3/+3
* | Added cWorld::ForEachEntityInBox()madmaxoft2014-09-031-0/+5
|/
* CheckBasicStyle checks the src folder as well.madmaxoft2014-08-141-1/+1
* Renamed functions.Howaner2014-08-101-4/+4
* Renamed m_DoDaylightCycle to m_CycleDaylight.Howaner2014-08-081-4/+4
* Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.Howaner2014-08-071-1/+13
* Exported the beacon.Howaner2014-07-301-0/+5
* Merged branch 'howaner/Options'.madmaxoft2014-07-301-0/+7
|\
| * Add "Broadcasting" settings to world.iniHowaner2014-07-271-1/+7
* | Slight cleanup after portalsTiger Wang2014-07-291-2/+3
* | Merge branch 'master' into portalsTiger Wang2014-07-291-25/+25
|\|
| * Removed redundant semicolons and re-added warningarchshift2014-07-241-6/+6
| * Added a queue for setting chunk data.madmaxoft2014-07-241-18/+18
| * Export BroadcastEntityAnimation with ToLuaarchshift2014-07-221-1/+1
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-1/+1
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-5/+5
|\|
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-4/+4
| * Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
* | SuggestionsTiger Wang2014-07-211-0/+7
* | Bug and crash fixesTiger Wang2014-07-201-1/+1
* | Fix failed merge and other issuesTiger Wang2014-07-181-12/+0
* | Merge branch 'master' into portalsTiger Wang2014-07-181-29/+25
|\|
| * Normalized comments.madmaxoft2014-07-171-1/+1
| * Fixed spaces around single-line comments.madmaxoft2014-07-171-4/+4
| * Fixed basic whitespace problems.madmaxoft2014-07-171-7/+7
| * Made CreateProjectile a pointerworktycho2014-07-131-1/+1
| * Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-1/+1
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-13/+2
| |\
| | * Implemented trapped chests & othersTiger Wang2014-07-071-13/+2
| * | Implemented support for forced chunk ticking.madmaxoft2014-07-101-0/+7
| * | Fixed arrow collection animationTiger Wang2014-07-091-1/+0
| |/
| * Redstone simulator is alerted to lever unpoweringTiger Wang2014-07-021-1/+1
| * Added generic entity-collecting.Mattes D2014-06-271-0/+1
* | Merge branch 'master' into portalsTiger Wang2014-06-211-1/+2
|\|
| * Nullify deleted pointers.archshift2014-06-191-0/+1
| * Merge branch 'master' into GlobalFixesHowaner2014-06-171-8/+73
| |\
| * | Add DoWithBlockEntityAt() to WorldInterface.hHowaner2014-06-171-1/+1
* | | Fixed invalid iteratorsTiger Wang2014-06-211-3/+0
* | | Cauldrons check the heightmapTiger Wang2014-06-141-3/+3
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-141-6/+32
|\ \ \ | | |/ | |/|
| * | Removed an unused fwd declaration.madmaxoft2014-06-131-1/+0
| * | Fixed constnessworktycho2014-06-111-5/+5
| * | 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
| * | 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 branch 'master' into portalsTiger Wang2014-06-101-3/+27
|\| |
| * | Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-2/+19
| * | Added queue for adding entities to cWorld.Mattes D2014-06-081-1/+8
* | | Portal improvements and suggestionsTiger Wang2014-06-101-2/+11
* | | SuggestionsTiger Wang2014-06-051-1/+3
* | | Configurable portalsTiger Wang2014-06-041-0/+24
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-1/+15
|\| |
| * | Changed block send queue to use vectorsTiger Wang2014-05-291-4/+2
| * | Hopefully fixed piston duplication issuesTiger Wang2014-05-251-1/+17
| |/
* / Cauldrons fillTiger Wang2014-05-291-2/+2
|/
* Merge branch 'master' into fixesTiger Wang2014-05-061-1/+1
|\
| * Redstone simulator now directly accesses cChunkTiger Wang2014-04-271-1/+1
* | Merge branch 'master' into fixes.madmaxoft2014-05-021-1/+4
|\|
| * Moved the weather picker out of TickWeather(), squashing a warning and improving readability.archshift2014-04-261-1/+4
* | Merge branch 'master' into fixesTiger Wang2014-04-241-1/+1
|\|
| * Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-1/+1
* | Small changesTiger Wang2014-04-231-1/+3
|/
* Merge branch 'master' into overrideTycho2014-04-051-13/+13
|\
| * Fixed a few clang warnings.madmaxoft2014-03-301-3/+3
| * Minor fixesandrew2014-03-251-10/+10
| * Wither invulnerabilityandrew2014-03-241-1/+1
* | Added override specifier to functions declared in cWorldTycho2014-03-221-8/+8
|/
* ENUMified shrapnel levelTiger Wang2014-03-201-6/+4
* Merge branch 'master' into awesometntTiger Wang2014-03-181-39/+39
|\
| * Added override specifier where appropriate in cWorld.madmaxoft2014-03-161-37/+38
| * Merge pull request #782 from mc-server/bedsMattes D2014-03-161-4/+4
| |\
| | * Beds now work properly fixes #707Tiger Wang2014-03-091-4/+4
| * | Unified Vector classesandrew2014-03-111-2/+1
* | | Added levels of shrapnelTiger Wang2014-03-181-4/+8
* | | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-101-2/+2
|\| |
| * | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-1/+1
| |\ \
| | * | Merge branch 'master' into BlockEntitysHowaner2014-03-081-1/+1
| | |\|
| | * | Change TNT Fuse to ticksHowaner2014-03-081-1/+1
| * | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-5/+20
| |\ \ \ | | | |/ | | |/|
| * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-1/+1
* | | | Merge branch 'master' into awesometntTiger Wang2014-03-101-5/+20
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-071-4/+9
| |\ \ \ | | | |/ | | |/|
| | * | Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-071-2/+2
| | * | Add Flower PotsHowaner2014-03-071-2/+7
| * | | Add SendBlockTo to cWorldInterfaceHowaner2014-03-051-1/+1
| |/ /
| * | Fixed previous weather changes.madmaxoft2014-03-031-1/+2
| * | Add cancelling to WeatherChanging event.Howaner2014-03-021-0/+3
| * | More documentation (thanks to madmaxoft) and use GetBlockTypeMetaHowaner2014-03-021-2/+2
| * | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-021-0/+6
| |/
* / Shrapnel now configurableTiger Wang2014-03-101-0/+6
|/
* Maps: Improvementsandrew2014-02-231-3/+6
* Thread safe cMap managerandrew2014-02-201-2/+3
* Manual merge (Fixed conflicts)andrew2014-02-201-32/+56
|\
| * Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+5
| |\
| | * Rename SkullEntity to MobHeadEntityHowaner2014-02-191-4/+4
| | * Add Heads completelyHowaner2014-02-181-0/+5
| * | The cuboid for cWorld::SetAreaBiome() doesn't need sorting.madmaxoft2014-02-181-1/+2
| * | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-181-1/+19
| * | Added a bit more documentation to cForEachChunkProvider.madmaxoft2014-02-181-4/+7
| |/
| * Removed the unnecessary LoopPlayersAndBroadcastChat() functions.madmaxoft2014-02-151-9/+7
| * Implemented cCompositeChat.madmaxoft2014-02-151-1/+3
| * Merge pull request #677 from mc-server/BroadcastParticleEffectAlexander Harkness2014-02-151-1/+1
| |\
| | * Exported cWorld::BroadcastParticleEffect.STRWarrior2014-02-151-1/+1
| * | Merged branch 'narroo/master'.madmaxoft2014-02-131-1/+14
| |\ \ | | |/ | |/|
| | * Fixed formatting. Moved UnloadUnusedChunks from public to private.narroo2014-02-111-4/+3
| | * Fixed formatting of previous commit.narroo2014-02-111-2/+2
| | * Fixed bug #385. UnloadUnusedChunks now has the same interface asnarroo2014-02-111-1/+15
* | | Send map when selectedandrew2014-02-141-0/+6
* | | IDCount Serializationandrew2014-02-131-0/+11
|/ /
* | More gcc warnings fixed.madmaxoft2014-02-111-1/+2
* | Merge remote-tracking branch 'origin/master' into ChunkStaymadmaxoft2014-02-091-3/+20
|\|
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-0/+3
| |\
| * \ Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-2/+2
| |\ \
| * | | Improved chat messaging functionsTiger Wang2014-02-071-10/+17
| * | | Added more chat functionsTiger Wang2014-02-061-1/+11
* | | | Initial ChunkStay code.madmaxoft2014-02-081-3/+0
| |_|/ |/| |
* | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).STRWarrior2014-02-071-4/+4
* | | Implemented an easy way of adding new redstone simulators.STRWarrior2014-02-071-3/+6
| |/ |/|
* | Merge pull request #635 from tonibm19/masterMattes D2014-02-041-1/+1
|\ \
| * | Not exporting FindClosestPlayertonibm192014-02-031-1/+1
| * | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua APItonibm192014-02-031-1/+1
| |/
* / Increased Type safety of BiomesTycho2014-02-031-1/+1
|/
* Changed pointers to referencesTycho2014-02-011-2/+2
* Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-011-0/+3
|\
| * The world can now be configured wether farmers should be able to harvest crops.STRWarrior2014-01-271-0/+3
* | Changed signitures of Several BLockHandler MethodsTycho2014-02-011-1/+1
* | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-1/+11
|\|
| * Merge pull request #575 from worktycho/GeneratingBenchmarkMattes D2014-01-251-3/+4
| |\
| * | Mob bugfixesTiger Wang2014-01-251-1/+1
| * | Command block fixes 2andrew2014-01-231-0/+9
* | | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-28/+28
* | | First attempt at Implementing InterfacesTycho2014-01-251-4/+5
| |/ |/|
* | Merge branch 'master' into GeneratingBenchmarkTycho2014-01-221-3/+12
|\|
| * Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-130/+146
| |\
| * | Scoreboard protocol supportandrew2014-01-211-1/+4
| * | Basic scoreboard implementationandrew2014-01-191-0/+6
* | | Actually implemented interfacesTycho2014-01-201-0/+1
* | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmarkTycho2014-01-201-6/+6
|\ \ \ | |_|/ |/| |
| * | Seperated BlockArea From WorldTycho2014-01-201-3/+3
* | | Changed the cWorld::ScheduleTask() signature.madmaxoft2014-01-191-130/+146
| |/ |/|
* | Command blocks: Execute()andrew2014-01-181-1/+1
* | Basic command block implementationandrew2014-01-181-6/+10
|/
* Added user setting compression factorTycho2014-01-171-0/+2
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-0/+3
|\
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-1/+1
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-1/+1
| * Added cWorld::SpawnMinecart.STRWarrior2014-01-121-0/+3
* | added cWorld::ScheduleTask FunctionTycho2014-01-141-0/+24
|/
* Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-101-0/+24
* Exported cWorld::BroadcastBlockAction().madmaxoft2014-01-061-1/+1
* fixed warnings in World.cppTycho Bickerstaff2013-12-311-0/+1
* Replaced esCreeper with esMonster.madmaxoft2013-12-231-1/+1
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+1
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-1/+1
* Removed some old cRedstone remnantsTiger Wang2013-12-161-5/+0
* This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-151-0/+2
* Implemented note block playing and fixed wireTiger Wang2013-12-141-0/+5
* Redstone data is now loaded on chunk loadTiger Wang2013-12-131-0/+1
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-0/+3
|\
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-071-0/+3
* | Renamed animation functionTiger Wang2013-12-071-1/+1
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-061-1/+1
|/
* Lava can spawn fire.madmaxoft2013-12-041-0/+3
* Added the real tick duration to the OnWorldTick hook.madmaxoft2013-11-301-1/+1
* Merged master into redstonefixesTiger Wang2013-11-271-1/+5
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+3
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-2/+8
* Moved source to srcAlexander Harkness2013-11-241-0/+744