Menu

FGData Merge Request #168: Wingflex shader -further improvements (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Original repository by Bea Wolf is deleted

Discussion

  • Bea Wolf

    Bea Wolf - 2020-02-21

    This merge request is ready for merge, @jmturner could you merge it?

     
  • James Turner

    James Turner - 2020-02-23

    Sure, I'll squash them together at the same time I think

     
  • James Turner

    James Turner - 2020-02-23

    Hmm, small issue: I see six commits on your 'next' : besides the four above, there is also:

    Improve wingflex shader+effect ( be7e278f1cc119f2a2930161151)
    Minor changes, use int for type instead of organic bool

    Should I merge all six, or jsut the four listed above? Since they seem related.

     
  • Bea Wolf

    Bea Wolf - 2020-02-23

    oops, yes it would be good if you could merge all commits there together, I didn't realise I hadn't included them into the merge request,

     
  • James Turner

    James Turner - 2020-02-23

    Merged now!

     
  • James Turner

    James Turner - 2020-02-23
    • Status: open --> merged
     
  • Bea Wolf

    Bea Wolf - 2020-02-23

    Thank you very much!

     

Log in to post a comment.

MongoDB Logo MongoDB