syncing repo with SVN #4
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is required due to the merger of the Omega hangar fork of the original 787, as the fork has all paths set to Aircraft/787-8. This was identified by Michael Soitanen at http://thread.gmane.org/gmane.games.flightgear.devel/78901/focus=79019. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@906 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…property from all files.
To avoid the files with the extensions [ac, eff, frag, nas, osgx, svg, txt, vert, xhtml, xml, xsl]
being treated as binary files, as was previously the case, the normal 'svn merge' command was not
used for the reversion. Instead the svn:mime-type property was manually readded to all the binary
file types using the find command together with 'svn propset'. Therefore the svn:mime-type
properties of the files may not always match those from before r583.
find -iname "*.wav" -exec svn propset svn:mime-type "audio/x-wav" {} \;
find -iname "*.bmp*" -exec svn propset svn:mime-type "image/x-ms-bmp" {} \;
find -iname "*.gif" -exec svn propset svn:mime-type "image/gif" {} \;
find -iname "*.jpg" -exec svn propset svn:mime-type "image/jpeg" {} \;
find -iname "*.png*" -exec svn propset svn:mime-type "image/png" {} \;
find -iname "*.psd" -exec svn propset svn:mime-type "image/vnd.adobe.photoshop" {} \;
find -iname "*.tif" -exec svn propset svn:mime-type "image/tiff" {} \;
find -iname "*.xcf" -exec svn propset svn:mime-type "image/x-xcf" {} \;
find -iname "*.rgb*" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.au" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.*af" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.3ds" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.blend*" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.dds" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.od[gst]" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.onetoc2" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.xlsx" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.pdf" -exec svn propset svn:mime-type "application/pdf" {} \;
find -iname "*.ps" -exec svn propset svn:mime-type "application/postscript" {} \;
find -iname "*.gz" -exec svn propset svn:mime-type "application/x-gzip" {} \;
find -iname "*.mdl" -exec svn propset svn:mime-type "application/x-dosexec" {} \;
find -iname "*.zip" -exec svn propset svn:mime-type "application/zip" {} \;
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@997 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…ue to submodel/offset. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@1329 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@1330 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…buggy. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@1331 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@1332 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…ks around initially flapping wings git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@1333 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
Conflicts: 787-8-set.xml Authors.txt Models/FlightDeck/OHpanel.xml Models/FlightDeck/b787.flightdeck.xml Models/Instruments/vsd.png Models/Liveries/BOE2.png Models/Liveries/BOE2.xml Nasal/systems.nas README All left as in Github master branch
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@1860 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@2054 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
Included new GPWS sounds, made minor changes to engine thrust, bypass ratio and TSFC
New GPWS sounds, edit engine properties
* Do not pollute the property tree of the local aircraft: use only relative property names in animations. * Disable the shadow for remote 787-8s as they do not transmit their /position/altitude-agl-ft by default and the shadow is only minor eye candy. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@3153 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@3387 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/787-8@3429 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note that 7 files added (in FGADDon, lacking here)
Also, note that some files conflicted, and I left them as they are in the github master branch.
This commit syncs otherwise, with SVNaddon
IH-COL