Re: [Flightgear-devel] [Flightgear-commitlogs] FlightGear Base Package branch, master, updated. f81456998442b1f30d86c4925a7d000d46ea4f1f
I am in no way picking on any single committer here. This just happens to be the most recent commit message that came through while I was thinking about this (sorry Gijs, we do really love you. I'm mean, not really really really love, but well you know how I always say one sentence too many and paint myself into a corner I can't get out of.) :-) I sense that there have been a substantial number of updates to individual aircraft that are only going into the master branch and aren't getting cherry picked into the 2.8.0 release branch. Perhaps this is intentional or I'm misunderstanding something, but I wanted to at least ask. When I create the downloadable aircraft .zip files for the 2.8.0 release, it will be from the release/2.8.0 branch, but most of the aircraft changes that have been made since the 2.8.0 branch was created are not going in there, and are only going into master. Thanks, Curt. On Mon, Jul 30, 2012 at 4:14 PM, Flightgear-commitlogs mar...@hypersphere.calit2.net wrote: The branch, master has been updated - Log - commit f81456998442b1f30d86c4925a7d000d46ea4f1f Author: Gijs de Rooy Date: Mon Jul 30 23:12:56 2012 +0200 Issue 824: DC-10-30 and CRJ700-family Rembrandt lights displayed in FGRun. - Summary - Aircraft/CRJ700-family/Models/Lights/beacon.xml|1 + Aircraft/CRJ700-family/Models/Lights/greennav.xml |1 + .../CRJ700-family/Models/Lights/landing-nose.xml |1 + .../Models/Lights/landing-wing-inside.xml |1 + .../CRJ700-family/Models/Lights/landing-wing.xml |1 + Aircraft/CRJ700-family/Models/Lights/rednav.xml|1 + Aircraft/CRJ700-family/Models/Lights/strobe.xml|1 + Aircraft/CRJ700-family/Models/Lights/taxi.xml |1 + Aircraft/DC-10-30/Models/Lights/greennav.xml |1 + .../Models/Lights/landing-nose-fuselage.xml|1 + .../DC-10-30/Models/Lights/landing-nose-gear.xml |1 + .../DC-10-30/Models/Lights/landing-wing-inside.xml |1 + Aircraft/DC-10-30/Models/Lights/landing-wing.xml |1 + Aircraft/DC-10-30/Models/Lights/panel.xml |1 + Aircraft/DC-10-30/Models/Lights/rednav.xml |1 + Aircraft/DC-10-30/Models/Lights/strobe.xml |1 + 16 files changed, 16 insertions(+), 0 deletions(-) - Diff diff --git a/Aircraft/CRJ700-family/Models/Lights/beacon.xml b/Aircraft/CRJ700-family/Models/Lights/beacon.xml index 4905af8..9f1c262 100644 --- a/Aircraft/CRJ700-family/Models/Lights/beacon.xml +++ b/Aircraft/CRJ700-family/Models/Lights/beacon.xml @@ -27,6 +27,7 @@ typelight/type light-typepoint/light-type object-nameSphere/object-name + nopreview/ position x0/x y0/y diff --git a/Aircraft/CRJ700-family/Models/Lights/greennav.xml b/Aircraft/CRJ700-family/Models/Lights/greennav.xml index f17c5f4..93a2ace 100644 --- a/Aircraft/CRJ700-family/Models/Lights/greennav.xml +++ b/Aircraft/CRJ700-family/Models/Lights/greennav.xml @@ -31,6 +31,7 @@ typelight/type light-typepoint/light-type object-nameSphere/object-name + nopreview/ position x0/x y0/y diff --git a/Aircraft/CRJ700-family/Models/Lights/landing-nose.xml b/Aircraft/CRJ700-family/Models/Lights/landing-nose.xml index 2532748..1b8c65e 100644 --- a/Aircraft/CRJ700-family/Models/Lights/landing-nose.xml +++ b/Aircraft/CRJ700-family/Models/Lights/landing-nose.xml @@ -23,6 +23,7 @@ typelight/type light-typespot/light-type object-nameCone/object-name + nopreview/ position x0/x y0/y diff --git a/Aircraft/CRJ700-family/Models/Lights/landing-wing-inside.xml b/Aircraft/CRJ700-family/Models/Lights/landing-wing-inside.xml index 0f1d576..64e62eb 100644 --- a/Aircraft/CRJ700-family/Models/Lights/landing-wing-inside.xml +++ b/Aircraft/CRJ700-family/Models/Lights/landing-wing-inside.xml @@ -30,6 +30,7 @@ typelight/type light-typespot/light-type object-nameCone/object-name + nopreview/ position x0/x y0/y diff --git a/Aircraft/CRJ700-family/Models/Lights/landing-wing.xml b/Aircraft/CRJ700-family/Models/Lights/landing-wing.xml index e97bcc7..4d7af16 100644 --- a/Aircraft/CRJ700-family/Models/Lights/landing-wing.xml +++ b/Aircraft/CRJ700-family/Models/Lights/landing-wing.xml @@ -26,6 +26,7 @@ typelight/type
Re: [Flightgear-devel] [Flightgear-commitlogs] FlightGear Base Package branch, master, updated. f81456998442b1f30d86c4925a7d000d46ea4f1f
Curt (love you too), in compliance with our release plan, only bug fixes can be cherry picked into the release branch, now that we've past July 17. This is to make sure that we don't end up having countless of non-functioning/buggy aircraft on the download page. New features and completely new aircraft should not end up in the release branch. See: http://wiki.flightgear.org/Release_plan Gijs -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] [Flightgear-commitlogs] FlightGear Base Package branch, master, updated. f81456998442b1f30d86c4925a7d000d46ea4f1f
On Monday 30 July 2012 16:29:28 Curtis Olson wrote: I am in no way picking on any single committer here. This just happens to be the most recent commit message that came through while I was thinking about this (sorry Gijs, we do really love you. I'm mean, not really really really love, but well you know how I always say one sentence too many and paint myself into a corner I can't get out of.) :-) I sense that there have been a substantial number of updates to individual aircraft that are only going into the master branch and aren't getting cherry picked into the 2.8.0 release branch. Perhaps this is intentional or I'm misunderstanding something, but I wanted to at least ask. When I create the downloadable aircraft .zip files for the 2.8.0 release, it will be from the release/2.8.0 branch, but most of the aircraft changes that have been made since the 2.8.0 branch was created are not going in there, and are only going into master. Thanks, Curt. Hi Curt, I've already cherry-picked that commit to release/2.8.0. My impression is some of the contributors have some dificulties/issues with this part of the git workflow and they'd rather not risk messing up the release branch. Maybe we should setup some sort of system (bug category?) for this, so that we're made aware of fixes to aircraft already present in the release branch that should be cherry-picked there. Regards, Emilian -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] [Flightgear-commitlogs] FlightGear Base Package branch, master, updated. f81456998442b1f30d86c4925a7d000d46ea4f1f
On Mon, Jul 30, 2012 at 5:11 PM, Gijs de Rooy gijsr...@hotmail.com wrote: Curt (love you too), in compliance with our release plan, only bug fixes can be cherry picked into the release branch, now that we've past July 17. This is to make sure that we don't end up having countless of non-functioning/buggy aircraft on the download page. New features and completely new aircraft should not end up in the release branch. See: http://wiki.flightgear.org/Release_plan Understood, but it seems (and I could be mistaken) like a lot of small bug fixes and rembrandt compatibility updates are going into master only and could easily be cherry picked into the release branch. If this is due to some aircraft authors not remembering to cherry pick their bug fixes over to the release branch then I wanted to bring it up for discussion. If this is entirely intentional and due to an abundance of caution, then that's perfectly fine too. Thanks, Curt. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://gallinazo.flightgear.org -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel