I've just created a merge request https://gitorious.org/fg/fgdata/merge_requests/181
with the following content - if Fred and/or Stuart could take a look: Weather: * bugfixes for the combined weather GUI which restore the Advanced Weather functionality * new weather scenarios corresponding to the old Advanced Weather scenario selection now also defined in METAR strings to be parsed by both systems Regional textures: * regional texture definitions for standard and procedural texturing for tropical South America (tested in and around Canaima National Park, Venezuela) Shader work in the atmospheric scattering scheme: * dust effect also added to the tree shader (looked silly otherwise...) * a lowres version of the water shader available at quality level 4 which sums only few partial waves, looks very similar to the full water sine shader from high up and runs 50% faster * vegetation effect for wet climate supposed to simulate moss and lichen cover * parameter tweaks for dawn lighting GIT specialists - please help: I actually did not want to mix all of these topics together, so these are sorted into three different commits, but I just discovered I can just create a merge request for a range of commits, but not pick one. How should I do this - or is a combined merge request with three commits okay? The way I've been operating is * take a clean copy of a rebased master into a new branch * edit in all the changes I want to have in the merge request, copy in all new files * do a merge request from there rather than from my actual devel branch But this doesn't seem to do what I intend (?) * Thorsten ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
