[ember] 04/08: Merge tag 'upstream/0.7.1+dfsg'

Olek Wojnar olek-guest at moszumanska.debian.org
Mon Aug 15 02:00:23 UTC 2016


This is an automated email from the git hooks/post-receive script.

olek-guest pushed a commit to branch master
in repository ember.

commit 35aa19347ba2cda165a41e08c8312811cd5d6d25
Merge: 05b0cf7 32dac30
Author: Olek Wojnar <olek-dev at wojnar.org>
Date:   Sat Jul 16 23:25:24 2016 -0400

    Merge tag 'upstream/0.7.1+dfsg'
    
    Upstream version 0.7.1+dfsg

 AUTHORS                                            |    8 +-
 ChangeLog                                          | 3675 ++++++++++++++++-
 Ember-Info.plist                                   |   20 -
 Ember.xcodeproj/project.pbxproj                    | 4332 --------------------
 INSTALL                                            |   28 +-
 Makefile.am                                        |   12 +-
 Makefile.in                                        |   60 +-
 NEWS                                               |    4 +
 README                                             |  106 -
 README.md                                          |   32 +
 TODO                                               |   41 -
 acinclude.m4                                       |  208 +-
 aclocal.m4                                         |   70 +-
 autogen.sh                                         |   61 +-
 autopackage/default.apspec.in                      |   61 -
 configure                                          | 2107 +++++-----
 configure.ac                                       |   62 +-
 ember                                              |    9 +-
 ember-media.spec.in                                |   40 -
 ember.conf                                         |    3 +
 ember.conf => ember.conf.in                        |    7 +-
 ember.dox.in                                       |  420 +-
 ember.in                                           |    7 +-
 ember.spec.in                                      |   50 -
 m4/ax_cxx_compile_stdcxx_11.m4                     |  107 +
 media/Makefile.am                                  |    1 -
 media/Makefile.in                                  |  629 ---
 media/README                                       |    1 -
 ember.png => media/ember.png                       |  Bin
 media/packs/Makefile.am                            |    3 -
 media/packs/Makefile.in                            |  431 --
 .../generate-ChangeLog.sh                          |    4 +-
 src/Makefile.in                                    |   20 +-
 src/bindings/Makefile.in                           |   20 +-
 src/bindings/lua/ConnectorDefinitions.cxx          |  326 +-
 src/bindings/lua/ConnectorDefinitions.pkg          |   71 +-
 src/bindings/lua/Makefile.am                       |    2 +-
 src/bindings/lua/Makefile.in                       |  101 +-
 src/bindings/lua/TypeResolving.cpp                 |    4 +-
 src/components/Makefile.in                         |   20 +-
 src/components/cegui/CEGUIGUILayout_xmlHandler.cpp |  457 +++
 src/components/cegui/CEGUIGUILayout_xmlHandler.h   |  199 +
 src/components/{ogre/gui => cegui}/CEGUILogger.cpp |    7 +-
 src/components/{ogre/gui => cegui}/CEGUILogger.h   |    6 +-
 .../gui => cegui}/ColouredRenderedStringParser.cpp |    5 +-
 .../gui => cegui}/ColouredRenderedStringParser.h   |    5 +-
 src/components/cegui/LayoutLoader.cpp              |   74 +
 src/components/cegui/LayoutLoader.h                |   53 +
 src/components/cegui/Makefile.am                   |    9 +-
 src/components/cegui/Makefile.in                   |  409 +-
 .../RenderedColourStringTextComponent.cpp          |    5 +-
 .../RenderedColourStringTextComponent.h            |    5 +-
 src/components/cegui/bindings/Makefile.am          |    1 +
 src/{ => components/cegui}/bindings/Makefile.in    |   22 +-
 src/components/cegui/bindings/lua/Cegui.cxx        |   83 +
 src/components/cegui/bindings/lua/Cegui.pkg        |   20 +
 src/components/cegui/bindings/lua/Helper.h         |   53 +
 .../cegui}/bindings/lua/Makefile.am                |   14 +-
 .../cegui/bindings/lua}/Makefile.in                |  107 +-
 .../cegui/datafiles/looknfeel/EmberLook.looknfeel  |   20 +-
 .../cegui/datafiles/schemes/EmberLookSkin.scheme   |    2 +-
 .../datafiles/schemes/EmberLookSkinMinimal.scheme  |    2 +-
 .../entitymapping/Cases/AttributeCase.cpp          |    2 +-
 src/components/entitymapping/Cases/AttributeCase.h |    2 +-
 .../AttributeComparers/HeightComparerWrapper.h     |    2 +-
 .../AttributeComparers/NumericComparerWrapper.h    |    2 +-
 .../AttributeComparers/NumericRangeComparer.h      |    4 +-
 .../AttributeComparers/StringComparerWrapper.h     |    2 +-
 src/components/entitymapping/ChangeContext.cpp     |    8 +-
 .../entitymapping/Definitions/DefinitionBase.h     |    6 +-
 .../entitymapping/EntityMappingCreator.cpp         |   71 +-
 .../entitymapping/EntityMappingManager.cpp         |   15 +-
 .../entitymapping/EntityMappingManager.h           |    4 +-
 src/components/entitymapping/Makefile.am           |    2 +-
 src/components/entitymapping/Makefile.in           |  621 +--
 .../entitymapping/Matches/AbstractMatch.h          |   20 +-
 .../Matches/AttributeDependentMatch.cpp            |    4 +-
 .../Matches/AttributeDependentMatch.h              |    2 +-
 .../entitymapping/Matches/AttributeMatch.cpp       |    4 +-
 .../entitymapping/Matches/EntityTypeMatch.cpp      |    4 +-
 .../entitymapping/Matches/OutfitMatch.cpp          |   12 +-
 src/components/entitymapping/Matches/OutfitMatch.h |    2 +-
 src/components/lua/LuaHelper.cpp                   |    6 +-
 src/components/lua/LuaScriptingProvider.cpp        |   15 +-
 src/components/lua/LuaScriptingProvider.h          |    2 +-
 src/components/lua/Makefile.am                     |    2 +-
 src/components/lua/Makefile.in                     |   77 +-
 src/components/lua/bindings/Makefile.in            |   20 +-
 src/components/lua/bindings/lua/Lua.cxx            |    2 +-
 src/components/lua/bindings/lua/Makefile.am        |    2 +-
 src/components/lua/bindings/lua/Makefile.in        |   77 +-
 src/components/ogre/AutoGraphicsLevelManager.cpp   |    1 +
 src/components/ogre/Avatar.cpp                     |   15 +-
 src/components/ogre/Avatar.h                       |   24 +-
 src/components/ogre/AvatarCameraWarper.cpp         |   91 +
 src/components/ogre/AvatarCameraWarper.h           |  125 +
 src/components/ogre/AvatarLogger.cpp               |    6 +-
 src/components/ogre/AvatarLogger.h                 |    4 +-
 src/components/ogre/Convert.h                      |    6 +-
 src/components/ogre/EmberEntity.cpp                |   23 +-
 src/components/ogre/EmberEntity.h                  |    4 +-
 src/components/ogre/EmberEntityFactory.cpp         |   33 +-
 src/components/ogre/EmberEntityFactory.h           |   13 -
 src/components/ogre/EmberEntityModelAction.cpp     |    1 +
 src/components/ogre/EmberEntityPartAction.h        |    5 -
 src/components/ogre/EmberEntityUserObject.h        |    8 +-
 src/components/ogre/EmberOgre.cpp                  |   11 +-
 src/components/ogre/EmberOgre.h                    |   41 +-
 src/components/ogre/EntityWorldPickListener.cpp    |   65 +-
 src/components/ogre/EntityWorldPickListener.h      |   33 +-
 src/components/ogre/GUICEGUIAdapter.cpp            |    2 +-
 src/components/ogre/GUICEGUIAdapter.h              |    5 +-
 src/components/ogre/GUIManager.cpp                 |   29 +-
 src/components/ogre/GUIManager.h                   |   16 +-
 src/components/ogre/IWorldPickListener.h           |   12 +
 src/components/ogre/Makefile.am                    |   22 +-
 src/components/ogre/Makefile.in                    | 4127 +++++++++----------
 src/components/ogre/MotionManager.h                |    4 +-
 src/components/ogre/MovementController.cpp         |   13 +-
 src/components/ogre/MovementController.h           |    5 +-
 src/components/ogre/OgreConfigurator.cpp           |   21 +-
 src/components/ogre/OgreResourceLoader.cpp         |    8 +-
 src/components/ogre/OgreResourceProvider.cpp       |    2 +-
 src/components/ogre/OgreResourceProvider.h         |    4 +-
 src/components/ogre/OgreSetup.cpp                  |   11 +-
 src/components/ogre/OgreWindowProvider.cpp         |    2 +-
 .../EmberPagingSceneManager/Makefile.in            |   20 +-
 .../include/EmberPagingSceneManagerAdapter.h       |    4 +-
 .../EmberPagingSceneManager/include/Makefile.in    |   20 +-
 .../include/OgrePagingLandScapeQueue.h             |    2 +-
 .../src/EmberPagingLandScapeTexture.cpp            |    2 +-
 .../EmberPagingSceneManager/src/Makefile.am        |    2 +-
 .../EmberPagingSceneManager/src/Makefile.in        |   77 +-
 .../src/OgrePagingLandScapeData2D.cpp              |    2 +-
 .../src/OgrePagingLandScapeOctreeISQuery.cpp       |    2 +-
 src/components/ogre/SceneManagers/Makefile.in      |   20 +-
 src/components/ogre/Screen.cpp                     |   22 +-
 src/components/ogre/Screen.h                       |   14 +
 src/components/ogre/ShadowCameraSetup.cpp          |    2 -
 src/components/ogre/World.cpp                      |   14 +-
 src/components/ogre/World.h                        |   12 +-
 src/components/ogre/authoring/AuthoringHandler.cpp |   10 +-
 src/components/ogre/authoring/AuthoringHandler.h   |   12 +-
 src/components/ogre/authoring/AuthoringManager.cpp |    1 -
 src/components/ogre/authoring/AuthoringManager.h   |    9 +-
 .../ogre/authoring/AuthoringVisualization.cpp      |    2 +-
 src/components/ogre/authoring/EntityMaker.cpp      |   50 +-
 src/components/ogre/authoring/EntityMaker.h        |    9 +-
 src/components/ogre/authoring/EntityMoverBase.cpp  |    6 +-
 src/components/ogre/authoring/EntityMoverBase.h    |    2 +-
 src/components/ogre/authoring/EntityRecipe.cpp     |    2 +-
 src/components/ogre/authoring/EntityRecipe.h       |    5 +-
 .../ogre/authoring/IPolygonPositionProvider.h      |    5 +
 src/components/ogre/authoring/Makefile.in          |   20 +-
 src/components/ogre/authoring/MovementAdapter.cpp  |    4 +-
 src/components/ogre/authoring/MovementAdapter.h    |    2 +-
 src/components/ogre/authoring/PolygonPoint.cpp     |    7 +-
 .../ogre/authoring/PolygonPointMover.cpp           |    4 +-
 src/components/ogre/authoring/PolygonPointMover.h  |    6 +
 .../ogre/authoring/PolygonPointPickListener.cpp    |    5 +
 .../ogre/authoring/PolygonPointPickListener.h      |    2 +
 .../ogre/authoring/RawTypeInfoRepository.cpp       |   20 +-
 .../ogre/authoring/RawTypeInfoRepository.h         |    6 +-
 src/components/ogre/authoring/SnapToMovement.cpp   |    5 +-
 .../ogre/authoring/entityrecipes/Makefile.am       |    2 +-
 .../ogre/authoring/entityrecipes/Makefile.in       |   22 +-
 .../ogre/authoring/entityrecipes/area.entityrecipe |   27 -
 .../entityrecipes/castle_house.entityrecipe        |  101 +-
 .../authoring/entityrecipes/palisade.entityrecipe  |   18 +-
 .../authoring/entityrecipes/region.entityrecipe    |   30 +
 ...de.entityrecipe => stone_palisade.entityrecipe} |    2 +-
 .../ogre/camera/FirstPersonCameraMount.cpp         |   37 +-
 .../ogre/camera/FirstPersonCameraMount.h           |   21 +-
 src/components/ogre/camera/MainCamera.cpp          |   85 +-
 src/components/ogre/camera/MainCamera.h            |    2 +-
 src/components/ogre/data/Makefile.am               |    2 +-
 src/components/ogre/data/Makefile.in               |   22 +-
 src/components/ogre/data/cart.modeldef             |    1 +
 .../ogre/data/entitymappings.entitymap.xml         |   41 +-
 src/components/ogre/data/male.modeldef             |   20 +-
 src/components/ogre/environment/CaelumSun.cpp      |    2 +-
 .../ogre/environment/EmberEntityLoader.h           |    5 +-
 src/components/ogre/environment/FoliageBase.cpp    |    4 +-
 src/components/ogre/environment/FoliageBase.h      |    2 +-
 src/components/ogre/environment/FoliageLayer.cpp   |    2 +-
 src/components/ogre/environment/Makefile.in        |   20 +-
 .../ogre/environment/OceanRepresentation.cpp       |    2 +-
 .../ogre/environment/SimpleEnvironment.cpp         |    2 +-
 src/components/ogre/environment/caelum/Makefile.am |    2 +-
 src/components/ogre/environment/caelum/Makefile.in |  445 +-
 .../ogre/environment/caelum/include/CaelumSystem.h |   26 +-
 .../environment/caelum/include/DepthComposer.h     |    2 +-
 .../environment/caelum/include/FlatCloudLayer.h    |    2 +-
 .../ogre/environment/caelum/include/PrivatePtr.h   |   20 +-
 .../caelum/src/CaelumDefaultTypeDescriptorData.cpp |   16 +-
 .../ogre/environment/caelum/src/CloudSystem.cpp    |    2 +-
 .../ogre/environment/caelum/src/DepthComposer.cpp  |    2 +-
 .../ogre/environment/caelum/src/PointStarfield.cpp |    2 +-
 .../caelum/src/PrecipitationController.cpp         |    2 +-
 .../ogre/environment/meshtree/Makefile.am          |    2 +-
 .../ogre/environment/meshtree/Makefile.in          |   96 +-
 src/components/ogre/environment/meshtree/TStem.cpp |   11 +-
 .../ogre/environment/pagedgeometry/Makefile.am     |    2 +-
 .../ogre/environment/pagedgeometry/Makefile.in     |  301 +-
 .../pagedgeometry/include/ImpostorPage.h           |    2 +-
 .../pagedgeometry/include/PagedGeometry.h          |    5 +-
 .../pagedgeometry/source/ImpostorPage.cpp          |    8 +-
 .../pagedgeometry/source/PagedGeometry.cpp         |   39 +-
 src/components/ogre/gui/CursorWorldListener.cpp    |   23 +-
 src/components/ogre/gui/CursorWorldListener.h      |    3 +-
 src/components/ogre/lod/EmberOgreMesh.cpp          |   32 +-
 src/components/ogre/lod/EmberOgreMesh.h            |   28 +-
 src/components/ogre/lod/EmberOgreMeshManager.cpp   |   28 +-
 src/components/ogre/lod/EmberOgreMeshManager.h     |   28 +-
 src/components/ogre/lod/EmberOgreRoot.cpp          |   28 +-
 src/components/ogre/lod/EmberOgreRoot.h            |   28 +-
 src/components/ogre/lod/LodConfig.h                |   28 +-
 src/components/ogre/lod/LodDefinition.cpp          |   28 +-
 src/components/ogre/lod/LodDefinition.h            |   28 +-
 src/components/ogre/lod/LodDefinitionManager.cpp   |   28 +-
 src/components/ogre/lod/LodDefinitionManager.h     |   28 +-
 src/components/ogre/lod/LodLevelManager.h          |    4 +
 src/components/ogre/lod/LodManager.cpp             |   33 +-
 src/components/ogre/lod/LodManager.h               |   28 +-
 src/components/ogre/lod/PMInjectorSignaler.cpp     |   28 +-
 src/components/ogre/lod/PMInjectorSignaler.h       |   28 +-
 .../ogre/lod/ProgressiveMeshGenerator.cpp          |  103 +-
 src/components/ogre/lod/ProgressiveMeshGenerator.h |   46 +-
 .../ogre/lod/QueuedProgressiveMeshGenerator.cpp    |   41 +-
 .../ogre/lod/QueuedProgressiveMeshGenerator.h      |   31 +-
 .../ogre/lod/ScaledPixelCountLodStrategy.cpp       |  158 +
 .../ogre/lod/ScaledPixelCountLodStrategy.h         |  122 +
 .../ogre/lod/XMLLodDefinitionSerializer.cpp        |   29 +-
 .../ogre/lod/XMLLodDefinitionSerializer.h          |   34 +-
 src/components/ogre/model/Model.cpp                |  526 +--
 src/components/ogre/model/Model.h                  |   44 +-
 src/components/ogre/model/ModelAttachment.cpp      |    3 +-
 src/components/ogre/model/ModelAttachment.h        |    6 +-
 .../ogre/model/ModelBackgroundLoader.cpp           |   44 +-
 src/components/ogre/model/ModelBackgroundLoader.h  |    4 +-
 src/components/ogre/model/ModelBoneProvider.cpp    |    4 +-
 src/components/ogre/model/ModelDefinition.cpp      |    4 +-
 src/components/ogre/model/ModelDefinition.h        |    7 +-
 .../ogre/model/ModelDefinitionManager.cpp          |    2 +-
 src/components/ogre/model/ModelMount.cpp           |   21 +-
 src/components/ogre/model/ModelRepresentation.cpp  |    6 +-
 src/components/ogre/model/SubModel.h               |    2 +-
 .../ogre/model/XMLModelDefinitionSerializer.cpp    |    2 +-
 src/components/ogre/scripting/Makefile.in          |   20 +-
 src/components/ogre/scripting/bindings/Makefile.in |   20 +-
 .../ogre/scripting/bindings/lua/Avatar.pkg         |    8 +
 .../ogre/scripting/bindings/lua/Convert.pkg        |    6 +-
 .../scripting/bindings/lua/EmberEntityFactory.pkg  |    3 -
 .../ogre/scripting/bindings/lua/EmberOgre.cxx      |  986 +++--
 .../ogre/scripting/bindings/lua/EmberOgre.pkg      |    1 -
 .../ogre/scripting/bindings/lua/EntityEditor.pkg   |   56 +-
 .../ogre/scripting/bindings/lua/GUIManager.pkg     |    4 +-
 .../ogre/scripting/bindings/lua/Makefile.am        |    4 +-
 .../ogre/scripting/bindings/lua/Makefile.in        |   79 +-
 .../ogre/scripting/bindings/lua/Model.pkg          |    4 +-
 .../ogre/scripting/bindings/lua/Screen.pkg         |    8 +
 .../ogre/scripting/bindings/lua/SubModel.pkg       |    2 +-
 .../scripting/bindings/lua/helpers/Helpers.cxx     |    2 +-
 .../scripting/bindings/lua/helpers/Makefile.am     |    2 +-
 .../scripting/bindings/lua/helpers/Makefile.in     |  101 +-
 .../ogre/scripting/bindings/lua/ogre/Makefile.am   |    2 +-
 .../ogre/scripting/bindings/lua/ogre/Makefile.in   |   77 +-
 .../ogre/scripting/bindings/lua/ogre/Ogre.cxx      |   35 +-
 .../scripting/bindings/lua/ogre/OgreResource.pkg   |    4 +
 .../ogre/scripting/bindings/lua/required.h         |    2 +
 .../ogre/scripting/bindings/lua/stdlib.pkg         |    2 +-
 .../ogre/sound/SoundDefinitionManager.cpp          |    8 +-
 src/components/ogre/sound/SoundDefinitionManager.h |    9 +-
 src/components/ogre/sound/SoundEntity.h            |    4 +-
 src/components/ogre/sound/SoundGroup.cpp           |    8 +-
 src/components/ogre/sounddefinitions/Makefile.am   |    2 +-
 src/components/ogre/sounddefinitions/Makefile.in   |   22 +-
 src/components/ogre/terrain/GeometryUpdateTask.cpp |    3 +-
 src/components/ogre/terrain/GeometryUpdateTask.h   |    4 +-
 src/components/ogre/terrain/HeightMap.cpp          |   31 +-
 src/components/ogre/terrain/HeightMap.h            |   10 +-
 src/components/ogre/terrain/HeightMapUpdateTask.h  |    2 +-
 src/components/ogre/terrain/PlantQueryTask.h       |    1 -
 src/components/ogre/terrain/Segment.cpp            |   18 +-
 src/components/ogre/terrain/Segment.h              |   49 +-
 src/components/ogre/terrain/SegmentHolder.cpp      |   13 +-
 src/components/ogre/terrain/SegmentHolder.h        |   15 +-
 src/components/ogre/terrain/SegmentManager.cpp     |  125 +-
 src/components/ogre/terrain/SegmentManager.h       |  104 +-
 src/components/ogre/terrain/SegmentReference.cpp   |   48 -
 src/components/ogre/terrain/SegmentReference.h     |   73 -
 src/components/ogre/terrain/TerrainEditor.cpp      |    4 +-
 src/components/ogre/terrain/TerrainEditor.h        |    2 +-
 .../ogre/terrain/TerrainEditorOverlay.cpp          |   23 +-
 src/components/ogre/terrain/TerrainEditorOverlay.h |   16 +-
 src/components/ogre/terrain/TerrainHandler.cpp     |   19 +-
 src/components/ogre/terrain/TerrainHandler.h       |   19 +-
 src/components/ogre/terrain/TerrainInfo.cpp        |    4 +
 src/components/ogre/terrain/TerrainManager.cpp     |   13 +-
 src/components/ogre/terrain/TerrainManager.h       |    4 +-
 .../terrain/TerrainMaterialCompilationTask.cpp     |    1 -
 .../ogre/terrain/TerrainMaterialCompilationTask.h  |    2 +-
 src/components/ogre/terrain/TerrainModTaskBase.h   |    2 +-
 src/components/ogre/terrain/TerrainPage.h          |    2 +-
 .../ogre/terrain/TerrainPageCreationTask.cpp       |    5 +-
 .../ogre/terrain/TerrainPageCreationTask.h         |    5 +-
 .../ogre/terrain/TerrainPageGeometry.cpp           |   26 +-
 src/components/ogre/terrain/TerrainPageShadow.cpp  |    8 +-
 src/components/ogre/terrain/TerrainPageShadow.h    |   10 +-
 src/components/ogre/terrain/TerrainPageSurface.h   |    2 +-
 .../ogre/terrain/TerrainPageSurfaceLayer.cpp       |    2 +-
 .../ogre/terrain/TerrainShaderUpdateTask.cpp       |    2 -
 src/components/ogre/terrain/TerrainUpdateTask.h    |    2 +-
 src/components/ogre/terrain/Types.h                |   21 +-
 .../ogre/terrain/foliage/ClusterPopulator.cpp      |   10 +-
 .../ogre/terrain/foliage/ClusterPopulator.h        |    2 +-
 .../ogre/terrain/foliage/PlantPopulator.h          |    6 +
 src/components/ogre/terrain/foliage/Vegetation.cpp |    1 -
 src/components/ogre/terrain/techniques/Base.h      |    1 -
 .../ogre/terrain/techniques/ShaderPass.cpp         |    1 +
 src/components/ogre/widgets/Admin.lua              |   14 +-
 src/components/ogre/widgets/AssetsManager.layout   |   41 +-
 src/components/ogre/widgets/AssetsManager.lua      |   46 +-
 src/components/ogre/widgets/AtlasHelper.cpp        |    2 +-
 src/components/ogre/widgets/Bootstrap.lua          |   16 +
 src/components/ogre/widgets/Compass.h              |    2 +-
 src/components/ogre/widgets/Console.lua            |    5 +-
 src/components/ogre/widgets/ConsoleAdapter.cpp     |    3 +-
 src/components/ogre/widgets/EntityBrowser.lua      |    5 +-
 src/components/ogre/widgets/EntityCEGUITexture.h   |    2 +-
 src/components/ogre/widgets/EntityCreator.cpp      |   17 +-
 src/components/ogre/widgets/EntityCreator.h        |   10 +
 src/components/ogre/widgets/EntityCreator.layout   |   44 +
 src/components/ogre/widgets/EntityCreator.lua      |  112 +-
 .../ogre/widgets/EntityCreatorCreationInstance.cpp |   43 +-
 .../ogre/widgets/EntityCreatorCreationInstance.h   |   24 +-
 .../ogre/widgets/EntityCreatorTypeHelper.cpp       |    2 +-
 src/components/ogre/widgets/EntityEditor.cpp       |  317 +-
 src/components/ogre/widgets/EntityEditor.h         |   75 +-
 src/components/ogre/widgets/EntityEditor.layout    |  498 ++-
 src/components/ogre/widgets/EntityEditor.lua       | 1459 +++++--
 .../ogre/widgets/EntityIconDragDropPreview.cpp     |    5 +-
 src/components/ogre/widgets/EntityPicker.layout    |    1 +
 .../ogre/widgets/EntityTextureManipulator.cpp      |    2 +-
 .../ogre/widgets/EntityTextureManipulator.h        |    2 +-
 src/components/ogre/widgets/EntityTooltip.cpp      |    2 +-
 src/components/ogre/widgets/Environment.layout     |    1 +
 src/components/ogre/widgets/IconBar.cpp            |   10 +
 src/components/ogre/widgets/IconBar.h              |    4 +
 src/components/ogre/widgets/IngameChatWidget.h     |    5 +-
 src/components/ogre/widgets/InspectWidget.cpp      |  150 +-
 src/components/ogre/widgets/InspectWidget.h        |   41 +-
 src/components/ogre/widgets/Inventory.layout       |   12 +-
 src/components/ogre/widgets/Inventory.lua          |   15 +
 src/components/ogre/widgets/LoadingBar.cpp         |    1 -
 src/components/ogre/widgets/MainIconBar.lua        |   61 +-
 src/components/ogre/widgets/Makefile.in            |   20 +-
 src/components/ogre/widgets/MeshInfoProvider.cpp   |    1 -
 src/components/ogre/widgets/ModelEdit.layout       |   98 +-
 src/components/ogre/widgets/ModelEdit.lua          |   11 +-
 src/components/ogre/widgets/ModelEditHelper.cpp    |    2 +-
 src/components/ogre/widgets/ModelEditHelper.h      |    2 +-
 .../ogre/widgets/MovableObjectRenderer.cpp         |    2 +-
 .../ogre/widgets/OgreConfigurator.layout           |    8 +-
 src/components/ogre/widgets/OgreEntityRenderer.cpp |    2 +-
 src/components/ogre/widgets/Performance.lua        |    3 +-
 src/components/ogre/widgets/PickingInfo.lua        |   18 +-
 src/components/ogre/widgets/ServerBrowser.layout   |  200 +-
 src/components/ogre/widgets/ServerBrowser.lua      |  148 +-
 .../ogre/widgets/ServerSocketDetected.layout       |   34 +
 src/components/ogre/widgets/ServerWidget.cpp       |   50 +-
 src/components/ogre/widgets/ServerWidget.h         |    4 +-
 src/components/ogre/widgets/ServerWidget.layout    |   20 +
 src/components/ogre/widgets/Settings.lua           |    7 +-
 src/components/ogre/widgets/TypeManager.lua        |    6 +-
 src/components/ogre/widgets/Widget.cpp             |   12 +-
 src/components/ogre/widgets/adapters/Makefile.in   |   20 +-
 .../ogre/widgets/adapters/atlas/AdapterFactory.cpp |   11 +-
 .../ogre/widgets/adapters/atlas/AreaAdapter.cpp    |    8 +-
 .../ogre/widgets/adapters/atlas/AreaAdapter.h      |    2 +-
 .../adapters/atlas/ListAdapterNewElement.layout    |    2 +-
 .../ogre/widgets/adapters/atlas/Makefile.in        |   20 +-
 .../adapters/atlas/MapAdapterNewElement.layout     |   54 +-
 .../ogre/widgets/adapters/atlas/PolygonAdapter.cpp |    2 +-
 .../ogre/widgets/adapters/atlas/PolygonAdapter.h   |    5 +
 .../widgets/adapters/atlas/TerrainModAdapter.cpp   |    8 +-
 .../widgets/adapters/atlas/TerrainModAdapter.h     |    2 +-
 .../widgets/adapters/atlas/bindings/Makefile.in    |   20 +-
 .../adapters/atlas/bindings/lua/AtlasAdapters.cxx  |    2 +-
 .../adapters/atlas/bindings/lua/Makefile.am        |    2 +-
 .../adapters/atlas/bindings/lua/Makefile.in        |   77 +-
 .../ogre/widgets/adapters/bindings/Makefile.in     |   20 +-
 .../widgets/adapters/bindings/lua/Adapters.cxx     |    2 +-
 .../ogre/widgets/adapters/bindings/lua/Makefile.am |    2 +-
 .../ogre/widgets/adapters/bindings/lua/Makefile.in |   96 +-
 src/components/ogre/widgets/icons/IconManager.cpp  |   18 +-
 src/components/ogre/widgets/icons/IconRenderer.cpp |    8 +-
 src/components/ogre/widgets/icons/IconRenderer.h   |    2 +-
 src/components/ogre/widgets/icons/IconStore.h      |    6 +-
 .../ogre/widgets/representations/Admin.lua         |   14 +-
 .../widgets/representations/AssetsManager.layout   |   41 +-
 .../ogre/widgets/representations/AssetsManager.lua |   46 +-
 .../ogre/widgets/representations/Bootstrap.lua     |   16 +
 .../ogre/widgets/representations/Console.lua       |    5 +-
 .../ogre/widgets/representations/EntityBrowser.lua |    5 +-
 .../widgets/representations/EntityCreator.layout   |   44 +
 .../ogre/widgets/representations/EntityCreator.lua |  112 +-
 .../widgets/representations/EntityEditor.layout    |  498 ++-
 .../ogre/widgets/representations/EntityEditor.lua  | 1459 +++++--
 .../widgets/representations/EntityPicker.layout    |    1 +
 .../widgets/representations/Environment.layout     |    1 +
 .../ogre/widgets/representations/Inventory.layout  |   12 +-
 .../ogre/widgets/representations/Inventory.lua     |   15 +
 .../ogre/widgets/representations/MainIconBar.lua   |   61 +-
 .../ogre/widgets/representations/Makefile.in       |   20 +-
 .../ogre/widgets/representations/ModelEdit.layout  |   98 +-
 .../ogre/widgets/representations/ModelEdit.lua     |   11 +-
 .../representations/OgreConfigurator.layout        |    8 +-
 .../ogre/widgets/representations/Performance.lua   |    3 +-
 .../ogre/widgets/representations/PickingInfo.lua   |   18 +-
 .../widgets/representations/ServerBrowser.layout   |  200 +-
 .../ogre/widgets/representations/ServerBrowser.lua |  148 +-
 .../representations/ServerSocketDetected.layout    |   34 +
 .../widgets/representations/ServerWidget.layout    |   20 +
 .../ogre/widgets/representations/Settings.lua      |    7 +-
 .../ogre/widgets/representations/TypeManager.lua   |    6 +-
 .../adapters/atlas/ListAdapterNewElement.layout    |    2 +-
 .../adapters/atlas/MapAdapterNewElement.layout     |   54 +-
 .../widgets/representations/bindings/Makefile.in   |   20 +-
 .../representations/bindings/lua/Makefile.am       |    2 +-
 .../representations/bindings/lua/Makefile.in       |   77 +-
 .../bindings/lua/Representations.cxx               |    2 +-
 src/config.h.in                                    |    3 -
 src/domain/Makefile.am                             |    2 +-
 src/domain/Makefile.in                             |   77 +-
 src/domain/Types.h                                 |    5 +-
 src/domain/bindings/Makefile.in                    |   20 +-
 src/domain/bindings/lua/Domain.cxx                 |    2 +-
 src/domain/bindings/lua/Makefile.am                |    2 +-
 src/domain/bindings/lua/Makefile.in                |   77 +-
 src/extensions/Makefile.in                         |   20 +-
 src/extensions/webember/Makefile.in                |  219 +-
 src/extensions/webember/WebEmberManager.cpp        |    6 +-
 src/framework/AtlasMessageLoader.cpp               |   58 +
 src/framework/AtlasMessageLoader.h                 |   73 +
 .../authoring => framework}/AtlasObjectDecoder.cpp |    8 -
 .../authoring => framework}/AtlasObjectDecoder.h   |    9 -
 src/framework/AtlasPresentationBridge.cpp          |  121 +
 src/framework/AtlasPresentationBridge.h            |   77 +
 src/framework/AttributeObserver.cpp                |    4 +-
 src/framework/AttributeObserver.h                  |    4 +-
 src/framework/ConsoleBackend.cpp                   |    2 +-
 src/framework/ConsoleBackend.h                     |    5 +-
 src/framework/EntityExporter.cpp                   |  524 +++
 src/framework/EntityExporter.h                     |  329 ++
 src/framework/EntityImporter.cpp                   |  605 +++
 src/framework/EntityImporter.h                     |  300 ++
 src/framework/Exception.cpp                        |    2 +
 src/framework/FileResourceProvider.cpp             |   83 +
 src/framework/FileResourceProvider.h               |   65 +
 src/framework/IResourceProvider.h                  |    9 +-
 src/framework/MainLoopController.h                 |    3 +-
 src/framework/Makefile.am                          |   10 +-
 src/framework/Makefile.in                          |  229 +-
 src/framework/MultiLineListFormatter.cpp           |    2 -
 src/framework/ShutdownException.h                  |    4 +-
 src/framework/StreamLogObserver.cpp                |    5 +-
 src/framework/TimedLog.h                           |    3 +
 src/framework/TinyXmlCodec.cpp                     |  342 ++
 src/framework/TinyXmlCodec.h                       |   84 +
 src/framework/Tokeniser.cpp                        |    6 +-
 src/framework/bindings/Makefile.in                 |   20 +-
 .../bindings/lua/AtlasObjectDecoder.pkg            |   11 +-
 src/framework/bindings/lua/EntityExporter.pkg      |  111 +
 src/framework/bindings/lua/EntityImporter.pkg      |   86 +
 src/framework/bindings/lua/Framework.cxx           | 1860 ++++++++-
 src/framework/bindings/lua/Framework.pkg           |    3 +
 src/framework/bindings/lua/Makefile.am             |    4 +-
 src/framework/bindings/lua/Makefile.in             |   79 +-
 src/framework/bindings/lua/atlas/Atlas.cxx         |    2 +-
 src/framework/bindings/lua/atlas/Makefile.am       |    2 +-
 src/framework/bindings/lua/atlas/Makefile.in       |   77 +-
 src/framework/bindings/lua/eris/Eris.cxx           |    2 +-
 src/framework/bindings/lua/eris/Makefile.am        |    2 +-
 src/framework/bindings/lua/eris/Makefile.in        |   77 +-
 src/framework/bindings/lua/varconf/Makefile.am     |    2 +-
 src/framework/bindings/lua/varconf/Makefile.in     |   77 +-
 src/framework/bindings/lua/varconf/Varconf.cxx     |    2 +-
 src/framework/float_cast.h                         |  113 -
 src/framework/tasks/Makefile.am                    |    2 +-
 src/framework/tasks/Makefile.in                    |   77 +-
 src/framework/tasks/TaskExecutor.cpp               |    6 +-
 src/framework/tasks/TaskExecutor.h                 |    9 +-
 src/framework/tasks/TaskQueue.cpp                  |   59 +-
 src/framework/tasks/TaskQueue.h                    |   25 +-
 src/framework/tinyxml/tinyxml.h                    |   22 +-
 src/main/Application.cpp                           |  105 +-
 src/main/Application.h                             |   31 +-
 src/main/Makefile.am                               |    4 +-
 src/main/Makefile.in                               |  181 +-
 src/platform/Makefile.in                           |   20 +-
 src/services/EmberServices.cpp                     |    9 +
 src/services/EmberServices.h                       |   19 +-
 src/services/Makefile.am                           |    2 +-
 src/services/Makefile.in                           |   77 +-
 src/services/bindings/Makefile.in                  |   20 +-
 src/services/bindings/lua/ConfigService.pkg        |    7 +
 src/services/bindings/lua/EmberServices.cxx        |  278 +-
 src/services/bindings/lua/EmberServices.pkg        |    2 +
 src/services/bindings/lua/Input.pkg                |    2 +-
 .../bindings/lua/LocalServerAdminCreator.pkg       |   15 +
 src/services/bindings/lua/Makefile.am              |    4 +-
 src/services/bindings/lua/Makefile.in              |   79 +-
 src/services/bindings/lua/ServerService.pkg        |   30 +-
 src/services/config/ConfigService.cpp              |    5 +-
 src/services/config/ConfigService.h                |    7 +-
 src/services/config/Makefile.am                    |    2 +-
 src/services/config/Makefile.in                    |   77 +-
 src/services/input/IInputAdapter.h                 |    2 +-
 src/services/input/Input.cpp                       |   16 +-
 src/services/input/Input.h                         |   12 +-
 src/services/input/InputService.cpp                |    4 +-
 src/services/input/InputService.h                  |    2 +-
 src/services/input/Makefile.am                     |    2 +-
 src/services/input/Makefile.in                     |   96 +-
 src/services/logging/LoggingService.cpp            |    2 +-
 src/services/logging/LoggingService.h              |    2 +-
 src/services/logging/Makefile.am                   |    2 +-
 src/services/logging/Makefile.in                   |   77 +-
 src/services/metaserver/Makefile.am                |    2 +-
 src/services/metaserver/Makefile.in                |   77 +-
 src/services/scripting/Makefile.am                 |    2 +-
 src/services/scripting/Makefile.in                 |   77 +-
 src/services/server/ConnectedAdapter.cpp           |    8 +-
 src/services/server/ConnectingState.cpp            |   11 +-
 src/services/server/ConnectingState.h              |   15 +
 src/services/server/Connection.cpp                 |    8 +-
 src/services/server/Connection.h                   |   22 +-
 src/services/server/IState.h                       |    4 +-
 src/services/server/LocalServerAdminCreator.cpp    |   91 +
 src/services/server/LocalServerAdminCreator.h      |   70 +
 src/services/server/LoggedInState.cpp              |   10 +-
 src/services/server/LoggedInState.h                |    2 +-
 src/services/server/Makefile.am                    |    6 +-
 src/services/server/Makefile.in                    |   85 +-
 src/services/server/NonConnectedState.cpp          |   17 +-
 src/services/server/NonConnectedState.h            |   15 +-
 src/services/server/OOGChat.cpp                    |    2 +-
 src/services/server/ServerService.cpp              |   51 +-
 src/services/server/ServerService.h                |   31 +-
 src/services/server/StateBase.h                    |    6 +-
 src/services/serversettings/Makefile.am            |    2 +-
 src/services/serversettings/Makefile.in            |   77 +-
 src/services/serversettings/ServerSettings.h       |    2 +-
 src/services/sound/Makefile.am                     |    2 +-
 src/services/sound/Makefile.in                     |   77 +-
 src/services/sound/SoundInstance.h                 |    2 +-
 src/services/sound/SoundSample.cpp                 |    2 +-
 src/services/sound/SoundService.cpp                |    6 +-
 src/services/sound/SoundService.h                  |    4 +-
 src/services/wfut/Makefile.am                      |    2 +-
 src/services/wfut/Makefile.in                      |   77 +-
 src/services/wfut/WfutService.cpp                  |    2 +-
 src/services/wfut/WfutService.h                    |    2 +-
 ChangeLog-CVS => support/ChangeLog-CVS             |    0
 support/ember-media.spec.in                        |   27 +
 support/ember.spec.in                              |   25 +
 test/ConvertTestCase.cpp                           |    6 +-
 test/Makefile.am                                   |   12 +-
 test/Makefile.in                                   |  233 +-
 test/ModelMountTestCase.cpp                        |   36 +-
 test/TestFramework.cpp                             |   93 +
 test/TestTasks.cpp                                 |   17 +-
 test/TestTerrain.cpp                               |   24 +-
 test/atlas.xml                                     | 1069 +++++
 575 files changed, 27065 insertions(+), 16077 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ember.git



More information about the Pkg-games-commits mailing list