summaryrefslogtreecommitdiffstats
path: root/src/World.cpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Changed back capitalization.Mattes D2014-11-241-3/+3
* cWorld: Rewritten spawn preparation.Mattes D2014-11-221-120/+111
* Merge pull request #1598 from mc-server/SignEditorMattes D2014-11-181-9/+3
|\
| * Fixed a security problem with signs.Howaner2014-11-151-9/+3
* | Merge branch 'master' into ViewDistanceHowaner2014-11-141-0/+17
|\|
| * Merge branch 'master' of https://github.com/mc-server/MCServerMattes D2014-11-061-1/+1
| |\
| * | renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDumpLukas Pioch2014-11-051-2/+3
| * | Simplified FindAndDoWithUUID, formatted lineLukas Pioch2014-11-021-7/+1
| * | Added FindAndDoWithUUIDLukas Pioch2014-11-021-0/+22
| |/
* / Added a MaxViewDistance option.Howaner2014-10-301-0/+3
|/
* Merge pull request #1565 from mc-server/MergedIniFileMattes D2014-10-241-1/+1
|\
| * Merged IniFile into main MCS sources.Mattes D2014-10-231-1/+1
* | Merge branch 'master' into ChunkLoaderHowaner2014-10-231-35/+35
|\|
| * En masse NULL -> nullptr replaceTiger Wang2014-10-231-35/+35
* | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-33/+40
|\|
| * Functions in cPluginManager get references instead of pointers.Mattes D2014-10-151-5/+5
| * cWorld: Fixed scheduler.Mattes D2014-10-131-9/+18
| * Fixed style.Mattes D2014-10-131-2/+4
| * Fix styleworktycho2014-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-101-29/+24
* | Stream 4 chunks per tick. Added priority.Howaner2014-10-061-4/+4
* | Optimized chunk loaderHowaner2014-10-021-1/+0
|/
* Fixed iron trapdoorsHowaner2014-09-301-2/+2
* World: Fixed chunk generation by plugins.madmaxoft2014-09-291-1/+1
* Merge branch 'master' into FixesHowaner2014-09-261-6/+6
|\
| * Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-261-6/+6
| |\
| | * Merge branch 'master' into redstoneTestsTycho2014-09-251-7/+83
| | |\
| | * \ Merge branch 'master' into redstoneTestsTycho2014-09-171-1/+1
| | |\ \
| | * | | Added first test to show the object can be createdTycho2014-09-171-3/+3
| | * | | IncrementalRedstoneSimulator now has no dependencies on cChunkTycho2014-09-161-1/+1
| | * | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-111-3/+3
* | | | | Fixed players custom name in 1.8Howaner2014-09-261-2/+2
|/ / / /
* | | / Improved searching for spawn.madmaxoft2014-09-261-3/+14
| |_|/ |/| |
* | | Merge branch 'master' into EntityCustomNameHowaner2014-09-231-45/+139
|\ \ \
| * | | Exported player list states to extra functions.Howaner2014-09-181-3/+75
| * | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fixed farmland issues.Howaner2014-09-121-1/+1
| | |/
| * | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-12/+24
| |\|
| | * 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-081-1/+1
| | * Fixed a few compile warningsTycho2014-09-081-9/+14
| * | 1.8: Added ParticleEffect packet.Howaner2014-09-111-2/+2
| * | Added the player list to the 1.8 protocol.Howaner2014-09-091-3/+3
| |/
| * Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-051-18/+20
| * Merge remote-tracking branch 'origin/master' into EntitiesInBoxmadmaxoft2014-09-041-11/+10
| |\
| | * Merge pull request #1351 from LO1ZB/remove-a_RelYMattes D2014-09-031-11/+10
| | |\
| | | * hopefully the last commit for removing y-coord from chunks. :)LO1ZB2014-09-031-11/+2
| | | * me being stupidLO1ZB2014-08-291-1/+1
| | | * add commentsLO1ZB2014-08-291-1/+2
| | | * fix chunk regeneratingLO1ZB2014-08-291-0/+8
| | | * remove y-coord from chunksLO1ZB2014-08-281-11/+10
| * | | Added cWorld::ForEachEntityInBox()madmaxoft2014-09-031-0/+9
| |/ /
* / / Added SetCustomName() to players.Howaner2014-09-021-5/+9
|/ /
* | Merge branch 'master' into fixesmadmaxoft2014-08-301-2/+4
|\ \
| * | Rewritten block entity loading.Mattes D2014-08-291-2/+4
| |/
* | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-291-19/+57
|\|
| * World: Report chunk count for the spawn area.Mattes D2014-08-221-1/+1
| * Added cWorld initializers.Mattes D2014-08-211-0/+30
| * Code formatting fixes.Howaner2014-08-191-0/+1
| * CheckBasicStyle checks the src folder as well.madmaxoft2014-08-141-1/+1
| * Exported daylight cycle flag to the protocol.Howaner2014-08-111-8/+1
| * Added a comment and simplified code.Howaner2014-08-101-5/+2
| * Added IsDaylightCycleEnabled saving.Howaner2014-08-101-0/+2
| * Renamed functions.Howaner2014-08-101-3/+3
| * Renamed m_DoDaylightCycle to m_CycleDaylight.Howaner2014-08-081-3/+3
| * Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.Howaner2014-08-071-17/+32
* | Improved explosion damageTiger Wang2014-08-291-3/+6
|/
* Fixed issues with autocomplete and time loadingTiger Wang2014-08-011-7/+33
* Merge pull request #1269 from Howaner/BlockEntitysMattes D2014-08-011-0/+10
|\
| * Exported the beacon.Howaner2014-07-301-0/+10
* | Capitalised "incremental"Howaner2014-07-311-4/+4
* | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.Howaner2014-07-311-2/+2
|/
* Merged branch 'howaner/Options'.madmaxoft2014-07-301-0/+3
|\
| * Add "Broadcasting" settings to world.iniHowaner2014-07-271-0/+3
* | Slight cleanup after portalsTiger Wang2014-07-291-2/+4
* | Merge branch 'master' into portalsTiger Wang2014-07-291-32/+63
|\|
| * Added a queue for setting chunk data.madmaxoft2014-07-241-32/+53
| * Made the cWorld::SpawnMobFinalize function more readable.STRWarrior2014-07-241-0/+10
* | SuggestionsTiger Wang2014-07-231-6/+3
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-11/+6
* | Suggestion and failed merge fixTiger Wang2014-07-221-0/+5
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-9/+4
|\|
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-1/+1
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-3/+3
| * Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
| * World.cpp: fixed not all enum fields being used in m_Dimension switcharchshift2014-07-191-1/+2
* | SuggestionsTiger Wang2014-07-211-56/+79
* | Bug and crash fixesTiger Wang2014-07-201-8/+16
* | Fix failed merge and other issuesTiger Wang2014-07-181-10/+6
* | Merge branch 'master' into portalsTiger Wang2014-07-181-48/+65
|\|
| * Normalized comments.madmaxoft2014-07-171-10/+10
| * Fixed spaces around single-line comments.madmaxoft2014-07-171-17/+15
| * Fixed basic whitespace problems.madmaxoft2014-07-171-5/+5
| * Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-161-1/+1
| |\
| | * Player properties are now retrievedTiger Wang2014-07-141-1/+1
| * | Fixed FindClosestPlayerTycho2014-07-151-3/+6
| * | Made CreateProjectile a pointerworktycho2014-07-131-1/+1
| * | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-3/+3
| |/
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-4/+13
| |\
| | * Implemented trapped chests & othersTiger Wang2014-07-071-4/+13
| * | Implemented support for forced chunk ticking.madmaxoft2014-07-101-0/+9
| * | Fixed arrow collection animationTiger Wang2014-07-091-9/+0
| |/
| * Removed world-saving log messages.madmaxoft2014-07-041-2/+0
| * Added generic entity-collecting.Mattes D2014-06-271-1/+10
* | Merge branch 'master' into portalsTiger Wang2014-06-211-6/+9
|\|
| * Nullify deleted pointers.archshift2014-06-191-6/+9
* | Fixed invalid iteratorsTiger Wang2014-06-211-10/+4
* | Fixed order of initalisationTycho2014-06-121-3/+4
* | Portals animate and delay correctlyTiger Wang2014-06-121-3/+6
* | Merge branch 'master' into portalsTiger Wang2014-06-101-30/+106
|\|
| * Fixed a race condition when adding a player to a world.madmaxoft2014-06-101-4/+1
| * Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-29/+82
| * Added queue for adding entities to cWorld.Mattes D2014-06-081-1/+27
* | Portal improvements and suggestionsTiger Wang2014-06-101-5/+13
* | Fixed Time of dayworktycho2014-06-071-1/+1
* | SuggestionsTiger Wang2014-06-051-9/+2
* | Time and weather is saved, part of #1058Tiger Wang2014-06-041-0/+12
* | Configurable portalsTiger Wang2014-06-041-0/+26
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-2/+45
|\|
| * Changed block send queue to use vectorsTiger Wang2014-05-291-11/+10
| * Hopefully fixed piston duplication issuesTiger Wang2014-05-251-2/+46
* | Implemented end and nether portalsTiger Wang2014-05-311-0/+31
|/
* World pre-generation distance is settable in world.ini.Mattes D2014-05-091-2/+6
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-091-4/+3
* Moved the weather picker out of TickWeather(), squashing a warning and improving readability.archshift2014-04-261-24/+26
* Removed impossible default case.archshift2014-04-261-6/+0
* Removed extraneous switch{} in Start()archshift2014-04-261-15/+0
* Small changes; warning fixing.archshift2014-04-251-6/+3
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-5/+5
|\
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-181-5/+4
| |\
| * | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-5/+5
* | | Fixed #904Tiger Wang2014-04-181-0/+5
| |/ |/|
* | Rewrote redstone powering to use power levelsTiger Wang2014-04-151-1/+1
* | Simplified pickup speed randomisationTiger Wang2014-04-121-4/+3
|/
* Fixed double projectile spawning.madmaxoft2014-04-051-1/+0
* Removed unused constants.madmaxoft2014-03-251-3/+0
* Fixed code style after recent merge.madmaxoft2014-03-201-30/+28
* Added bracesTiger Wang2014-03-201-0/+2
* ENUMified shrapnel levelTiger Wang2014-03-201-3/+3
* Merge branch 'master' into awesometntTiger Wang2014-03-181-6/+5
|\
| * Merge branch 'master' into warningsTycho2014-03-141-3/+3
| |\
| | * Fixed a warning.madmaxoft2014-03-141-3/+3
| * | Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-121-2/+2
| * | Merge branch 'Werror' into warningsTycho2014-03-121-1/+0
| |\|
| | * Unified Vector classesandrew2014-03-111-1/+0
| * | Fixed more Format issuesTycho2014-03-111-2/+2
| |/
* | Added levels of shrapnelTiger Wang2014-03-181-1/+3
* | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-101-11/+11
|\|
| * Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-2/+2
| |\
| | * Merge branch 'master' into BlockEntitysHowaner2014-03-081-8/+18
| | |\
| | * | Change TNT Fuse to ticksHowaner2014-03-081-2/+2
| * | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-27/+112
| |\ \ \ | | | |/ | | |/|
| * | | Improved formatting of username tabcompleteTiger Wang2014-03-091-7/+7
| * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-2/+2
* | | | Merge branch 'master' into awesometntTiger Wang2014-03-101-27/+112
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-071-2/+11
| |\ \ \ | | | |/ | | |/|
| | * | Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-071-2/+2
| | * | Add Flower PotsHowaner2014-03-071-0/+9
| * | | Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-061-8/+18
| |\ \ \ | | |/ / | |/| |
| | * | Implemented vanilla-like fluid simulatorandrew2014-03-051-8/+18
| * | | Fixed an assert in map-loading.madmaxoft2014-03-041-3/+1
| * | | Fixed previous weather changes.madmaxoft2014-03-031-3/+3
| * | | Merge pull request #746 from Howaner/SlabsMattes D2014-03-031-13/+81
| |\ \ \ | | |/ / | |/| |
| | * | Add cancelling to WeatherChanging event.Howaner2014-03-021-13/+40
| | * | More documentation (thanks to madmaxoft) and use GetBlockTypeMetaHowaner2014-03-021-4/+8
| | * | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-021-0/+37
| | |/
| * / cBlockInfo now manages the respective cBlockHandlerandrew2014-03-021-1/+1
| |/
* | Shrapnel now configurableTiger Wang2014-03-101-2/+1
* | Added extra awesomeness to TNTTiger Wang2014-03-051-1/+5
|/
* Merge pull request #669 from xdot/masterTiger Wang2014-02-241-0/+8
|\
| * Maps: Improvementsandrew2014-02-231-3/+3
| * Thread safe cMap managerandrew2014-02-201-1/+2
| * Manual merge (Fixed conflicts)andrew2014-02-201-95/+85
| |\
| * | Map item handler; Fixed several bugsandrew2014-02-171-8/+20
| * | Send map when selectedandrew2014-02-141-2/+43
| * | IDCount Serializationandrew2014-02-131-0/+54
* | | Merge pull request #700 from Howaner/GlobalFixesMattes D2014-02-201-4/+6
|\ \ \ | |_|/ |/| |
| * | Add BlockNewLeaves.h and rename Darkoac to DarkoakHowaner2014-02-191-6/+6
| * | Add new Trees (without Generator)Howaner2014-02-191-0/+2
* | | Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+9
|\ \ \ | |/ / |/| |
| * | Rename SkullEntity to MobHeadEntityHowaner2014-02-191-2/+2
| * | Add Heads completelyHowaner2014-02-181-0/+9
* | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting.madmaxoft2014-02-181-1/+5
* | | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-181-0/+37
|/ /
* | Removed the unnecessary LoopPlayersAndBroadcastChat() functions.madmaxoft2014-02-151-1/+1
* | Implemented cCompositeChat.madmaxoft2014-02-151-1/+19
* | Merged branch 'narroo/master'.madmaxoft2014-02-131-0/+22
|\ \ | |/ |/|
| * Fixed formatting. Moved UnloadUnusedChunks from public to private.narroo2014-02-111-0/+7
| * Fixed formatting of previous commit.narroo2014-02-111-0/+5
| * Fixed bug #385. UnloadUnusedChunks now has the same interface asnarroo2014-02-111-0/+10
* | More gcc warnings fixed.madmaxoft2014-02-111-3/+3
* | Merge remote-tracking branch 'origin/master' into ChunkStaymadmaxoft2014-02-091-6/+9
|\|
| * Fixed compile and some warnings in MSVSTiger Wang2014-02-091-2/+0
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-4/+36
| |\
| * \ Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-3/+3
| |\ \
| * | | Moved Gamemode setting into General root tagTiger Wang2014-02-071-1/+1
| * | | Added sender name to PM if prefixes disabledTiger Wang2014-02-071-1/+1
| * | | Improved chat messaging functionsTiger Wang2014-02-071-4/+7
* | | | Initial ChunkStay code.madmaxoft2014-02-081-12/+0
| |_|/ |/| |
* | | Fixed comment.STRWarrior2014-02-081-1/+1
* | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).STRWarrior2014-02-071-12/+8
* | | Implemented an easy way of adding new redstone simulators.STRWarrior2014-02-071-3/+37
* | | Merge pull request #646 from worktycho/warningfixesAlexander Harkness2014-02-051-2/+2
|\ \ \ | |_|/ |/| |
| * | Fixed most of the reordering warningsTycho2014-02-051-2/+2
* | | Merge pull request #635 from tonibm19/masterMattes D2014-02-041-1/+1
|\ \ \ | |/ / |/| |
| * | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua APItonibm192014-02-031-1/+1
| |/
* / Increased Type safety of BiomesTycho2014-02-031-2/+2
|/
* Merge pull request #602 from mc-server/improvementsandfixesMattes D2014-02-031-3/+3
|\
| * Added IsBlockWaterOrIce()Tiger Wang2014-02-021-1/+1
| * Revert "Added LOGREPLACELINE for line replacement"Tiger Wang2014-02-021-5/+5
| * Revert "Improved code"Tiger Wang2014-02-021-2/+0
| * Possibly fixed #618Tiger Wang2014-02-021-2/+2
| * Added checks for ice into IsBlockWater()Tiger Wang2014-02-011-1/+1
| * Improved codeTiger Wang2014-01-311-0/+2
| * Added LOGREPLACELINE for line replacementTiger Wang2014-01-291-5/+5
* | Changed pointers to referencesTycho2014-02-011-4/+3
* | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-011-2/+2
|\ \
| * | Attempt at implementing #563tonibm192014-01-301-2/+1
| |/
| * The world can now be configured wether farmers should be able to harvest crops.STRWarrior2014-01-271-0/+1
* | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-3/+37
|\|
| * Did what xoft recommendedTiger Wang2014-01-251-1/+1
| * Mob bugfixesTiger Wang2014-01-251-2/+11
| * Command block fixes 2andrew2014-01-231-1/+26
* | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-88/+5
|/
* cWorld now saves/loads the scoreboardandrew2014-01-221-0/+9
* Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-15/+21
|\
| * Changed the cWorld::ScheduleTask() signature.madmaxoft2014-01-191-11/+21
| * Merge pull request #551 from worktycho/schedularMattes D2014-01-191-6/+2
| |\
| | * Fixed iterators bugTycho2014-01-181-2/+1
| | * switched to using m_WorldAge rather than m_TickIDTycho2014-01-181-6/+3
| | * Increased tick count to longTycho2014-01-171-2/+2
| | * Implemented xsofts suggestion for a saturating counter in the schedulerTycho2014-01-171-5/+5
* | | Scoreboard protocol supportandrew2014-01-211-1/+56
|/ /
* | Merge pull request #559 from mc-server/SpawnMobParticlesMattes D2014-01-191-3/+0
|\ \
| * | Removed the particles when a mob spawns.STRWarrior2014-01-181-3/+0
* | | Basic command block implementationandrew2014-01-181-0/+9
|/ /
* / Added user setting compression factorTycho2014-01-171-1/+3
|/
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-0/+24
|\
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-2/+2
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-3/+3
| * Added cWorld::SpawnMinecart.STRWarrior2014-01-121-0/+24
* | added cWorld::ScheduleTask FunctionTycho2014-01-141-0/+39
|/
* Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-101-1/+77
* rewrote queue not to use promises for waitsTycho Bickerstaff2014-01-021-1/+4
* fixed warnings in World.cppTycho Bickerstaff2013-12-311-1/+3
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+9
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-6/+6
* Removed some old cRedstone remnantsTiger Wang2013-12-161-24/+0
* This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-151-0/+18
* Implemented note block playing and fixed wireTiger Wang2013-12-141-0/+9
* Improved pickups spawning speed againTiger Wang2013-12-101-4/+4
* Merge pull request #408 from mc-server/SpawnPoint_FixMattes D2013-12-081-1/+1
|\
| * Now spawn points will not be in deep oceans or rivers etc.STRWarrior2013-12-081-1/+1
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-2/+13
|\|
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-2/+1
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-071-0/+12
* | Bonemeal has particles, fixes #393Tiger Wang2013-12-081-0/+6
* | Renamed animation functionTiger Wang2013-12-071-2/+2
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-061-2/+2
* | Added pickup invalid item checkTiger Wang2013-12-061-0/+11
|/
* Lava can spawn fire.madmaxoft2013-12-041-0/+1
* Changed cBlockHandler->OnUpdate() to use cChunk directly.madmaxoft2013-11-301-2/+2
* Explicitly set spawnpoint fixes.madmaxoft2013-11-301-20/+11
* Added the real tick duration to the OnWorldTick hook.madmaxoft2013-11-301-9/+10
* Made TNT pickups spawning chance 25%Tiger Wang2013-11-271-1/+1
* Merged master into redstonefixesTiger Wang2013-11-271-11/+73
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+12
* Fixed another one.Alexander Harkness2013-11-261-1/+1
* Attempt to fix compilationTiger Wang2013-11-241-1/+1
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+18
* Moved source to srcAlexander Harkness2013-11-241-0/+2715