From 2630a94c3b1c49bfa33447cd47b1d39528cfb3ec Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 30 Sep 2021 21:41:09 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=206.0.0=20=20(#296)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- Changelog.md | 11 +++++++++-- README.md | 8 ++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d4b323ea..855baa6fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ find_package(ignition-cmake2 2.8.0 REQUIRED) #============================================================================ # Configure the project #============================================================================ -ign_configure_project(VERSION_SUFFIX pre1) +ign_configure_project(VERSION_SUFFIX) #============================================================================ # Set project-specific options diff --git a/Changelog.md b/Changelog.md index 8ae1fa057..de0d86559 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,8 +4,8 @@ ### Ignition Gui 6.0.0 (2021-09-XX) -1. Render engine GUI name argument to be set in the minimal scene - * [Pull request #286](https://github.com/ignitionrobotics/ign-gui/pull/286) +1. Add a filter to the plugin menu + * [Pull request #277](https://github.com/ignitionrobotics/ign-gui/pull/277) 1. New events @@ -35,6 +35,9 @@ 1. PIMPL GUI events * [Pull request #253](https://github.com/ignitionrobotics/ign-gui/pull/253) +1. Added winID to fix second windows in OGRE2.2 + * [Pull request #292](https://github.com/ignitionrobotics/ign-gui/pull/292) + 1. Added camera tracking * [Pull request #226](https://github.com/ignitionrobotics/ign-gui/pull/226) * [Pull request #254](https://github.com/ignitionrobotics/ign-gui/pull/254) @@ -45,6 +48,10 @@ * [Pull request #285](https://github.com/ignitionrobotics/ign-gui/pull/285) * [Pull request #268](https://github.com/ignitionrobotics/ign-gui/pull/268) * [Pull request #224](https://github.com/ignitionrobotics/ign-gui/pull/224) + * [Pull request #282](https://github.com/ignitionrobotics/ign-gui/pull/282) + * [Pull request #273](https://github.com/ignitionrobotics/ign-gui/pull/273) + * [Pull request #286](https://github.com/ignitionrobotics/ign-gui/pull/286) + * [Pull request #295](https://github.com/ignitionrobotics/ign-gui/pull/295) 1. Remove deprecations: tock * [Pull request #243](https://github.com/ignitionrobotics/ign-gui/pull/243) diff --git a/README.md b/README.md index 33372aa85..ad13ba222 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ Build | Status -- | -- -Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-gui/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-gui/branch/main) -Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-bionic-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-bionic-amd64) -Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-homebrew-amd64) -Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_gui-ci-win)](https://build.osrfoundation.org/job/ign_gui-ci-win) +Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-gui/branch/ign-gui6/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-gui/branch/ign-gui6) +Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-ign-gui6-bionic-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-ign-gui6-bionic-amd64) +Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-ign-gui6-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-ign-gui6-homebrew-amd64) +Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_gui-ign-6-win)](https://build.osrfoundation.org/job/ign_gui-ign-6-win) Ignition GUI builds on top of [Qt](https://www.qt.io/) to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc,