From commit-messages at dark.worldforge.org Sun Nov 1 06:08:52 2020 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 01 Nov 2020 14:08:52 +0000 Subject: [WF-CVS] [WF media] r4036 - trunk/assets/dural/creatures/quadruped_v2/model Message-ID: Author: erik Date: Sun Nov 1 14:08:52 2020 New Revision: 4036 Log: Scale by 0.1 to bring it to size. The source blender file should preferably be scaled, but I don't know how to do that without messing up the armature. Modified: trunk/assets/dural/creatures/quadruped_v2/model/rabbit.mesh trunk/assets/dural/creatures/quadruped_v2/model/rabbit.skeleton Modified: trunk/assets/dural/creatures/quadruped_v2/model/rabbit.mesh ============================================================================== Binary file (source and/or target). No diff available. Modified: trunk/assets/dural/creatures/quadruped_v2/model/rabbit.skeleton ============================================================================== Binary file (source and/or target). No diff available. From noreply at github.com Sun Nov 1 07:51:11 2020 From: noreply at github.com (Erik Ogenvik) Date: Sun, 01 Nov 2020 07:51:11 -0800 Subject: [WF-CVS] [worldforge/ember] 3e9e39: Use C++ function. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/ember Commit: 3e9e393a2c73d266ab6a46955ed507ddc1c4db6e https://github.com/worldforge/ember/commit/3e9e393a2c73d266ab6a46955ed507ddc1c4db6e Author: Erik Ogenvik Date: 2020-10-30 (Fri, 30 Oct 2020) Changed paths: M src/components/ogre/widgets/EntityCreatorWidget.cpp Log Message: ----------- Use C++ function. Commit: b67853d4abe989ff4d2a27f796c1bf447cc2f084 https://github.com/worldforge/ember/commit/b67853d4abe989ff4d2a27f796c1bf447cc2f084 Author: Erik Ogenvik Date: 2020-10-31 (Sat, 31 Oct 2020) Changed paths: M src/components/ogre/World.cpp M src/components/ogre/terrain/GeometryUpdateTask.cpp M src/components/ogre/terrain/GeometryUpdateTask.h M src/components/ogre/terrain/HeightMap.h M src/components/ogre/terrain/HeightMapFlatSegment.h M src/components/ogre/terrain/IHeightMapSegment.h M src/components/ogre/terrain/ITerrainAdapter.h M src/components/ogre/terrain/ITerrainObserver.h M src/components/ogre/terrain/ITerrainPageBridge.h M src/components/ogre/terrain/Map.cpp M src/components/ogre/terrain/OgreImage.h M src/components/ogre/terrain/OgreTerrain/CameraFocusedGrid2DPageStrategy.cpp M src/components/ogre/terrain/OgreTerrain/CameraFocusedGrid2DPageStrategy.h M src/components/ogre/terrain/OgreTerrain/EmberTerrain.h M src/components/ogre/terrain/OgreTerrain/EmberTerrainGroup.h M src/components/ogre/terrain/OgreTerrain/OgreTerrainDefiner.h M src/components/ogre/terrain/OgreTerrain/OgreTerrainObserver.h M src/components/ogre/terrain/OgreTerrain/OgreTerrainPageBridge.cpp M src/components/ogre/terrain/OgreTerrain/OgreTerrainPageBridge.h M src/components/ogre/terrain/OgreTerrain/OgreTerrainPageProvider.h M src/components/ogre/terrain/PlantInstance.h M src/components/ogre/terrain/PlantQueryTask.cpp M src/components/ogre/terrain/PlantQueryTask.h M src/components/ogre/terrain/Segment.h M src/components/ogre/terrain/SegmentHolder.h M src/components/ogre/terrain/SegmentManager.h M src/components/ogre/terrain/TerrainArea.h M src/components/ogre/terrain/TerrainAreaParser.cpp M src/components/ogre/terrain/TerrainDefPoint.h M src/components/ogre/terrain/TerrainEditor.h M src/components/ogre/terrain/TerrainEditorOverlay.h M src/components/ogre/terrain/TerrainHandler.cpp M src/components/ogre/terrain/TerrainHandler.h M src/components/ogre/terrain/TerrainInfo.h M src/components/ogre/terrain/TerrainMaterialCompilationTask.cpp M src/components/ogre/terrain/TerrainMaterialCompilationTask.h M src/components/ogre/terrain/TerrainModTranslator.cpp M src/components/ogre/terrain/TerrainPage.h M src/components/ogre/terrain/TerrainPageCreationTask.cpp M src/components/ogre/terrain/TerrainPageCreationTask.h M src/components/ogre/terrain/TerrainPageGeometry.cpp M src/components/ogre/terrain/TerrainPageGeometry.h M src/components/ogre/terrain/TerrainPageSurface.h M src/components/ogre/terrain/TerrainPageSurfaceLayer.cpp M src/components/ogre/terrain/TerrainPageSurfaceLayer.h M src/components/ogre/terrain/TerrainParser.h M src/components/ogre/terrain/TerrainShaderUpdateTask.cpp M src/components/ogre/terrain/TerrainShaderUpdateTask.h M src/components/ogre/terrain/Types.h M src/components/ogre/terrain/WFImage.cpp M src/components/ogre/terrain/XMLLayerDefinitionSerializer.cpp M src/components/ogre/terrain/XMLLayerDefinitionSerializer.h M src/components/ogre/terrain/foliage/ClusterPopulator.cpp M src/components/ogre/terrain/foliage/Vegetation.h M src/components/ogre/terrain/techniques/OnePixelMaterialGenerator.cpp M src/components/ogre/terrain/techniques/Shader.h M src/components/ogre/terrain/techniques/ShaderPass.h M src/components/ogre/terrain/techniques/ShaderPassBlendMapBatch.h Log Message: ----------- Remove obsolete lighting and apply formatting. Commit: 783c181cd972737d20c3b0091321892dccb230e0 https://github.com/worldforge/ember/commit/783c181cd972737d20c3b0091321892dccb230e0 Author: Erik Ogenvik Date: 2020-10-31 (Sat, 31 Oct 2020) Changed paths: M src/components/ogre/environment/GrassFoliage.h M src/components/ogre/environment/ShrubberyFoliage.h M src/components/ogre/scripting/bindings/lua/TerrainManager.pkg M src/components/ogre/terrain/GeometryUpdateTask.h M src/components/ogre/terrain/TerrainAreaUpdateTask.h M src/components/ogre/terrain/TerrainHandler.h M src/components/ogre/terrain/Types.h Log Message: ----------- Clean up types. Commit: 1eda8b75a70c3bfb19cdbfcb57bb9e1b8e23abbf https://github.com/worldforge/ember/commit/1eda8b75a70c3bfb19cdbfcb57bb9e1b8e23abbf Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/components/ogre/environment/FoliageBase.cpp M src/components/ogre/environment/FoliageBase.h M src/components/ogre/terrain/CMakeLists.txt M src/components/ogre/terrain/GeometryUpdateTask.cpp M src/components/ogre/terrain/GeometryUpdateTask.h M src/components/ogre/terrain/TerrainHandler.cpp M src/components/ogre/terrain/TerrainHandler.h M src/components/ogre/terrain/TerrainManager.cpp M src/components/ogre/terrain/TerrainManager.h M src/components/ogre/terrain/TerrainMaterialCompilationTask.cpp M src/components/ogre/terrain/TerrainMaterialCompilationTask.h M src/components/ogre/terrain/TerrainModTranslator.cpp M src/components/ogre/terrain/TerrainPage.cpp M src/components/ogre/terrain/TerrainPage.h M src/components/ogre/terrain/TerrainPageCreationTask.cpp R src/components/ogre/terrain/TerrainShader.cpp M src/components/ogre/terrain/TerrainShader.h M src/components/ogre/terrain/TerrainShaderUpdateTask.cpp M src/components/ogre/terrain/TerrainShaderUpdateTask.h M src/framework/tasks/ITask.h M src/framework/tasks/TemplateNamedTask.h Log Message: ----------- Make sure shaders are applied in background thread. Commit: f4bfee36ae982113ae63b710540f7b8a5db5c020 https://github.com/worldforge/ember/commit/f4bfee36ae982113ae63b710540f7b8a5db5c020 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/components/ogre/environment/Foliage.cpp M src/components/ogre/environment/Foliage.h M src/components/ogre/environment/FoliageBase.cpp M src/components/ogre/environment/FoliageBase.h M src/components/ogre/environment/FoliageLayer.cpp M src/components/ogre/environment/FoliageLayer.h M src/components/ogre/environment/FoliageLoader.cpp M src/components/ogre/environment/FoliageLoader.h M src/components/ogre/environment/GrassFoliage.cpp M src/components/ogre/environment/GrassFoliage.h M src/components/ogre/environment/ShrubberyFoliage.cpp M src/components/ogre/environment/ShrubberyFoliage.h M src/components/ogre/scripting/bindings/lua/TerrainLayerDefinition.pkg M src/components/ogre/terrain/PlantAreaQuery.h M src/components/ogre/terrain/TerrainHandler.cpp M src/components/ogre/terrain/TerrainHandler.h M src/components/ogre/terrain/TerrainLayerDefinition.h M src/components/ogre/terrain/TerrainManager.cpp M src/components/ogre/terrain/TerrainManager.h M src/components/ogre/terrain/TerrainShaderParser.cpp M src/components/ogre/terrain/TerrainShaderParser.h M src/components/ogre/terrain/XMLLayerDefinitionSerializer.cpp Log Message: ----------- Make foliage handling simpler. Compare: https://github.com/worldforge/ember/compare/153774127b5f...f4bfee36ae98 From noreply at github.com Sun Nov 1 07:51:21 2020 From: noreply at github.com (Erik Ogenvik) Date: Sun, 01 Nov 2020 07:51:21 -0800 Subject: [WF-CVS] [worldforge/cyphesis] f7f2da: Skip irrelevant info. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: f7f2da89a46720f10ccaabddbec112352630583a https://github.com/worldforge/cyphesis/commit/f7f2da89a46720f10ccaabddbec112352630583a Author: Erik Ogenvik Date: 2020-10-31 (Sat, 31 Oct 2020) Changed paths: M src/tools/EntityExporter.cpp Log Message: ----------- Skip irrelevant info. Commit: dcf343d26a8a2c7382e4bbcccaae6ea0cc604efe https://github.com/worldforge/cyphesis/commit/dcf343d26a8a2c7382e4bbcccaae6ea0cc604efe Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/navigation/Awareness.cpp Log Message: ----------- Print relevant error status. Commit: 2b76e36425c72a225d505e5cf7248118397c3f33 https://github.com/worldforge/cyphesis/commit/2b76e36425c72a225d505e5cf7248118397c3f33 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M data/rulesets/deeds/rules/creatures/crab.xml Log Message: ----------- Make crabs smaller. Commit: de70f9cafd873c179dd3d203754ceb0ef1cb85d5 https://github.com/worldforge/cyphesis/commit/de70f9cafd873c179dd3d203754ceb0ef1cb85d5 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M data/rulesets/deeds/rules/creatures/bear.xml M data/rulesets/deeds/rules/creatures/crab.xml M data/rulesets/deeds/rules/creatures/dog.xml M data/rulesets/deeds/rules/creatures/goblin.xml M data/rulesets/deeds/rules/creatures/lych.xml M data/rulesets/deeds/rules/creatures/pig.xml M data/rulesets/deeds/rules/creatures/skeleton.xml M data/rulesets/deeds/rules/creatures/spider.xml M data/rulesets/deeds/rules/creatures/wolf.xml Log Message: ----------- Make creatures roam by default. Compare: https://github.com/worldforge/cyphesis/compare/420bdddc9a63...de70f9cafd87 From noreply at github.com Sun Nov 1 07:51:26 2020 From: noreply at github.com (Erik Ogenvik) Date: Sun, 01 Nov 2020 07:51:26 -0800 Subject: [WF-CVS] [worldforge/worlds] 1f829a: Added a couple of spawners. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/worlds Commit: 1f829a2e06cac31bc4dc14da77c0f9694a30f5ff https://github.com/worldforge/worlds/commit/1f829a2e06cac31bc4dc14da77c0f9694a30f5ff Author: Erik Ogenvik Date: 2020-10-31 (Sat, 31 Oct 2020) Changed paths: M deeds/braga/world.xml Log Message: ----------- Added a couple of spawners. Commit: 4f685f14cd0dd121cf9074d51978671653b8076d https://github.com/worldforge/worlds/commit/4f685f14cd0dd121cf9074d51978671653b8076d Author: Erik Ogenvik Date: 2020-10-31 (Sat, 31 Oct 2020) Changed paths: M deeds/braga/world.xml Log Message: ----------- Added goblin spawners Commit: 07b45d065beffefd7f41614ebbc57e3499f1bfa8 https://github.com/worldforge/worlds/commit/07b45d065beffefd7f41614ebbc57e3499f1bfa8 Author: Erik Ogenvik Date: 2020-10-31 (Sat, 31 Oct 2020) Changed paths: M deeds/braga/world.xml Log Message: ----------- Added felsite and more spawners. Commit: 359ac2c7ab5b7c9346a117ef6a2ed86a9f63dd66 https://github.com/worldforge/worlds/commit/359ac2c7ab5b7c9346a117ef6a2ed86a9f63dd66 Author: Erik Ogenvik Date: 2020-10-31 (Sat, 31 Oct 2020) Changed paths: M deeds/braga/world.xml Log Message: ----------- Add smithly and forge pit to first village. Compare: https://github.com/worldforge/worlds/compare/a2bdebcd0486...359ac2c7ab5b From commit-messages at dark.worldforge.org Sun Nov 1 08:00:55 2020 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 01 Nov 2020 16:00:55 +0000 Subject: [WF-CVS] [WF media] r4037 - trunk/assets/dural/plants/trees/pine Message-ID: Author: erik Date: Sun Nov 1 16:00:55 2020 New Revision: 4037 Log: Fixed incorrect file name. Modified: trunk/assets/dural/plants/trees/pine/pine_c.modeldef Modified: trunk/assets/dural/plants/trees/pine/pine_c.modeldef ============================================================================== --- trunk/assets/dural/plants/trees/pine/pine_c.modeldef Sun Nov 1 14:08:52 2020 (r4036) +++ trunk/assets/dural/plants/trees/pine/pine_c.modeldef Sun Nov 1 16:00:55 2020 (r4037) @@ -2,7 +2,7 @@ - + From commit-messages at dark.worldforge.org Sun Nov 1 08:56:35 2020 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 01 Nov 2020 16:56:35 +0000 Subject: [WF-CVS] [WF media] r4038 - trunk/assets/dural/structures/forge_pit Message-ID: Author: erik Date: Sun Nov 1 16:56:35 2020 New Revision: 4038 Log: Added smoke. Modified: trunk/assets/dural/structures/forge_pit/forge_pit.modeldef Modified: trunk/assets/dural/structures/forge_pit/forge_pit.modeldef ============================================================================== --- trunk/assets/dural/structures/forge_pit/forge_pit.modeldef Sun Nov 1 16:00:55 2020 (r4037) +++ trunk/assets/dural/structures/forge_pit/forge_pit.modeldef Sun Nov 1 16:56:35 2020 (r4038) @@ -4,6 +4,14 @@ + + + + + 4 + + + From noreply at github.com Sun Nov 1 12:05:31 2020 From: noreply at github.com (Erik Ogenvik) Date: Sun, 01 Nov 2020 12:05:31 -0800 Subject: [WF-CVS] [worldforge/cyphesis] 02389c: Remove "name" and "description" from exports. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: 02389c24969f86dbf9a766b99cb6e97226654763 https://github.com/worldforge/cyphesis/commit/02389c24969f86dbf9a766b99cb6e97226654763 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/tools/EntityExporterBase.cpp M src/tools/EntityExporterBase.h Log Message: ----------- Remove "name" and "description" from exports. They serve no purpose. Commit: 1bef5f44d781db742804a54d4a041ac643be59a1 https://github.com/worldforge/cyphesis/commit/1bef5f44d781db742804a54d4a041ac643be59a1 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/navigation/Awareness.cpp M src/navigation/Awareness.h Log Message: ----------- Don't process movement unless we're the first observer, or we own the entity. Commit: 1384a9130e46198d53d126a6f99e71a4c8c24ba5 https://github.com/worldforge/cyphesis/commit/1384a9130e46198d53d126a6f99e71a4c8c24ba5 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M data/rulesets/deeds/scripts/world/objects/DiggableTerrain.py Log Message: ----------- Report errors when trying to dig. Commit: 4fb4a9910aac6b472928ce186d6d35dedf2b9ded https://github.com/worldforge/cyphesis/commit/4fb4a9910aac6b472928ce186d6d35dedf2b9ded Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/rules/simulation/TerrainProperty.cpp Log Message: ----------- Correctly supply parameters. Commit: 7f548e6730b1de4ab7cc729d364a76f9d8c944d1 https://github.com/worldforge/cyphesis/commit/7f548e6730b1de4ab7cc729d364a76f9d8c944d1 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M data/rulesets/deeds/scripts/world/objects/DiggableTerrain.py Log Message: ----------- Protect against null. Compare: https://github.com/worldforge/cyphesis/compare/de70f9cafd87...7f548e6730b1 From noreply at github.com Sun Nov 1 15:29:25 2020 From: noreply at github.com (Erik Ogenvik) Date: Sun, 01 Nov 2020 15:29:25 -0800 Subject: [WF-CVS] [worldforge/eris] ed12c3: Delete top level entity when shutting down. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/eris Commit: ed12c338be6d2707df0c7d69cc0fc7748c1f1df7 https://github.com/worldforge/eris/commit/ed12c338be6d2707df0c7d69cc0fc7748c1f1df7 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/Eris/View.cpp Log Message: ----------- Delete top level entity when shutting down. So that all entity deletion signals gets called. From noreply at github.com Sun Nov 1 15:29:31 2020 From: noreply at github.com (Erik Ogenvik) Date: Sun, 01 Nov 2020 15:29:31 -0800 Subject: [WF-CVS] [worldforge/ember] 7abdfe: Remove unused features. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/ember Commit: 7abdfe70b15438a910b5bf9433d3a0ebbf27efe8 https://github.com/worldforge/ember/commit/7abdfe70b15438a910b5bf9433d3a0ebbf27efe8 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/components/ogre/scripting/bindings/lua/EmberOgre.pkg R src/components/ogre/scripting/bindings/lua/StackableContainer.pkg M src/components/ogre/widgets/CMakeLists.txt M src/components/ogre/widgets/EntityEditor.lua R src/components/ogre/widgets/StackableContainer.cpp R src/components/ogre/widgets/StackableContainer.h M src/components/ogre/widgets/adapters/atlas/ListAdapter.cpp M src/components/ogre/widgets/adapters/atlas/ListAdapter.h M src/components/ogre/widgets/adapters/atlas/MapAdapter.h Log Message: ----------- Remove unused features. Commit: 89c78751fa871e8ac7b58d09953ef03cdcafa1de https://github.com/worldforge/ember/commit/89c78751fa871e8ac7b58d09953ef03cdcafa1de Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/components/ogre/widgets/adapters/atlas/ListAdapter.cpp M src/components/ogre/widgets/adapters/atlas/MapAdapter.cpp Log Message: ----------- Make sure windows aren't double deleted. Commit: be432e916204e9d1a1f577d1e8744f04020f30bc https://github.com/worldforge/ember/commit/be432e916204e9d1a1f577d1e8744f04020f30bc Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M src/components/ogre/OutlineEffect.cpp M src/components/ogre/OutlineEffect.h Log Message: ----------- Handle entity already being deleted. Commit: 96946ec26241a61e776cfb7f7f472d602279dbc9 https://github.com/worldforge/ember/commit/96946ec26241a61e776cfb7f7f472d602279dbc9 Author: Erik Ogenvik Date: 2020-11-02 (Mon, 02 Nov 2020) Changed paths: M src/components/ogre/widgets/EntityCreatorWidget.cpp Log Message: ----------- Add a default scale adapters when creating any type. Compare: https://github.com/worldforge/ember/compare/f4bfee36ae98...96946ec26241 From noreply at github.com Sun Nov 1 15:29:36 2020 From: noreply at github.com (Erik Ogenvik) Date: Sun, 01 Nov 2020 15:29:36 -0800 Subject: [WF-CVS] [worldforge/cyphesis] 50816b: Make crabs defend themselves. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: 50816bebe21eb24f67633bba492e8edf269001c9 https://github.com/worldforge/cyphesis/commit/50816bebe21eb24f67633bba492e8edf269001c9 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M data/rulesets/deeds/rules/creatures/bear.xml M data/rulesets/deeds/rules/creatures/crab.xml M data/rulesets/deeds/rules/creatures/spider.xml M data/rulesets/deeds/rules/creatures/wolf.xml Log Message: ----------- Make crabs defend themselves. Commit: f35108d99a82e11ee153448c7cd16b69c1cd0691 https://github.com/worldforge/cyphesis/commit/f35108d99a82e11ee153448c7cd16b69c1cd0691 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M data/rulesets/deeds/rules/plants.xml Log Message: ----------- Remove unused prop. Commit: ebd1b44c26160bb6e2428dd9df4965d043b0fc6d https://github.com/worldforge/cyphesis/commit/ebd1b44c26160bb6e2428dd9df4965d043b0fc6d Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M data/rulesets/deeds/rules/plants/mycelium.xml Log Message: ----------- Use correct parent. Commit: 4ce922cfce699b73d5ad038dcc280673a5ff2bf8 https://github.com/worldforge/cyphesis/commit/4ce922cfce699b73d5ad038dcc280673a5ff2bf8 Author: Erik Ogenvik Date: 2020-11-02 (Mon, 02 Nov 2020) Changed paths: M data/rulesets/deeds/rules/structures/castle_house_d.xml Log Message: ----------- Fix incorrect are below house. Compare: https://github.com/worldforge/cyphesis/compare/7f548e6730b1...4ce922cfce69 From noreply at github.com Sun Nov 1 15:29:50 2020 From: noreply at github.com (Erik Ogenvik) Date: Sun, 01 Nov 2020 15:29:50 -0800 Subject: [WF-CVS] [worldforge/worlds] c1c073: Added mycelium throughout the world. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/worlds Commit: c1c0734c06704da0452e4dec160bd393737beb4e https://github.com/worldforge/worlds/commit/c1c0734c06704da0452e4dec160bd393737beb4e Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M deeds/braga/world.xml Log Message: ----------- Added mycelium throughout the world. Commit: 4290bf9762f8597fe3e08f4bda3506d6134159c9 https://github.com/worldforge/worlds/commit/4290bf9762f8597fe3e08f4bda3506d6134159c9 Author: Erik Ogenvik Date: 2020-11-01 (Sun, 01 Nov 2020) Changed paths: M deeds/braga/world.xml Log Message: ----------- Added more trees. Compare: https://github.com/worldforge/worlds/compare/359ac2c7ab5b...4290bf9762f8 From noreply at github.com Tue Nov 3 11:27:51 2020 From: noreply at github.com (Erik Ogenvik) Date: Tue, 03 Nov 2020 11:27:51 -0800 Subject: [WF-CVS] [worldforge/ember] e6c5bf: Maintain buffer list size. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/ember Commit: e6c5bf127d14bf02dc20516b35590e37006f12fa https://github.com/worldforge/ember/commit/e6c5bf127d14bf02dc20516b35590e37006f12fa Author: Erik Ogenvik Date: 2020-11-03 (Tue, 03 Nov 2020) Changed paths: M src/components/ogre/terrain/HeightMapBufferProvider.cpp Log Message: ----------- Maintain buffer list size. From noreply at github.com Tue Nov 3 11:28:08 2020 From: noreply at github.com (Erik Ogenvik) Date: Tue, 03 Nov 2020 11:28:08 -0800 Subject: [WF-CVS] [worldforge/cyphesis] c47dff: Use modifiers when applying effects. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: c47dff241536c95222c018e729b2b27d659a9daa https://github.com/worldforge/cyphesis/commit/c47dff241536c95222c018e729b2b27d659a9daa Author: Erik Ogenvik Date: 2020-11-02 (Mon, 02 Nov 2020) Changed paths: M data/rulesets/deeds/rules/consumables/potion.xml M data/rulesets/deeds/scripts/world/objects/Potion.py Log Message: ----------- Use modifiers when applying effects. Commit: d3972f330b544dfdf66e796e542f23fff9b3b3bd https://github.com/worldforge/cyphesis/commit/d3972f330b544dfdf66e796e542f23fff9b3b3bd Author: Erik Ogenvik Date: 2020-11-02 (Mon, 02 Nov 2020) Changed paths: M data/rulesets/deeds/rules/consumables/potion.xml Log Message: ----------- Added potion for increasing level. Commit: 94692b69db695d490e482c55ada3f3de8bf0fb98 https://github.com/worldforge/cyphesis/commit/94692b69db695d490e482c55ada3f3de8bf0fb98 Author: Erik Ogenvik Date: 2020-11-03 (Tue, 03 Nov 2020) Changed paths: M src/rules/simulation/Task.cpp Log Message: ----------- Added better logging from tasks. Commit: ea57bf52a278cca3dfe57329da71698bb9081ea5 https://github.com/worldforge/cyphesis/commit/ea57bf52a278cca3dfe57329da71698bb9081ea5 Author: Erik Ogenvik Date: 2020-11-03 (Tue, 03 Nov 2020) Changed paths: M data/rulesets/deeds/rules/creatures/crab.xml M data/rulesets/deeds/rules/creatures/goblin.xml M data/rulesets/deeds/rules/creatures/human.xml M data/rulesets/deeds/rules/creatures/lych.xml M data/rulesets/deeds/rules/creatures/skeleton.xml M data/rulesets/deeds/rules/creatures/spider.xml M data/rulesets/deeds/rules/creatures/wolf.xml M data/rulesets/deeds/rules/tools/knife.xml M data/rulesets/deeds/rules/weapons/bow.xml M data/rulesets/deeds/rules/weapons/swords.xml M data/rulesets/deeds/scripts/world/objects/tools/Bow.py M data/rulesets/deeds/scripts/world/objects/tools/Melee.py M data/rulesets/deeds/scripts/world/objects/tools/Unarmed.py M data/rulesets/deeds/scripts/world/utils/Usage.py Log Message: ----------- Implement "warmup" for tools. This is the time it takes for a tool to become ready. For a sword it's the time it takes to draw it back, for a bow it's the time it takes to draw the bow. This should tie into an upcoming improved system for displaying actions. Commit: a16336ec213d9cda4b72ab68a8874a5e71e36fa8 https://github.com/worldforge/cyphesis/commit/a16336ec213d9cda4b72ab68a8874a5e71e36fa8 Author: Erik Ogenvik Date: 2020-11-03 (Tue, 03 Nov 2020) Changed paths: M src/rules/simulation/Task.cpp Log Message: ----------- Print the type of the script, not the object itself. Compare: https://github.com/worldforge/cyphesis/compare/4ce922cfce69...a16336ec213d From noreply at github.com Tue Nov 3 12:02:48 2020 From: noreply at github.com (Erik Ogenvik) Date: Tue, 03 Nov 2020 12:02:48 -0800 Subject: [WF-CVS] [worldforge/cyphesis] 3d6852: Fixed tests. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: 3d6852fd918eb8bf526e6aff079587e24c8b5e74 https://github.com/worldforge/cyphesis/commit/3d6852fd918eb8bf526e6aff079587e24c8b5e74 Author: Erik Ogenvik Date: 2020-11-03 (Tue, 03 Nov 2020) Changed paths: M tests/server/ServerRoutingTest.cpp M tests/stubs/common/stublog_custom.h M tests/stubs/modules/stubTerrainContext.h Log Message: ----------- Fixed tests. From commit-messages at dark.worldforge.org Sun Nov 8 07:32:38 2020 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 08 Nov 2020 15:32:38 +0000 Subject: [WF-CVS] [WF media] r4039 - trunk/assets/common/base Message-ID: Author: erik Date: Sun Nov 8 15:32:38 2020 New Revision: 4039 Log: Fixed waving of grass. Modified: trunk/assets/common/base/Common.program Modified: trunk/assets/common/base/Common.program ============================================================================== --- trunk/assets/common/base/Common.program Sun Nov 1 16:56:35 2020 (r4038) +++ trunk/assets/common/base/Common.program Sun Nov 8 15:32:38 2020 (r4039) @@ -152,7 +152,7 @@ param_named_auto worldMatrix world_matrix param_named_auto numberOfActiveLights light_count - param_named time float 1 + param_named_auto time time param_named frequency float 1 param_named direction float4 0.0 0.0 0.0 0.0 @@ -358,7 +358,7 @@ //param_named_auto shadowDepthRange2 shadow_scene_depth_range 2 //param_named_auto shadowDepthRange3 shadow_scene_depth_range 3 //param_named_auto shadowDepthRange4 shadow_scene_depth_range 4 - param_named time float 1 + param_named_auto time time param_named frequency float 1 param_named direction float4 0.0 0.0 0.0 0.0 @@ -512,7 +512,7 @@ param_named_auto worldMatrix world_matrix param_named_auto numberOfActiveLights light_count - param_named time float 1 + param_named_auto time time param_named frequency float 1 param_named direction float4 0.0 0.0 0.0 0.0 @@ -699,7 +699,7 @@ param_named_auto shadowWorldViewProjectionMatrix3 texture_worldviewproj_matrix 3 param_named_auto shadowWorldViewProjectionMatrix4 texture_worldviewproj_matrix 4 param_named_auto numberOfActiveLights light_count - param_named time float 1 + param_named_auto time time param_named frequency float 1 param_named direction float4 0.0 0.0 0.0 0.0 From commit-messages at dark.worldforge.org Sun Nov 8 07:33:53 2020 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 08 Nov 2020 15:33:53 +0000 Subject: [WF-CVS] [WF media] r4040 - in trunk/assets/dural/structures/cg_house_c: model source Message-ID: Author: erik Date: Sun Nov 8 15:33:53 2020 New Revision: 4040 Log: Provide proper scale. It was scaled approximately 1.8 too large. Modified: trunk/assets/dural/structures/cg_house_c/model/cg_house_c.mesh trunk/assets/dural/structures/cg_house_c/source/cg_house_c.blend Modified: trunk/assets/dural/structures/cg_house_c/model/cg_house_c.mesh ============================================================================== Binary file (source and/or target). No diff available. Modified: trunk/assets/dural/structures/cg_house_c/source/cg_house_c.blend ============================================================================== Binary file (source and/or target). No diff available. From commit-messages at dark.worldforge.org Sun Nov 8 13:11:45 2020 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Sun, 08 Nov 2020 21:11:45 +0000 Subject: [WF-CVS] [WF media] r4041 - in trunk/assets/dural/structures/cg_smithy: model source Message-ID: Author: erik Date: Sun Nov 8 21:11:45 2020 New Revision: 4041 Log: Alter scale to better fit world. Modified: trunk/assets/dural/structures/cg_smithy/model/cg_smithy.mesh trunk/assets/dural/structures/cg_smithy/source/cg_smithy.blend Modified: trunk/assets/dural/structures/cg_smithy/model/cg_smithy.mesh ============================================================================== Binary file (source and/or target). No diff available. Modified: trunk/assets/dural/structures/cg_smithy/source/cg_smithy.blend ============================================================================== Binary file (source and/or target). No diff available. From noreply at github.com Sun Nov 8 13:41:41 2020 From: noreply at github.com (Erik Ogenvik) Date: Sun, 08 Nov 2020 13:41:41 -0800 Subject: [WF-CVS] [worldforge/cyphesis] 810957: Adjust after size changes. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: 8109579161f79f04fed32feed1424b308f71d588 https://github.com/worldforge/cyphesis/commit/8109579161f79f04fed32feed1424b308f71d588 Author: Erik Ogenvik Date: 2020-11-08 (Sun, 08 Nov 2020) Changed paths: M data/rulesets/deeds/rules/structures/castle_smithy.xml Log Message: ----------- Adjust after size changes. From noreply at github.com Tue Nov 10 09:22:24 2020 From: noreply at github.com (Erik Ogenvik) Date: Tue, 10 Nov 2020 09:22:24 -0800 Subject: [WF-CVS] [worldforge/cyphesis] aa7ff9: Make sure task object is removed when marking as i... Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: aa7ff92bc649dc830ae8417cfb451778c7a7e4f1 https://github.com/worldforge/cyphesis/commit/aa7ff92bc649dc830ae8417cfb451778c7a7e4f1 Author: Erik Ogenvik Date: 2020-11-09 (Mon, 09 Nov 2020) Changed paths: M src/rules/simulation/Task.cpp M src/rules/simulation/TasksProperty.cpp M src/rules/simulation/TasksProperty.h Log Message: ----------- Make sure task object is removed when marking as irrelevant. Otherwise there will be circular dependencies and data won't be released. Commit: 87148f658ed93566580355ca93901961c42c7132 https://github.com/worldforge/cyphesis/commit/87148f658ed93566580355ca93901961c42c7132 Author: Erik Ogenvik Date: 2020-11-10 (Tue, 10 Nov 2020) Changed paths: M data/rulesets/deeds/scripts/world/traits/Levelable.py Log Message: ----------- Only increase level, never decrease it. Compare: https://github.com/worldforge/cyphesis/compare/8109579161f7...87148f658ed9 From noreply at github.com Tue Nov 10 10:04:40 2020 From: noreply at github.com (Erik Ogenvik) Date: Tue, 10 Nov 2020 10:04:40 -0800 Subject: [WF-CVS] [worldforge/cyphesis] e03367: Fixed compilation. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: e03367486b375e4ea472df46528752e299ed1f8a https://github.com/worldforge/cyphesis/commit/e03367486b375e4ea472df46528752e299ed1f8a Author: Erik Ogenvik Date: 2020-11-10 (Tue, 10 Nov 2020) Changed paths: M src/rules/simulation/TasksProperty.cpp Log Message: ----------- Fixed compilation. From noreply at github.com Tue Nov 10 11:46:17 2020 From: noreply at github.com (Erik Ogenvik) Date: Tue, 10 Nov 2020 11:46:17 -0800 Subject: [WF-CVS] [worldforge/cyphesis] bf06ae: Fixed various warnings. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: bf06aede2c9a17d21b0ca2c14d7898ad37c76749 https://github.com/worldforge/cyphesis/commit/bf06aede2c9a17d21b0ca2c14d7898ad37c76749 Author: Erik Ogenvik Date: 2020-11-10 (Tue, 10 Nov 2020) Changed paths: M src/client/aiclient/PossessionClient.cpp M src/common/system.cpp M src/rules/ai/AwarenessStore.cpp M src/rules/python/CyPy_Element.cpp M src/rules/simulation/OgreMeshDeserializer.cpp M src/server/Juncture.cpp M src/tools/EntityImporterBase.cpp M src/tools/EntityImporterBase.h Log Message: ----------- Fixed various warnings. Commit: 4907a1c8cd37abbdb27fe3bcad9c161561e1d8dd https://github.com/worldforge/cyphesis/commit/4907a1c8cd37abbdb27fe3bcad9c161561e1d8dd Author: Erik Ogenvik Date: 2020-11-10 (Tue, 10 Nov 2020) Changed paths: M src/rules/simulation/TasksProperty.cpp M src/rules/simulation/TasksProperty.h Log Message: ----------- Fixed tests. Compare: https://github.com/worldforge/cyphesis/compare/e03367486b37...4907a1c8cd37 From noreply at github.com Fri Nov 20 04:56:42 2020 From: noreply at github.com (Erik Ogenvik) Date: Fri, 20 Nov 2020 04:56:42 -0800 Subject: [WF-CVS] [worldforge/cyphesis] 97fcb1: Remove obsolete tp_print. Message-ID: Branch: refs/heads/master Home: https://github.com/worldforge/cyphesis Commit: 97fcb1b94764167579a62e801d1a0ed88a4f60b9 https://github.com/worldforge/cyphesis/commit/97fcb1b94764167579a62e801d1a0ed88a4f60b9 Author: Erik Ogenvik Date: 2020-11-20 (Fri, 20 Nov 2020) Changed paths: M external/pycxx/Src/Python3/cxx_extensions.cxx Log Message: ----------- Remove obsolete tp_print.