Anders, you're my hero! It actually worked :-)
Maybe I should add that to the wiki?
* Thorsten
> to keep your commit. Even if you merged your changed branch (e.g.
> with git pull) rather than rebasing it you'd get the conflicts.
>
> git status to check which files are in conflict.
Csaba Halász wrote
> -Original Message-
> From: Csaba Halász [mailto:csaba.hal...@gmail.com]
> Sent: 11 May 2011 23:01
> To: FlightGear developers discussions
> Subject: Re: [Flightgear-devel] RFC: fgdata merge request
> 76:ImprovedairportTextures
>
> On Wed, May 11, 2011 at 11:24 PM, Hei
On Wed, May 11, 2011 at 11:24 PM, Heiko Schulz wrote:
>>
>> Anybody got a screenshot with stopways?
>
> Yep:
> www.hoerbird.net/fgfs-screen-251.jpg
Thanks! Apparently I have to use the scenery from fgdata and not
terrasync. With that, I have stopway with both the old and the new
textures.
--
Cs
>
> Anybody got a screenshot with stopways?
>
> --
Yep:
GIT 04/29/2011 win32 Hudson Build
www.hoerbird.net/fgfs-screen-251.jpg
--
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran deve
On Wednesday 11 May 2011 15:14:01 Csaba Halász wrote:
> On Wed, May 11, 2011 at 6:38 PM, Vivian Meazza
>
> wrote:
> > Christian Schmitt wrote
> >
> >> The stopways still work for me here, so there is maybe something wrong
> >> in your fgdata?
> >
> > I have absolutely up-to-date data and source fr
On Wed, May 11, 2011 at 6:38 PM, Vivian Meazza
wrote:
> Christian Schmitt wrote
>>
>> The stopways still work for me here, so there is maybe something wrong in
>> your fgdata?
>
> I have absolutely up-to-date data and source from Git here - still no
> stopways. Is your data up-to-date? But I suspe
Hi,
>
> Yes they do look ugly, because the new textures expose
> problems that are
> hidden by the old ones. Here are some more:
>
> ftp://abbeytheatre2.org.uk:2121/flightgear/Terrain/KSFO-Textures.jpg
> ftp://abbeytheatre2.org.uk:2121/flightgear/Terrain/KSFO-Textures-1.jpg
> ftp://abbeytheatre2
Christian Schmitt wrote
>
> Vivian Meazza wrote:
>
>
> > The main problem is that the taxiway textures expose the workaround that
> > we use because we don't (yet) have curved taxiways. The concrete colour
> > does not blend with the old texture, which is still used for aprons
> etc.,
> > and t
On Wed, May 11, 2011 at 8:04 AM, Claus Christmann wrote:
> Curt and all,
>
> this is fairly exactly what I am tasked to do for a research project. We
> have
> code to create "optimal" (I put that in quotes as that obviously lies in
> the
> eye of the beholder) trajectories, taking some dynamic lim
On Wed, 11 May 2011, Curtis Olson wrote:
> Let me ask a dumb question then. I do a similar procedure to Thorsten,
> except in my local branch I do a "git merge master" instead of a rebase.
> Can someone explain the nuances of merge verses rebase?
Each rebase moves your local commits to be on-top
On Wed, May 11, 2011 at 2:27 AM, Thorsten wrote:
> > I then switch to master, do a
> >
> > git pull
> > git checkout local-weather
> > git rebase master
> >
> > Now the trouble starts...
>
Let me ask a dumb question then. I do a similar procedure to Thorsten,
except in my local branch I do a "gi
On Monday, May 09, 2011 11:41:53 AM Curtis Olson wrote:
>
> Ultimately, what I'd like to do for my project is have an "auto-land" gui
> button that will pop up a list of nearby airports. The user selects the
> one they want and then a list of runways pops up, perhaps ranked based on
> the prevai
Vivian Meazza wrote:
> The main problem is that the taxiway textures expose the workaround that
> we use because we don't (yet) have curved taxiways. The concrete colour
> does not blend with the old texture, which is still used for aprons etc.,
> and the edge and centre lines also serve to empha
On Wed, 11 May 2011, thorsten.i.r...@jyu.fi wrote:
> I then switch to master, do a
>
> git pull
> git checkout local-weather
> git rebase master
>
> Now the trouble starts, because after the final command, the system
> bitches about merging conflicts and asks me to resolve them or use
>
> git reba
Sorry to bother with trivia, but my inability to use GIT properly starts
to annoy me.
What I want is my personally customized branch of FGData in which I can do
texturing experiments and develop Local Weather ahead of what is in
master, which is then periodically updated to whatever else has been
15 matches
Mail list logo
