]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
Merge branch 'master' into Melanosuchus/cmake
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 22 Jan 2016 06:54:45 +0000 (17:54 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 22 Jan 2016 06:54:45 +0000 (17:54 +1100)
# Conflicts:
# radiant/mainframe.cpp
# radiant/texwindow.cpp

262 files changed:
.cproject [new file with mode: 0644]
.gitignore
.project [new file with mode: 0644]
Makefile
contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.bmp [deleted file]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.png [new file with mode: 0644]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.bmp [deleted file]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.png [new file with mode: 0644]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.bmp [deleted file]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.png [new file with mode: 0644]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.bmp [deleted file]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.png [new file with mode: 0644]
contrib/bkgrnd2d/plugin.cpp
contrib/bobtoolz/bitmaps/README-bitmaps.txt [new file with mode: 0644]
contrib/bobtoolz/bitmaps/bobtoolz_caulk.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_cleanup.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_dropent.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_merge.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_poly.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_split.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_trainpathplot.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_treeplanter.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_turnedge.bmp [deleted file]
contrib/bobtoolz/bobToolz-GTK.cpp
contrib/camera/bitmaps/camera_insp.bmp [deleted file]
contrib/camera/bitmaps/camera_insp.png [new file with mode: 0644]
contrib/camera/camera.cpp
contrib/ufoaiplug/bitmaps/README-bitmaps.txt [new file with mode: 0644]
contrib/ufoaiplug/bitmaps/ufoai_actorclip.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level1.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level2.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level3.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level4.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level5.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level6.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level7.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level8.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_nodraw.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_stepon.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_weaponclip.bmp [deleted file]
contrib/ufoaiplug/ufoai_gtk.cpp
download-gamepacks.sh
libs/gtkutil/image.cpp
libs/shaderlib.h
libs/string/string.h
plugins/shaders/plugin.cpp
plugins/shaders/shaders.cpp
radiant/camwindow.cpp
radiant/gtkdlgs.cpp
radiant/mainframe.cpp
radiant/patchmanip.cpp
radiant/texwindow.cpp
setup/apple/.gitignore [new file with mode: 0644]
setup/apple/Makefile [new file with mode: 0644]
setup/apple/NetRadiant.app/Contents/Info.plist [new file with mode: 0644]
setup/apple/NetRadiant.app/Contents/MacOS/radiant [new file with mode: 0755]
setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf [new file with mode: 0644]
setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc [new file with mode: 0644]
setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc [new file with mode: 0644]
setup/apple/NetRadiant.app/Contents/Resources/lib/.turd [new file with mode: 0644]
setup/apple/NetRadiant.app/Contents/Resources/radiant.icns [new file with mode: 0644]
setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd [new file with mode: 0644]
setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd [new file with mode: 0644]
setup/apple/README.md [new file with mode: 0644]
setup/data/osx/NetRadiant.app/Contents/Info.plist [deleted file]
setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf [deleted file]
setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.dtd [deleted file]
setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders [deleted file]
setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules [deleted file]
setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc [deleted file]
setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases [deleted file]
setup/data/osx/NetRadiant.app/Contents/PkgInfo [deleted file]
setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings [deleted file]
setup/data/osx/NetRadiant.app/Contents/Resources/NetRadiant.icns [deleted file]
setup/data/tools-src/notex.xcf [new file with mode: 0644]
setup/data/tools-src/shadernotex.xcf [new file with mode: 0644]
setup/data/tools/bitmaps/black.bmp [deleted file]
setup/data/tools/bitmaps/black.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_flipx.bmp [deleted file]
setup/data/tools/bitmaps/brush_flipx.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_flipy.bmp [deleted file]
setup/data/tools/bitmaps/brush_flipy.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_flipz.bmp [deleted file]
setup/data/tools/bitmaps/brush_flipz.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_rotatex.bmp [deleted file]
setup/data/tools/bitmaps/brush_rotatex.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_rotatey.bmp [deleted file]
setup/data/tools/bitmaps/brush_rotatey.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_rotatez.bmp [deleted file]
setup/data/tools/bitmaps/brush_rotatez.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_bevel.bmp [deleted file]
setup/data/tools/bitmaps/cap_bevel.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_curve.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_cylinder.bmp [deleted file]
setup/data/tools/bitmaps/cap_cylinder.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_endcap.bmp [deleted file]
setup/data/tools/bitmaps/cap_endcap.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_ibevel.bmp [deleted file]
setup/data/tools/bitmaps/cap_ibevel.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_iendcap.bmp [deleted file]
setup/data/tools/bitmaps/cap_iendcap.png [new file with mode: 0644]
setup/data/tools/bitmaps/console.bmp [deleted file]
setup/data/tools/bitmaps/console.png [new file with mode: 0644]
setup/data/tools/bitmaps/curve_cap.bmp [deleted file]
setup/data/tools/bitmaps/dontselectcurve.bmp [deleted file]
setup/data/tools/bitmaps/dontselectcurve.png [new file with mode: 0644]
setup/data/tools/bitmaps/dontselectmodel.bmp [deleted file]
setup/data/tools/bitmaps/dontselectmodel.png [new file with mode: 0644]
setup/data/tools/bitmaps/ellipsis.bmp [deleted file]
setup/data/tools/bitmaps/ellipsis.png [new file with mode: 0644]
setup/data/tools/bitmaps/entities.bmp [deleted file]
setup/data/tools/bitmaps/entities.png [new file with mode: 0644]
setup/data/tools/bitmaps/file_open.bmp [deleted file]
setup/data/tools/bitmaps/file_open.png [new file with mode: 0644]
setup/data/tools/bitmaps/file_save.bmp [deleted file]
setup/data/tools/bitmaps/file_save.png [new file with mode: 0644]
setup/data/tools/bitmaps/icon.bmp [deleted file]
setup/data/tools/bitmaps/icon.png [new file with mode: 0644]
setup/data/tools/bitmaps/lightinspector.bmp [deleted file]
setup/data/tools/bitmaps/lightinspector.png [new file with mode: 0644]
setup/data/tools/bitmaps/logo.bmp [deleted file]
setup/data/tools/bitmaps/logo.png [new file with mode: 0644]
setup/data/tools/bitmaps/modify_edges.bmp [deleted file]
setup/data/tools/bitmaps/modify_edges.png [new file with mode: 0644]
setup/data/tools/bitmaps/modify_faces.bmp [deleted file]
setup/data/tools/bitmaps/modify_faces.png [new file with mode: 0644]
setup/data/tools/bitmaps/modify_vertices.bmp [deleted file]
setup/data/tools/bitmaps/modify_vertices.png [new file with mode: 0644]
setup/data/tools/bitmaps/noFalloff.bmp [deleted file]
setup/data/tools/bitmaps/noFalloff.png [new file with mode: 0644]
setup/data/tools/bitmaps/notex.bmp [deleted file]
setup/data/tools/bitmaps/notex.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_bend.bmp [deleted file]
setup/data/tools/bitmaps/patch_bend.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_drilldown.bmp [deleted file]
setup/data/tools/bitmaps/patch_drilldown.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_insdel.bmp [deleted file]
setup/data/tools/bitmaps/patch_insdel.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_showboundingbox.bmp [deleted file]
setup/data/tools/bitmaps/patch_showboundingbox.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_weld.bmp [deleted file]
setup/data/tools/bitmaps/patch_weld.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_wireframe.bmp [deleted file]
setup/data/tools/bitmaps/patch_wireframe.png [new file with mode: 0644]
setup/data/tools/bitmaps/popup_selection.bmp [deleted file]
setup/data/tools/bitmaps/popup_selection.png [new file with mode: 0644]
setup/data/tools/bitmaps/redo.bmp [deleted file]
setup/data/tools/bitmaps/redo.png [new file with mode: 0644]
setup/data/tools/bitmaps/refresh_models.bmp [deleted file]
setup/data/tools/bitmaps/refresh_models.png [new file with mode: 0644]
setup/data/tools/bitmaps/scalelockx.bmp [deleted file]
setup/data/tools/bitmaps/scalelockx.png [new file with mode: 0644]
setup/data/tools/bitmaps/scalelocky.bmp [deleted file]
setup/data/tools/bitmaps/scalelocky.png [new file with mode: 0644]
setup/data/tools/bitmaps/scalelockz.bmp [deleted file]
setup/data/tools/bitmaps/scalelockz.png [new file with mode: 0644]
setup/data/tools/bitmaps/select_mouseresize.bmp [deleted file]
setup/data/tools/bitmaps/select_mouseresize.png [new file with mode: 0644]
setup/data/tools/bitmaps/select_mouserotate.bmp [deleted file]
setup/data/tools/bitmaps/select_mouserotate.png [new file with mode: 0644]
setup/data/tools/bitmaps/select_mousescale.bmp [deleted file]
setup/data/tools/bitmaps/select_mousescale.png [new file with mode: 0644]
setup/data/tools/bitmaps/select_mousetranslate.bmp [deleted file]
setup/data/tools/bitmaps/select_mousetranslate.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_csgmerge.bmp [deleted file]
setup/data/tools/bitmaps/selection_csgmerge.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_csgsubtract.bmp [deleted file]
setup/data/tools/bitmaps/selection_csgsubtract.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_makehollow.bmp [deleted file]
setup/data/tools/bitmaps/selection_makehollow.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selectcompletetall.bmp [deleted file]
setup/data/tools/bitmaps/selection_selectcompletetall.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selectcompletetall_old.bmp [deleted file]
setup/data/tools/bitmaps/selection_selectinside.bmp [deleted file]
setup/data/tools/bitmaps/selection_selectinside.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selectpartialtall.bmp [deleted file]
setup/data/tools/bitmaps/selection_selectpartialtall.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selectpartialtall_old.bmp [deleted file]
setup/data/tools/bitmaps/selection_selecttouching.bmp [deleted file]
setup/data/tools/bitmaps/selection_selecttouching.png [new file with mode: 0644]
setup/data/tools/bitmaps/shadernotex.bmp [deleted file]
setup/data/tools/bitmaps/shadernotex.png [new file with mode: 0644]
setup/data/tools/bitmaps/show_entities.bmp [deleted file]
setup/data/tools/bitmaps/show_entities.png [new file with mode: 0644]
setup/data/tools/bitmaps/splash.bmp [deleted file]
setup/data/tools/bitmaps/splash.png [new file with mode: 0644]
setup/data/tools/bitmaps/texture_browser.bmp [deleted file]
setup/data/tools/bitmaps/texture_browser.png [new file with mode: 0644]
setup/data/tools/bitmaps/texture_lock.bmp [deleted file]
setup/data/tools/bitmaps/texture_lock.png [new file with mode: 0644]
setup/data/tools/bitmaps/textures_popup.bmp [deleted file]
setup/data/tools/bitmaps/textures_popup.png [new file with mode: 0644]
setup/data/tools/bitmaps/undo.bmp [deleted file]
setup/data/tools/bitmaps/undo.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_cameratoggle.bmp [deleted file]
setup/data/tools/bitmaps/view_cameratoggle.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_cameraupdate.bmp [deleted file]
setup/data/tools/bitmaps/view_cameraupdate.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_change.bmp [deleted file]
setup/data/tools/bitmaps/view_change.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_clipper.bmp [deleted file]
setup/data/tools/bitmaps/view_clipper.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_cubicclipping.bmp [deleted file]
setup/data/tools/bitmaps/view_cubicclipping.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_entity.bmp [deleted file]
setup/data/tools/bitmaps/view_entity.png [new file with mode: 0644]
setup/data/tools/bitmaps/white.bmp [deleted file]
setup/data/tools/bitmaps/white.png [new file with mode: 0644]
setup/data/tools/bitmaps/window1.bmp [deleted file]
setup/data/tools/bitmaps/window1.png [new file with mode: 0644]
setup/data/tools/bitmaps/window2.bmp [deleted file]
setup/data/tools/bitmaps/window2.png [new file with mode: 0644]
setup/data/tools/bitmaps/window3.bmp [deleted file]
setup/data/tools/bitmaps/window3.png [new file with mode: 0644]
setup/data/tools/bitmaps/window4.bmp [deleted file]
setup/data/tools/bitmaps/window4.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_caulk.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_caulk.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_dropent.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_dropent.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_merge.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_merge.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_poly.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_poly.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_split.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_split.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_actorclip.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_actorclip.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level1.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level1.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level2.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level2.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level3.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level3.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level4.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level4.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level5.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level5.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level6.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level6.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level7.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level7.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level8.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level8.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_nodraw.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_nodraw.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_stepon.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_stepon.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_weaponclip.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_weaponclip.png [new file with mode: 0644]

diff --git a/.cproject b/.cproject
new file mode 100644 (file)
index 0000000..4a2a398
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+       <storageModule moduleId="org.eclipse.cdt.core.settings">
+               <cconfiguration id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.835953277">
+                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.835953277" moduleId="org.eclipse.cdt.core.settings" name="Default">
+                               <externalSettings/>
+                               <extensions>
+                                       <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                                       <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                                       <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                                       <extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
+                               </extensions>
+                       </storageModule>
+                       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+                               <configuration buildProperties="" description="" id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.835953277" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+                                       <folderInfo id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.835953277.2072262777" name="/" resourcePath="">
+                                               <toolChain id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.1440061656" name="LLVM with Clang (MacOSX)" superClass="cdt.managedbuild.toolchain.llvm.clang.macosx.base">
+                                                       <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.MachO64" id="cdt.managedbuild.target.llvm.macosx.platform.base.220063451" isAbstract="true" name="Debug Platform" osList="macosx" superClass="cdt.managedbuild.target.llvm.macosx.platform.base"/>
+                                                       <builder buildPath="${workspace_loc:/NetRadiant}/Default" id="cdt.managedbuild.target.llvm.builder.base.1826435543" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="CDT Internal Builder" superClass="cdt.managedbuild.target.llvm.builder.base"/>
+                                                       <tool id="cdt.managedbuild.tool.llvm.assembler.base.1540137577" name="LLVM assembler" superClass="cdt.managedbuild.tool.llvm.assembler.base"/>
+                                                       <tool id="cdt.managedbuild.tool.llvm.archiver.base.726448752" name="LLVM archiver" superClass="cdt.managedbuild.tool.llvm.archiver.base"/>
+                                                       <tool id="cdt.managedbuild.tool.llvm.c.compiler.base.423406515" name="LLVM Clang" superClass="cdt.managedbuild.tool.llvm.c.compiler.base">
+                                                               <option id="llvm.c_cpp.compiler.option.include.paths.1177478676" name="Include paths (-I)" superClass="llvm.c_cpp.compiler.option.include.paths" valueType="includePath">
+                                                                       <listOptionValue builtIn="false" value="/opt/local/include"/>
+                                                                       <listOptionValue builtIn="false" value="/opt/local/include/glib-2.0"/>
+                                                                       <listOptionValue builtIn="false" value="/opt/local/include/gtk-2.0"/>
+                                                               </option>
+                                                               <inputType id="cdt.managedbuild.tool.llvm.c.compiler.input.1702833029" superClass="cdt.managedbuild.tool.llvm.c.compiler.input"/>
+                                                       </tool>
+                                                       <tool id="cdt.managedbuild.tool.llvm.cpp.compiler.base.1130692273" name="LLVM Clang++" superClass="cdt.managedbuild.tool.llvm.cpp.compiler.base">
+                                                               <option id="llvm.c_cpp.compiler.option.include.paths.1703680230" name="Include paths (-I)" superClass="llvm.c_cpp.compiler.option.include.paths" valueType="includePath">
+                                                                       <listOptionValue builtIn="false" value="/opt/local/include"/>
+                                                                       <listOptionValue builtIn="false" value="/opt/local/include/gtk-2.0"/>
+                                                                       <listOptionValue builtIn="false" value="/opt/local/include/glib-2.0"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/NetRadiant/plugins}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/NetRadiant/include}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/NetRadiant/radiant}&quot;"/>
+                                                               </option>
+                                                               <inputType id="cdt.managedbuild.tool.llvm.cpp.compiler.input.1553525897" superClass="cdt.managedbuild.tool.llvm.cpp.compiler.input"/>
+                                                       </tool>
+                                                       <tool id="cdt.managedbuild.tool.llvm.c.linker.base.391098519" name="LLVM Clang C linker" superClass="cdt.managedbuild.tool.llvm.c.linker.base"/>
+                                                       <tool id="cdt.managedbuild.tool.llvm.cpp.linker.base.2079349783" name="LLVM Clang C++ linker" superClass="cdt.managedbuild.tool.llvm.cpp.linker.base">
+                                                               <inputType id="cdt.managedbuild.tool.llvm.c.linker.input.1496404439" superClass="cdt.managedbuild.tool.llvm.c.linker.input">
+                                                                       <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+                                                                       <additionalInput kind="additionalinput" paths="$(LIBS)"/>
+                                                               </inputType>
+                                                       </tool>
+                                               </toolChain>
+                                       </folderInfo>
+                                       <sourceEntries>
+                                               <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+                                       </sourceEntries>
+                               </configuration>
+                       </storageModule>
+                       <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+               </cconfiguration>
+       </storageModule>
+       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+               <project id="NetRadiant.null.969150560" name="NetRadiant"/>
+       </storageModule>
+       <storageModule moduleId="scannerConfiguration">
+               <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+       </storageModule>
+       <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+       <storageModule moduleId="refreshScope" versionNumber="2">
+               <configuration configurationName="Default">
+                       <resource resourceType="PROJECT" workspacePath="/NetRadiant"/>
+               </configuration>
+       </storageModule>
+</cproject>
index 1bab8616f5eb3d19c3f966e6bfc0fed8c4fae490..250315188585b8595175591bba8efa14e8f801ff 100644 (file)
@@ -1,3 +1,5 @@
 *.[oda]
+.settings
+games
 install
 games
diff --git a/.project b/.project
new file mode 100644 (file)
index 0000000..daa477f
--- /dev/null
+++ b/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>NetRadiant</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+                       <triggers>clean,full,incremental,</triggers>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+                       <triggers>full,incremental,</triggers>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.cdt.core.cnature</nature>
+               <nature>org.eclipse.cdt.core.ccnature</nature>
+               <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+               <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+       </natures>
+</projectDescription>
index 0be776985a6415a2355329597f1c15610957c4f7..879e8d64756b8fb9c5bce47c06de9d678a7450b2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -233,8 +233,6 @@ ifeq ($(OS),Darwin)
        # workaround: we have no "ldd" for OS X, so...
        LDD =
        OTOOL = otool
-
-       INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install
 else
 
 $(error Unsupported build OS: $(OS))
@@ -1053,7 +1051,6 @@ $(INSTALLDIR)/heretic2/h2data.$(EXE): \
 install-data: binaries
        $(MKDIR) $(INSTALLDIR)/games
        $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
-       [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/
        DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIPPER="$(UNZIPPER)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)"
        $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
        $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
@@ -1067,14 +1064,9 @@ ifeq ($(OS),Win32)
 install-dll: binaries
        MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) 
 else
-ifeq ($(OS),Darwin)
-install-dll: binaries
-       EXE="$(EXE)" MACLIBDIR="$(MACLIBDIR)" CP="$(CP)" OTOOL="$(OTOOL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dylibs.sh
-else
 install-dll: binaries
        @$(ECHO) No DLL inclusion implemented for this target.
 endif
-endif
 
 # release building... NOT for general users
 # these may use tools not in the list that is checked by the build system
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.bmp b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.bmp
deleted file mode 100644 (file)
index bc307e2..0000000
Binary files a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.bmp and /dev/null differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.png b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.png
new file mode 100644 (file)
index 0000000..895cdd8
Binary files /dev/null and b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.png differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.bmp b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.bmp
deleted file mode 100644 (file)
index d95fa28..0000000
Binary files a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.bmp and /dev/null differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.png b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.png
new file mode 100644 (file)
index 0000000..e03b63a
Binary files /dev/null and b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.png differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.bmp b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.bmp
deleted file mode 100644 (file)
index 6af8308..0000000
Binary files a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.bmp and /dev/null differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.png b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.png
new file mode 100644 (file)
index 0000000..cbc9809
Binary files /dev/null and b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.png differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.bmp b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.bmp
deleted file mode 100644 (file)
index de9f4df..0000000
Binary files a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.bmp and /dev/null differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.png b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.png
new file mode 100644 (file)
index 0000000..8ecffa7
Binary files /dev/null and b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.png differ
index 447057110ad4d99fe5fcdebdb7eed55ba8a37473..35fb072071286131eff680f1ea983cd2e79c63b2 100644 (file)
@@ -107,28 +107,28 @@ struct toolbar_button_info_s
 struct toolbar_button_info_s toolbar_buttons[NUM_TOOLBAR_BUTTONS] =
 {
        {
-               "bkgrnd2d_xy_toggle.bmp",
+               "bkgrnd2d_xy_toggle.png",
                "xy background",
                "Toggle xy background image",
                DoBkgrndToggleXY,
                IToolbarButton::eToggleButton
        },
        {
-               "bkgrnd2d_xz_toggle.bmp",
+               "bkgrnd2d_xz_toggle.png",
                "xz background",
                "Toggle xz background image",
                DoBkgrndToggleXZ,
                IToolbarButton::eToggleButton
        },
        {
-               "bkgrnd2d_yz_toggle.bmp",
+               "bkgrnd2d_yz_toggle.png",
                "yz background",
                "Toggle yz background image",
                DoBkgrndToggleYZ,
                IToolbarButton::eToggleButton
        },
        {
-               "bkgrnd2d_conf.bmp",
+               "bkgrnd2d_conf.png",
                "Configure",
                "Configure background images",
                ShowBackgroundDialog,
diff --git a/contrib/bobtoolz/bitmaps/README-bitmaps.txt b/contrib/bobtoolz/bitmaps/README-bitmaps.txt
new file mode 100644 (file)
index 0000000..48e7794
--- /dev/null
@@ -0,0 +1 @@
+bobtoolz bitmaps are in setup/data/tools/plugins/bitmaps 
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_caulk.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_caulk.bmp
deleted file mode 100644 (file)
index 5223950..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_caulk.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_cleanup.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_cleanup.bmp
deleted file mode 100644 (file)
index 33cc949..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_cleanup.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_dropent.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_dropent.bmp
deleted file mode 100644 (file)
index 2fcdcba..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_dropent.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_merge.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_merge.bmp
deleted file mode 100644 (file)
index cc5e272..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_merge.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_poly.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_poly.bmp
deleted file mode 100644 (file)
index ed720e9..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_poly.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_split.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_split.bmp
deleted file mode 100644 (file)
index fbb1571..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_split.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_trainpathplot.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_trainpathplot.bmp
deleted file mode 100644 (file)
index 66537dc..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_trainpathplot.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_treeplanter.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_treeplanter.bmp
deleted file mode 100644 (file)
index 08f55f3..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_treeplanter.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_turnedge.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_turnedge.bmp
deleted file mode 100644 (file)
index b72cb2a..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_turnedge.bmp and /dev/null differ
index c4a057bd6a365bb155f214a258ee4608d46b33ce..a0a63878ca743a1c2e7f7aedea906da08d284ab6 100644 (file)
@@ -166,20 +166,20 @@ class CBobtoolzToolbarButton : public IToolbarButton
 public:
 virtual const char* getImage() const {
        switch ( mIndex ) {
-       case 0: return "bobtoolz_cleanup.bmp";
-       case 1: return "bobtoolz_poly.bmp";
-       case 2: return "bobtoolz_caulk.bmp";
+       case 0: return "bobtoolz_cleanup.png";
+       case 1: return "bobtoolz_poly.png";
+       case 2: return "bobtoolz_caulk.png";
        case 3: return "";
-       case 4: return "bobtoolz_treeplanter.bmp";
-       case 5: return "bobtoolz_trainpathplot.bmp";
-       case 6: return "bobtoolz_dropent.bmp";
+       case 4: return "bobtoolz_treeplanter.png";
+       case 5: return "bobtoolz_trainpathplot.png";
+       case 6: return "bobtoolz_dropent.png";
        case 7: return "";
-       case 8: return "bobtoolz_merge.bmp";
-       case 9: return "bobtoolz_split.bmp";
-       case 10: return "bobtoolz_splitrow.bmp";
-       case 11: return "bobtoolz_splitcol.bmp";
+       case 8: return "bobtoolz_merge.png";
+       case 9: return "bobtoolz_split.png";
+       case 10: return "bobtoolz_splitrow.png";
+       case 11: return "bobtoolz_splitcol.png";
        case 12: return "";
-       case 13: return "bobtoolz_turnedge.bmp";
+       case 13: return "bobtoolz_turnedge.png";
        }
        return NULL;
 }
diff --git a/contrib/camera/bitmaps/camera_insp.bmp b/contrib/camera/bitmaps/camera_insp.bmp
deleted file mode 100644 (file)
index 1286716..0000000
Binary files a/contrib/camera/bitmaps/camera_insp.bmp and /dev/null differ
diff --git a/contrib/camera/bitmaps/camera_insp.png b/contrib/camera/bitmaps/camera_insp.png
new file mode 100644 (file)
index 0000000..fd9c24f
Binary files /dev/null and b/contrib/camera/bitmaps/camera_insp.png differ
index b49c88d7f1d0d3b477b0beb9cbd0416393fee954..9925dbabb597eaa4121349b6481ce9231f7c1d93 100644 (file)
@@ -132,7 +132,7 @@ class CameraInspectorButton : public IToolbarButton
 {
 public:
 virtual const char* getImage() const {
-       return "camera_insp.bmp";
+       return "camera_insp.jpg";
 }
 virtual const char* getText() const {
        return "Inspector";
diff --git a/contrib/ufoaiplug/bitmaps/README-bitmaps.txt b/contrib/ufoaiplug/bitmaps/README-bitmaps.txt
new file mode 100644 (file)
index 0000000..575e508
--- /dev/null
@@ -0,0 +1 @@
+ufoaiplug bitmaps are in setup/data/tools/plugins/bitmaps 
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_actorclip.bmp b/contrib/ufoaiplug/bitmaps/ufoai_actorclip.bmp
deleted file mode 100644 (file)
index 43bdf93..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_actorclip.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level1.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level1.bmp
deleted file mode 100644 (file)
index 80a4b29..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level1.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level2.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level2.bmp
deleted file mode 100644 (file)
index e84e254..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level2.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level3.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level3.bmp
deleted file mode 100644 (file)
index 141c324..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level3.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level4.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level4.bmp
deleted file mode 100644 (file)
index 3783a80..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level4.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level5.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level5.bmp
deleted file mode 100644 (file)
index 8f62851..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level5.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level6.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level6.bmp
deleted file mode 100644 (file)
index 418fdd2..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level6.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level7.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level7.bmp
deleted file mode 100644 (file)
index d82dab6..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level7.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level8.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level8.bmp
deleted file mode 100644 (file)
index c380953..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level8.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_nodraw.bmp b/contrib/ufoaiplug/bitmaps/ufoai_nodraw.bmp
deleted file mode 100644 (file)
index b994856..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_nodraw.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_stepon.bmp b/contrib/ufoaiplug/bitmaps/ufoai_stepon.bmp
deleted file mode 100644 (file)
index 828449e..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_stepon.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_weaponclip.bmp b/contrib/ufoaiplug/bitmaps/ufoai_weaponclip.bmp
deleted file mode 100644 (file)
index fe6b348..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_weaponclip.bmp and /dev/null differ
index afbb47b21235da7d9990a805d80008ce6ad94b57..c1f3f4c8643f0db846595e7e17fbb8e913a75118 100644 (file)
@@ -88,18 +88,18 @@ public:
 virtual const char* getImage() const {
        switch ( mIndex )
        {
-       case 0: return "ufoai_level1.bmp";
-       case 1: return "ufoai_level2.bmp";
-       case 2: return "ufoai_level3.bmp";
-       case 3: return "ufoai_level4.bmp";
-       case 4: return "ufoai_level5.bmp";
-       case 5: return "ufoai_level6.bmp";
-       case 6: return "ufoai_level7.bmp";
-       case 7: return "ufoai_level8.bmp";
-       case 8: return "ufoai_stepon.bmp";
-       case 9: return "ufoai_actorclip.bmp";
-       case 10: return "ufoai_weaponclip.bmp";
-       case 11: return "ufoai_nodraw.bmp";
+       case 0: return "ufoai_level1.png";
+       case 1: return "ufoai_level2.png";
+       case 2: return "ufoai_level3.png";
+       case 3: return "ufoai_level4.png";
+       case 4: return "ufoai_level5.png";
+       case 5: return "ufoai_level6.png";
+       case 6: return "ufoai_level7.png";
+       case 7: return "ufoai_level8.png";
+       case 8: return "ufoai_stepon.png";
+       case 9: return "ufoai_actorclip.png";
+       case 10: return "ufoai_weaponclip.png";
+       case 11: return "ufoai_nodraw.png";
        }
        return NULL;
 }
index ff5b9840cd14a9e7320702fe360e72504b3cebb5..1988972b801f2dec2531d2f043ee16f41b9ced02 100755 (executable)
@@ -153,7 +153,7 @@ pack OpenArenaPack   unknown     zip1   http://ingar.satgnu.net/files/gtkradiant
 pack OsirionPack     GPL         zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/OsirionPack.zip
 pack Q3Pack          proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk/ -r29
 pack Quake2Pack      proprietary zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/Quake2Pack.zip
-pack Quake2WorldPack GPL         svn    svn://jdolan.dyndns.org/quake2world/trunk/gtkradiant
+pack Quake2WorldPack GPL         svn    svn://svn.icculus.org/gtkradiant-gamepacks/Q2WPack/branches/1.5/
 pack QuakePack       GPL         zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/Quake1Pack.zip
 pack TremulousPack   proprietary zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/TremulousPack.zip
 pack UFOAIPack       proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/branches/1.5/
index 59d219dc27bd160cf641e492f59a7779dfe2b931..63a6d7441987a5be37d20c3039485e0a21e78b6a 100644 (file)
@@ -45,7 +45,7 @@ GdkPixbuf* pixbuf_new_from_file_with_mask( const char* filename ){
        }
        else
        {
-               GdkPixbuf* rgba = gdk_pixbuf_add_alpha( rgb, TRUE, 255, 0, 255 );
+               GdkPixbuf* rgba = gdk_pixbuf_add_alpha( rgb, FALSE, 255, 0, 255 );
                gdk_pixbuf_unref( rgb );
                return rgba;
        }
index 80afbe2f13e7a0b65ef093a495926a13fad86665..ac4b0ee00751af7b8422c6b486288295fd9fe13f 100644 (file)
@@ -50,6 +50,27 @@ bool operator()( const std::string& shader, const std::string& other ) const {
 }
 };
 
+static inline bool shader_is_diffuse( const char *shader ){
+       return
+               /* Quake2World */
+               !string_equal_suffix( shader, "_bump" )
+               && !string_equal_suffix( shader, "_glow" )
+               && !string_equal_suffix( shader, "_h" )
+               && !string_equal_suffix( shader, "_local" )
+               && !string_equal_suffix( shader, "_luma" )
+               && !string_equal_suffix( shader, "_nm" )
+               && !string_equal_suffix( shader, "_s" )
+               /* DarkPlaces */
+               && !string_equal_suffix( shader, "_norm" )
+               // (already in Quake2World) && !string_equal_suffix( shader, "_bump" )
+               // (already in Quake2World) && !string_equal_suffix( shader, "_glow" )
+               && !string_equal_suffix( shader, "_gloss" )
+               && !string_equal_suffix( shader, "_pants" )
+               && !string_equal_suffix( shader, "_shirt" )
+               && !string_equal_suffix( shader, "_reflect" )
+               ;
+}
+
 inline bool shader_valid( const char* shader ){
        return string_is_ascii( shader )
                   && strchr( shader, ' ' ) == 0
@@ -57,7 +78,8 @@ inline bool shader_valid( const char* shader ){
                   && strchr( shader, '\r' ) == 0
                   && strchr( shader, '\t' ) == 0
                   && strchr( shader, '\v' ) == 0
-                  && strchr( shader, '\\' ) == 0;
+                  && strchr( shader, '\\' ) == 0
+                  && shader_is_diffuse( shader );
 }
 
 inline const char* GlobalTexturePrefix_get(){
index 40cf65547966f0d1227dd7a86fb17f2fb595bcab..2b8b35307ef5fc35719662607f435366bf9ed9ee 100644 (file)
@@ -128,6 +128,13 @@ inline bool string_equal_prefix( const char* string, const char* prefix ){
        return string_equal_n( string, prefix, string_length( prefix ) );
 }
 
+/// \brief Returns true if the ending of \p string is equal to \p suffix.
+/// O(n)
+inline bool string_equal_suffix( const char* string, const char* suffix){
+       const char *s = string + string_length( string ) - string_length( suffix );
+       return string_equal_n( s , suffix, string_length( suffix ) );
+}
+
 /// \brief Copies \p other into \p string and returns \p string.
 /// Assumes that the space allocated for \p string is at least string_length(other) + 1.
 /// O(n)
index 3f2cc48351fc6d4780ef16caa5a7d209ac9ece4d..ee021936d5611d7304b17e1a2adcd5f7dcd00fc0 100644 (file)
@@ -41,7 +41,7 @@ class ShadersDependencies :
 ImageModuleRef m_bitmapModule;
 public:
 ShadersDependencies() :
-       m_bitmapModule( "bmp" ){
+       m_bitmapModule( "png" ){
 }
 ImageModuleRef& getBitmapModule(){
        return m_bitmapModule;
index 39310e8af2942dba1977aec3c4c359d1b5e4eaab..870854f324be9e003b80666dfa977c8ae7c4cb55 100644 (file)
@@ -207,7 +207,7 @@ Image* loadHeightmap( void* environment, const char* name ){
 Image* loadSpecial( void* environment, const char* name ){
        if ( *name == '_' ) { // special image
                StringOutputStream bitmapName( 256 );
-               bitmapName << GlobalRadiant().getAppPath() << "bitmaps/" << name + 1 << ".bmp";
+               bitmapName << GlobalRadiant().getAppPath() << "bitmaps/" << name + 1 << ".png";
                Image* image = loadBitmap( environment, bitmapName.c_str() );
                if ( image != 0 ) {
                        return image;
@@ -951,7 +951,7 @@ void realise(){
 
                {
                        StringOutputStream name( 256 );
-                       name << GlobalRadiant().getAppPath() << "bitmaps/" << ( IsDefault() ? "notex.bmp" : "shadernotex.bmp" );
+                       name << GlobalRadiant().getAppPath() << "bitmaps/" << ( IsDefault() ? "notex.png" : "shadernotex.png" );
                        m_pTexture = GlobalTexturesCache().capture( LoadImageCallback( 0, loadBitmap ), name.c_str() );
                }
        }
index fdd5cc587a34c7897f18fb3b309497b29f211a42..7a64d396686917cf7951f4241b311cebfb501959 100644 (file)
@@ -1662,7 +1662,7 @@ void Camera_ToggleFarClip(){
 
 
 void CamWnd_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_toggle_button( toolbar, "Cubic clip the camera view (\\)", "view_cubicclipping.bmp", "ToggleCubicClip" );
+       toolbar_append_toggle_button( toolbar, "Cubic clip the camera view (\\)", "view_cubicclipping.png", "ToggleCubicClip" );
 }
 
 void CamWnd_registerShortcuts(){
index 16375c5e12558e150aa9e2d1e7875ed8f7f2566c..ab8b36997a4bdffe1938d3b82716302e27517b97 100644 (file)
@@ -465,7 +465,7 @@ void DoAbout(){
                                        GtkFrame* frame = create_dialog_frame( 0, GTK_SHADOW_IN );
                                        gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( frame ), FALSE, FALSE, 0 );
                                        {
-                                               GtkImage* image = new_local_image( "logo.bmp" );
+                                               GtkImage* image = new_local_image( "logo.png" );
                                                gtk_widget_show( GTK_WIDGET( image ) );
                                                gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( image ) );
                                        }
index 6762360b4cdc08fcb2adba34591f66db5d3ef84d..bd512582607a8dcbe59957cdcaf079abc31fd356 100644 (file)
@@ -200,6 +200,8 @@ void HomePaths_Realise(){
                                g_qeglobals.m_userEnginePath = path.c_str();
                                break;
                        }
+                       path.clear();
+                       path << DirectoryCleaned( g_get_home_dir() ) << prefix << "/";
 #endif
 
 #if defined( WIN32 )
@@ -2271,55 +2273,55 @@ void register_shortcuts(){
 }
 
 void File_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Open an existing map (CTRL + O)", "file_open.bmp", "OpenMap" );
-       toolbar_append_button( toolbar, "Save the active map (CTRL + S)", "file_save.bmp", "SaveMap" );
+       toolbar_append_button( toolbar, "Open an existing map (CTRL + O)", "file_open.png", "OpenMap" );
+       toolbar_append_button( toolbar, "Save the active map (CTRL + S)", "file_save.png", "SaveMap" );
 }
 
 void UndoRedo_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Undo (CTRL + Z)", "undo.bmp", "Undo" );
-       toolbar_append_button( toolbar, "Redo (CTRL + Y)", "redo.bmp", "Redo" );
+       toolbar_append_button( toolbar, "Undo (CTRL + Z)", "undo.png", "Undo" );
+       toolbar_append_button( toolbar, "Redo (CTRL + Y)", "redo.png", "Redo" );
 }
 
 void RotateFlip_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "x-axis Flip", "brush_flipx.bmp", "MirrorSelectionX" );
-       toolbar_append_button( toolbar, "x-axis Rotate", "brush_rotatex.bmp", "RotateSelectionX" );
-       toolbar_append_button( toolbar, "y-axis Flip", "brush_flipy.bmp", "MirrorSelectionY" );
-       toolbar_append_button( toolbar, "y-axis Rotate", "brush_rotatey.bmp", "RotateSelectionY" );
-       toolbar_append_button( toolbar, "z-axis Flip", "brush_flipz.bmp", "MirrorSelectionZ" );
-       toolbar_append_button( toolbar, "z-axis Rotate", "brush_rotatez.bmp", "RotateSelectionZ" );
+       toolbar_append_button( toolbar, "x-axis Flip", "brush_flipx.png", "MirrorSelectionX" );
+       toolbar_append_button( toolbar, "x-axis Rotate", "brush_rotatex.png", "RotateSelectionX" );
+       toolbar_append_button( toolbar, "y-axis Flip", "brush_flipy.png", "MirrorSelectionY" );
+       toolbar_append_button( toolbar, "y-axis Rotate", "brush_rotatey.png", "RotateSelectionY" );
+       toolbar_append_button( toolbar, "z-axis Flip", "brush_flipz.png", "MirrorSelectionZ" );
+       toolbar_append_button( toolbar, "z-axis Rotate", "brush_rotatez.png", "RotateSelectionZ" );
 }
 
 void Select_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Select touching", "selection_selecttouching.bmp", "SelectTouching" );
-       toolbar_append_button( toolbar, "Select inside", "selection_selectinside.bmp", "SelectInside" );
+       toolbar_append_button( toolbar, "Select touching", "selection_selecttouching.png", "SelectTouching" );
+       toolbar_append_button( toolbar, "Select inside", "selection_selectinside.png", "SelectInside" );
 }
 
 void CSG_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "CSG Subtract (SHIFT + U)", "selection_csgsubtract.bmp", "CSGSubtract" );
-       toolbar_append_button( toolbar, "CSG Merge (CTRL + U)", "selection_csgmerge.bmp", "CSGMerge" );
-       toolbar_append_button( toolbar, "Hollow", "selection_makehollow.bmp", "CSGHollow" );
+       toolbar_append_button( toolbar, "CSG Subtract (SHIFT + U)", "selection_csgsubtract.png", "CSGSubtract" );
+       toolbar_append_button( toolbar, "CSG Merge (CTRL + U)", "selection_csgmerge.png", "CSGMerge" );
+       toolbar_append_button( toolbar, "Hollow", "selection_makehollow.png", "CSGHollow" );
 }
 
 void ComponentModes_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_toggle_button( toolbar, "Select Vertices (V)", "modify_vertices.bmp", "DragVertices" );
-       toolbar_append_toggle_button( toolbar, "Select Edges (E)", "modify_edges.bmp", "DragEdges" );
-       toolbar_append_toggle_button( toolbar, "Select Faces (F)", "modify_faces.bmp", "DragFaces" );
+       toolbar_append_toggle_button( toolbar, "Select Vertices (V)", "modify_vertices.png", "DragVertices" );
+       toolbar_append_toggle_button( toolbar, "Select Edges (E)", "modify_edges.png", "DragEdges" );
+       toolbar_append_toggle_button( toolbar, "Select Faces (F)", "modify_faces.png", "DragFaces" );
 }
 
 void Clipper_constructToolbar( GtkToolbar* toolbar ){
 
-       toolbar_append_toggle_button( toolbar, "Clipper (X)", "view_clipper.bmp", "ToggleClipper" );
+       toolbar_append_toggle_button( toolbar, "Clipper (X)", "view_clipper.png", "ToggleClipper" );
 }
 
 void XYWnd_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Change views", "view_change.bmp", "NextView" );
+       toolbar_append_button( toolbar, "Change views", "view_change.png", "NextView" );
 }
 
 void Manipulators_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_toggle_button( toolbar, "Translate (W)", "select_mousetranslate.bmp", "MouseTranslate" );
-       toolbar_append_toggle_button( toolbar, "Rotate (R)", "select_mouserotate.bmp", "MouseRotate" );
-       toolbar_append_toggle_button( toolbar, "Scale", "select_mousescale.bmp", "MouseScale" );
-       toolbar_append_toggle_button( toolbar, "Resize (Q)", "select_mouseresize.bmp", "MouseDrag" );
+       toolbar_append_toggle_button( toolbar, "Translate (W)", "select_mousetranslate.png", "MouseTranslate" );
+       toolbar_append_toggle_button( toolbar, "Rotate (R)", "select_mouserotate.png", "MouseRotate" );
+       toolbar_append_toggle_button( toolbar, "Scale", "select_mousescale.png", "MouseScale" );
+       toolbar_append_toggle_button( toolbar, "Resize (Q)", "select_mouseresize.png", "MouseDrag" );
 
        Clipper_constructToolbar( toolbar );
 }
@@ -2375,18 +2377,18 @@ GtkToolbar* create_main_toolbar( MainFrame::EViewStyle style ){
 
        gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
 
-       toolbar_append_toggle_button( toolbar, "Texture Lock (SHIFT +T)", "texture_lock.bmp", "TogTexLock" );
+       toolbar_append_toggle_button( toolbar, "Texture Lock (SHIFT +T)", "texture_lock.png", "TogTexLock" );
 
        gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
 
-       /*GtkButton* g_view_entities_button =*/ toolbar_append_button( toolbar, "Entities (N)", "entities.bmp", "ToggleEntityInspector" );
-       GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.bmp", "ToggleConsole" );
-       GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.bmp", "ToggleTextures" );
+       /*GtkButton* g_view_entities_button =*/ toolbar_append_button( toolbar, "Entities (N)", "entities.png", "ToggleEntityInspector" );
+       GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.png", "ToggleConsole" );
+       GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.png", "ToggleTextures" );
        // TODO: call light inspector
-       //GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.bmp", "ToggleLightInspector");
+       //GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.png", "ToggleLightInspector");
 
        gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
-       /*GtkButton* g_refresh_models_button =*/ toolbar_append_button( toolbar, "Refresh Models", "refresh_models.bmp", "RefreshReferences" );
+       /*GtkButton* g_refresh_models_button =*/ toolbar_append_button( toolbar, "Refresh Models", "refresh_models.png", "RefreshReferences" );
 
 
        // disable the console and texture button in the regular layouts
@@ -2678,7 +2680,7 @@ GtkWindow* create_splash(){
        gtk_window_set_position( window, GTK_WIN_POS_CENTER );
        gtk_container_set_border_width( GTK_CONTAINER( window ), 0 );
 
-       GtkImage* image = new_local_image( "splash.bmp" );
+       GtkImage* image = new_local_image( "splash.png" );
        gtk_widget_show( GTK_WIDGET( image ) );
        gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( image ) );
 
@@ -2722,7 +2724,7 @@ void MainFrame::Create(){
 
 #if !defined( WIN32 )
        {
-               GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask( "bitmaps/icon.bmp" );
+               GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask( "bitmaps/icon.png" );
                if ( pixbuf != 0 ) {
                        gtk_window_set_icon( window, pixbuf );
                        gdk_pixbuf_unref( pixbuf );
@@ -3138,7 +3140,7 @@ void GlobalGL_sharedContextDestroyed(){
 
 void Layout_constructPreferences( PreferencesPage& page ){
        {
-               const char* layouts[] = { "window1.bmp", "window2.bmp", "window3.bmp", "window4.bmp" };
+               const char* layouts[] = { "window1.png", "window2.png", "window3.png", "window4.png" };
                page.appendRadioIcons(
                        "Window Layout",
                        STRING_ARRAY_RANGE( layouts ),
@@ -3324,10 +3326,10 @@ void MainFrame_Construct(){
                const char* ENGINEPATH_ATTRIBUTE =
 #if defined( WIN32 )
                        "enginepath_win32"
-#elif defined( __linux__ ) || defined ( __FreeBSD__ )
-                       "enginepath_linux"
 #elif defined( __APPLE__ )
                        "enginepath_macos"
+#elif defined( __linux__ ) || defined ( __FreeBSD__ )
+                       "enginepath_linux"
 #else
 #error "unknown platform"
 #endif
index a2ab39ee59ccd2b1645541eb09064cb673b07279..a666ee10cb8f9665bb3c44de7efeb1ea37ad5c7b 100644 (file)
@@ -744,7 +744,7 @@ void Patch_registerCommands(){
 }
 
 void Patch_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Put caps on the current patch (SHIFT + C)", "curve_cap.bmp", "CapCurrentCurve" );
+       toolbar_append_button( toolbar, "Put caps on the current patch (SHIFT + C)", "cap_curve.png", "CapCurrentCurve" );
 }
 
 void Patch_constructMenu( GtkMenu* menu ){
@@ -1000,35 +1000,35 @@ EMessageBoxReturn DoCapDlg( ECapDialog* type ){
                                gtk_table_set_col_spacings( table, 5 );
 
                                {
-                                       GtkImage* image = new_local_image( "cap_bevel.bmp" );
+                                       GtkImage* image = new_local_image( "cap_bevel.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 0, 1,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkImage* image = new_local_image( "cap_endcap.bmp" );
+                                       GtkImage* image = new_local_image( "cap_endcap.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 1, 2,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkImage* image = new_local_image( "cap_ibevel.bmp" );
+                                       GtkImage* image = new_local_image( "cap_ibevel.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 2, 3,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkImage* image = new_local_image( "cap_iendcap.bmp" );
+                                       GtkImage* image = new_local_image( "cap_iendcap.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 3, 4,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkImage* image = new_local_image( "cap_cylinder.bmp" );
+                                       GtkImage* image = new_local_image( "cap_cylinder.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 4, 5,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
index cf3fa3bedaa999fd243cbf6224138e387dbd533b..436377f19213d370eda4e579b605b6b920e28377 100644 (file)
@@ -1927,11 +1927,11 @@ void TextureBrowser_checkTagFile(){
 
 void TextureBrowser_SetNotex(){
        StringOutputStream name( 256 );
-       name << GlobalRadiant().getAppPath() << "bitmaps/notex.bmp";
+       name << GlobalRadiant().getAppPath() << "bitmaps/notex.png";
        g_notex = name.c_str();
 
        name = StringOutputStream();
-       name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.bmp";
+       name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.png";
        g_shadernotex = name.c_str();
 }
 
diff --git a/setup/apple/.gitignore b/setup/apple/.gitignore
new file mode 100644 (file)
index 0000000..e420ee4
--- /dev/null
@@ -0,0 +1 @@
+target/*
diff --git a/setup/apple/Makefile b/setup/apple/Makefile
new file mode 100644 (file)
index 0000000..cf85d97
--- /dev/null
@@ -0,0 +1,83 @@
+# Makefile for NetRadiant.app, requires http://macdylibbundler.sourceforge.net/
+
+INSTALL = ../../install
+TARGET = target
+RESOURCES = $(TARGET)/NetRadiant.app/Contents/Resources
+BINDIR = $(RESOURCES)/install
+CONFDIR = $(RESOURCES)/etc
+DATADIR = $(RESOURCES)/share
+LIBDIR = $(RESOURCES)/lib
+VERSION = 1.5.0
+DMG = $(TARGET)/NetRadiant-$(VERSION).dmg
+VOLUME_NAME = "NetRadiant $(VERSION)"
+
+# We must rewrite some Gtk configuration files, which vary from environment to
+# environment depending on where you've installed MacPorts. Fun!
+
+MACPORTS_PREFIX := $(shell which port | sed 's:/bin/port::')
+PREFIX_SED_EXPR = "s:$(MACPORTS_PREFIX):@executable_path/..:g"
+
+all: install bundle
+
+-pre-install:
+       install -d $(TARGET)
+       cp -r NetRadiant.app $(TARGET)
+       find $(TARGET) -name .turd -delete
+       
+-gtk-runtime-gdk-pixbuf-2.0:
+       cp -r $(MACPORTS_PREFIX)/lib/gdk-pixbuf-2.0 $(LIBDIR)
+       find $(LIBDIR)/gdk-pixbuf-2.0 -type f ! -name "*.so" -delete
+       
+       gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \
+               $(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders
+
+-gtk-runtime-pango:
+       cp -r $(MACPORTS_PREFIX)/lib/pango $(LIBDIR)
+       find $(LIBDIR)/pango -type f ! -name "*.so" -delete
+       
+       pango-querymodules | sed $(PREFIX_SED_EXPR) > \
+               $(CONFDIR)/pango/pango.modules
+       
+-gtk-runtime: -gtk-runtime-gdk-pixbuf-2.0 -gtk-runtime-pango
+       cp -r $(MACPORTS_PREFIX)/lib/gtk-2.0 $(LIBDIR)
+       find $(LIBDIR)/gtk-2.0 -type f ! -name "*.so" -delete   
+       
+       rm -rf $(LIBDIR)/gtk-2.0/{includes,modules}
+       rm -rf $(LIBDIR)/gtk-2.0/*/printbackends
+       
+       cp -r $(MACPORTS_PREFIX)/share/themes/Default $(RESOURCES)/share
+       
+       gtk-query-immodules-2.0 | sed $(PREFIX_SED_EXPR) > \
+               $(CONFDIR)/gtk-2.0/gtk.immodules
+
+install: -pre-install -gtk-runtime
+       cp -r $(INSTALL) $(RESOURCES)
+       #rm -rf `find $(INSTDIR)/installs -type d -name .svn`
+
+bundle:
+       
+       # The Radiant plugins (modules) are a little funky
+       # Some of them are actually linked against the build directory
+       
+       test -L install || ln -s $(INSTALL)
+       
+       dylibbundler -b \
+               -x $(BINDIR)/radiant \
+               -x $(BINDIR)/q2map \
+               -x $(BINDIR)/q3data \
+               -x $(BINDIR)/q3map2 \
+               -x $(BINDIR)/qdata3 \
+               `find $(BINDIR)/modules -name "*.dylib" | xargs -I {} echo -x {}` \
+               `find $(LIBDIR) -name "*.dylib" | xargs -I {} echo -x {}` \
+       -d $(LIBDIR) -of -p @executable_path/../lib
+       
+       rm -f install
+
+image:
+       find $(TARGET) -name .DS_Store -delete
+       ln -f -s /Applications $(TARGET)/Applications
+       hdiutil create -ov $(DMG) -srcfolder $(TARGET) -volname $(VOLUME_NAME)
+       rm $(TARGET)/Applications
+
+clean:
+       rm -rf $(TARGET)/*
diff --git a/setup/apple/NetRadiant.app/Contents/Info.plist b/setup/apple/NetRadiant.app/Contents/Info.plist
new file mode 100644 (file)
index 0000000..75796b1
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>English</string>
+        <key>CFBundleDisplayName</key>
+        <string>NetRadiant</string>
+        <key>CFBundleExecutable</key>
+        <string>radiant</string>
+        <key>CFBundleIconFile</key>
+        <string>radiant.icns</string>
+        <key>CFBundleIdentifier</key>
+        <string>org.xonotic.netradiant</string>
+        <key>CFBundleName</key>
+        <string>NetRadiant</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.5.0</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>1.5.0</string>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.7</string>
+</dict>
+</plist>
diff --git a/setup/apple/NetRadiant.app/Contents/MacOS/radiant b/setup/apple/NetRadiant.app/Contents/MacOS/radiant
new file mode 100755 (executable)
index 0000000..701a7fe
--- /dev/null
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+RADIANT_HOME=$(dirname "$0")
+RADIANT_HOME=${RADIANT_HOME/NetRadiant.app*/NetRadiant.app}
+
+echo
+echo "Starting NetRadiant in ${RADIANT_HOME}"
+echo
+
+set -x
+
+resources="${RADIANT_HOME}/Contents/Resources"
+
+export FONTCONFIG_PATH="${resources}/etc/fonts"
+export FC_DEBUG=1024
+
+export GDK_GL_LIBGL_PATH="${resources}/lib/libGL.1.dylib"
+export GDK_GL_LIBGLU_PATH="${resources}/lib/libGLU.1.dylib"
+
+export GDK_PATH="${resources}"
+export GDK_PIXBUF_MODULE_FILE="${resources}/etc/gtk-2.0/gdk-pixbuf.loaders"
+
+export GOBJECT_PATH="${resources}"
+
+export GTK_DATA_PREFIX="${resources}"
+export GTK_EXE_PREFIX="${resources}"
+export GTK_PATH="${resources}"
+
+export PANGO_SYSCONFDIR="${resources}/etc"
+export PANGO_LIBDIR="${resources}/lib"
+
+cd "${resources}/install"
+./radiant &
+
+set +x
\ No newline at end of file
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf b/setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf
new file mode 100644 (file)
index 0000000..7183a4b
--- /dev/null
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!--
+  Adjusted FontConfig for GtkRadiant.app. Include only paths which Mac users
+  will more than likely have.
+-->
+
+<!--
+  Font directory list
+-->
+       <dir>/usr/X11/lib/X11/fonts</dir>
+       <dir>/Library/Fonts</dir>
+       <dir>/System/Library/Fonts</dir>
+       <dir prefix="xdg">fonts</dir>
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>mono</string>
+               </test>
+               <edit name="family" mode="assign" binding="same">
+                       <string>monospace</string>
+               </edit>
+       </match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans serif</string>
+               </test>
+               <edit name="family" mode="assign" binding="same">
+                       <string>sans-serif</string>
+               </edit>
+       </match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans</string>
+               </test>
+               <edit name="family" mode="assign" binding="same">
+                       <string>sans-serif</string>
+               </edit>
+       </match>
+
+<!-- Font cache directory list -->
+       <cachedir prefix="xdg">fontconfig</cachedir>
+
+       <config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+               <blank>
+                       <int>0x0020</int>       <!-- SPACE -->
+                       <int>0x00A0</int>       <!-- NO-BREAK SPACE -->
+                       <int>0x00AD</int>       <!-- SOFT HYPHEN -->
+                       <int>0x034F</int>       <!-- COMBINING GRAPHEME JOINER -->
+                       <int>0x0600</int>       <!-- ARABIC NUMBER SIGN -->
+                       <int>0x0601</int>       <!-- ARABIC SIGN SANAH -->
+                       <int>0x0602</int>       <!-- ARABIC FOOTNOTE MARKER -->
+                       <int>0x0603</int>       <!-- ARABIC SIGN SAFHA -->
+                       <int>0x06DD</int>       <!-- ARABIC END OF AYAH -->
+                       <int>0x070F</int>       <!-- SYRIAC ABBREVIATION MARK -->
+                       <int>0x115F</int>       <!-- HANGUL CHOSEONG FILLER -->
+                       <int>0x1160</int>       <!-- HANGUL JUNGSEONG FILLER -->
+                       <int>0x1680</int>       <!-- OGHAM SPACE MARK -->
+                       <int>0x17B4</int>       <!-- KHMER VOWEL INHERENT AQ -->
+                       <int>0x17B5</int>       <!-- KHMER VOWEL INHERENT AA -->
+                       <int>0x180E</int>       <!-- MONGOLIAN VOWEL SEPARATOR -->
+                       <int>0x2000</int>       <!-- EN QUAD -->
+                       <int>0x2001</int>       <!-- EM QUAD -->
+                       <int>0x2002</int>       <!-- EN SPACE -->
+                       <int>0x2003</int>       <!-- EM SPACE -->
+                       <int>0x2004</int>       <!-- THREE-PER-EM SPACE -->
+                       <int>0x2005</int>       <!-- FOUR-PER-EM SPACE -->
+                       <int>0x2006</int>       <!-- SIX-PER-EM SPACE -->
+                       <int>0x2007</int>       <!-- FIGURE SPACE -->
+                       <int>0x2008</int>       <!-- PUNCTUATION SPACE -->
+                       <int>0x2009</int>       <!-- THIN SPACE -->
+                       <int>0x200A</int>       <!-- HAIR SPACE -->
+                       <int>0x200B</int>       <!-- ZERO WIDTH SPACE -->
+                       <int>0x200C</int>       <!-- ZERO WIDTH NON-JOINER -->
+                       <int>0x200D</int>       <!-- ZERO WIDTH JOINER -->
+                       <int>0x200E</int>       <!-- LEFT-TO-RIGHT MARK -->
+                       <int>0x200F</int>       <!-- RIGHT-TO-LEFT MARK -->
+                       <int>0x2028</int>       <!-- LINE SEPARATOR -->
+                       <int>0x2029</int>       <!-- PARAGRAPH SEPARATOR -->
+                       <int>0x202A</int>       <!-- LEFT-TO-RIGHT EMBEDDING -->
+                       <int>0x202B</int>       <!-- RIGHT-TO-LEFT EMBEDDING -->
+                       <int>0x202C</int>       <!-- POP DIRECTIONAL FORMATTING -->
+                       <int>0x202D</int>       <!-- LEFT-TO-RIGHT OVERRIDE -->
+                       <int>0x202E</int>       <!-- RIGHT-TO-LEFT OVERRIDE -->
+                       <int>0x202F</int>       <!-- NARROW NO-BREAK SPACE -->
+                       <int>0x205F</int>       <!-- MEDIUM MATHEMATICAL SPACE -->
+                       <int>0x2060</int>       <!-- WORD JOINER -->
+                       <int>0x2061</int>       <!-- FUNCTION APPLICATION -->
+                       <int>0x2062</int>       <!-- INVISIBLE TIMES -->
+                       <int>0x2063</int>       <!-- INVISIBLE SEPARATOR -->
+                       <int>0x206A</int>       <!-- INHIBIT SYMMETRIC SWAPPING -->
+                       <int>0x206B</int>       <!-- ACTIVATE SYMMETRIC SWAPPING -->
+                       <int>0x206C</int>       <!-- INHIBIT ARABIC FORM SHAPING -->
+                       <int>0x206D</int>       <!-- ACTIVATE ARABIC FORM SHAPING -->
+                       <int>0x206E</int>       <!-- NATIONAL DIGIT SHAPES -->
+                       <int>0x206F</int>       <!-- NOMINAL DIGIT SHAPES -->
+                       <int>0x2800</int>       <!-- BRAILLE PATTERN BLANK -->
+                       <int>0x3000</int>       <!-- IDEOGRAPHIC SPACE -->
+                       <int>0x3164</int>       <!-- HANGUL FILLER -->
+                       <int>0xFEFF</int>       <!-- ZERO WIDTH NO-BREAK SPACE -->
+                       <int>0xFFA0</int>       <!-- HALFWIDTH HANGUL FILLER -->
+                       <int>0xFFF9</int>       <!-- INTERLINEAR ANNOTATION ANCHOR -->
+                       <int>0xFFFA</int>       <!-- INTERLINEAR ANNOTATION SEPARATOR -->
+                       <int>0xFFFB</int>       <!-- INTERLINEAR ANNOTATION TERMINATOR -->
+               </blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+               <rescan>
+                       <int>30</int>
+               </rescan>
+       </config>
+
+</fontconfig>
+
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc b/setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc b/setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc
new file mode 100644 (file)
index 0000000..f56d343
--- /dev/null
@@ -0,0 +1 @@
+[Pango]
\ No newline at end of file
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/lib/.turd b/setup/apple/NetRadiant.app/Contents/Resources/lib/.turd
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/radiant.icns b/setup/apple/NetRadiant.app/Contents/Resources/radiant.icns
new file mode 100644 (file)
index 0000000..339e718
Binary files /dev/null and b/setup/apple/NetRadiant.app/Contents/Resources/radiant.icns differ
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd b/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd b/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/setup/apple/README.md b/setup/apple/README.md
new file mode 100644 (file)
index 0000000..069cf3d
--- /dev/null
@@ -0,0 +1,50 @@
+NetRadiant for Apple OS X
+========================
+
+This directory provides packaging steps for NetRadiant for OS X. This document describes compiling the application on OSX as well as generating distributable bundles using the framework provided in this directory.
+
+Dependencies & Compilation
+--------------------------
+
+Directions for OS X Yosemite 10.10 - your mileage may vary:
+
+- Install [MacPorts](http://macports.org).
+- Install [XQuartz](http://xquartz.macosforge.org/)
+
+- Install dependencies with MacPorts:
+
+```
+sudo port install dylibbundler pkgconfig gtkglext
+```
+
+- Get the NetRadiant code and compile:
+
+```
+git clone https://gitlab.com/xonotic/netradiant.git
+cd netradiant/
+make
+```
+
+- Run the build:
+
+(from the netradiant/ directory)
+```
+./install/radiant
+```
+
+XQuartz note: on my configuration XQuartz doesn't automatically start for some reason. I have to open another terminal, and run the following command: `/Applications/Utilities/XQuartz.app/Contents/MacOS/X11.bin`, then start radiant. 
+    
+Building NetRadiant.app
+-----------------------
+
+The `Makefile` in the 'setup/apple/' directory will produce a distributable .app bundle for NetRadiant using `dylibbundler`:
+
+```
+make
+make image
+```
+
+Getting help
+------------
+
+IRC: Quakenet #xonotic, or post something on the issue tracker..
diff --git a/setup/data/osx/NetRadiant.app/Contents/Info.plist b/setup/data/osx/NetRadiant.app/Contents/Info.plist
deleted file mode 100644 (file)
index 81e377d..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>netradiant.sh</string>
-       <key>CFBundleIconFile</key>
-       <string>NetRadiant</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.5.0</string>
-</dict>
-</plist>
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf
deleted file mode 100755 (executable)
index 86dc8af..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/fonts.conf file to configure system font access -->
-<fontconfig>
-
-<!--
-       DO NOT EDIT THIS FILE.
-       IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
-       LOCAL CHANGES BELONG IN 'local.conf'.
-
-       The intent of this standard configuration file is to be adequate for
-       most environments.  If you have a reasonably normal environment and
-       have found problems with this configuration, they are probably
-       things that others will also want fixed.  Please submit any
-       problems to the fontconfig bugzilla system located at fontconfig.org
-
-       Note that the normal 'make install' procedure for fontconfig is to
-       replace any existing fonts.conf file with the new version.  Place
-       any local customizations in local.conf which this file references.
-
-       Keith Packard
--->
-
-<!-- Font directory list -->
-
-       <dir>/usr/share/fonts</dir>
-       <dir>/usr/X11/lib/X11/fonts</dir> <dir>/Library/Fonts</dir> <dir>/Network/Library/Fonts</dir> <dir>/System/Library/Fonts</dir> <dir>/opt/local/share/fonts</dir>
-       <dir>~/.fonts</dir>
-
-<!--
-  Accept deprecated 'mono' alias, replacing it with 'monospace'
--->
-       <match target="pattern">
-               <test qual="any" name="family">
-                       <string>mono</string>
-               </test>
-               <edit name="family" mode="assign">
-                       <string>monospace</string>
-               </edit>
-       </match>
-
-<!--
-  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
--->
-       <match target="pattern">
-               <test qual="any" name="family">
-                       <string>sans serif</string>
-               </test>
-               <edit name="family" mode="assign">
-                       <string>sans-serif</string>
-               </edit>
-       </match>
-
-<!--
-  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
--->
-       <match target="pattern">
-               <test qual="any" name="family">
-                       <string>sans</string>
-               </test>
-               <edit name="family" mode="assign">
-                       <string>sans-serif</string>
-               </edit>
-       </match>
-
-<!--
-  Load local system customization file
--->
-       <include ignore_missing="yes">conf.d</include>
-
-<!-- Font cache directory list -->
-
-       <cachedir>~/.fontconfig</cachedir>
-
-       <config>
-<!--
-  These are the default Unicode chars that are expected to be blank
-  in fonts.  All other blank chars are assumed to be broken and
-  won't appear in the resulting charsets
- -->
-               <blank>
-                       <int>0x0020</int>       <!-- SPACE -->
-                       <int>0x00A0</int>       <!-- NO-BREAK SPACE -->
-                       <int>0x00AD</int>       <!-- SOFT HYPHEN -->
-                       <int>0x034F</int>       <!-- COMBINING GRAPHEME JOINER -->
-                       <int>0x0600</int>       <!-- ARABIC NUMBER SIGN -->
-                       <int>0x0601</int>       <!-- ARABIC SIGN SANAH -->
-                       <int>0x0602</int>       <!-- ARABIC FOOTNOTE MARKER -->
-                       <int>0x0603</int>       <!-- ARABIC SIGN SAFHA -->
-                       <int>0x06DD</int>       <!-- ARABIC END OF AYAH -->
-                       <int>0x070F</int>       <!-- SYRIAC ABBREVIATION MARK -->
-                       <int>0x115F</int>       <!-- HANGUL CHOSEONG FILLER -->
-                       <int>0x1160</int>       <!-- HANGUL JUNGSEONG FILLER -->
-                       <int>0x1680</int>       <!-- OGHAM SPACE MARK -->
-                       <int>0x17B4</int>       <!-- KHMER VOWEL INHERENT AQ -->
-                       <int>0x17B5</int>       <!-- KHMER VOWEL INHERENT AA -->
-                       <int>0x180E</int>       <!-- MONGOLIAN VOWEL SEPARATOR -->
-                       <int>0x2000</int>       <!-- EN QUAD -->
-                       <int>0x2001</int>       <!-- EM QUAD -->
-                       <int>0x2002</int>       <!-- EN SPACE -->
-                       <int>0x2003</int>       <!-- EM SPACE -->
-                       <int>0x2004</int>       <!-- THREE-PER-EM SPACE -->
-                       <int>0x2005</int>       <!-- FOUR-PER-EM SPACE -->
-                       <int>0x2006</int>       <!-- SIX-PER-EM SPACE -->
-                       <int>0x2007</int>       <!-- FIGURE SPACE -->
-                       <int>0x2008</int>       <!-- PUNCTUATION SPACE -->
-                       <int>0x2009</int>       <!-- THIN SPACE -->
-                       <int>0x200A</int>       <!-- HAIR SPACE -->
-                       <int>0x200B</int>       <!-- ZERO WIDTH SPACE -->
-                       <int>0x200C</int>       <!-- ZERO WIDTH NON-JOINER -->
-                       <int>0x200D</int>       <!-- ZERO WIDTH JOINER -->
-                       <int>0x200E</int>       <!-- LEFT-TO-RIGHT MARK -->
-                       <int>0x200F</int>       <!-- RIGHT-TO-LEFT MARK -->
-                       <int>0x2028</int>       <!-- LINE SEPARATOR -->
-                       <int>0x2029</int>       <!-- PARAGRAPH SEPARATOR -->
-                       <int>0x202A</int>       <!-- LEFT-TO-RIGHT EMBEDDING -->
-                       <int>0x202B</int>       <!-- RIGHT-TO-LEFT EMBEDDING -->
-                       <int>0x202C</int>       <!-- POP DIRECTIONAL FORMATTING -->
-                       <int>0x202D</int>       <!-- LEFT-TO-RIGHT OVERRIDE -->
-                       <int>0x202E</int>       <!-- RIGHT-TO-LEFT OVERRIDE -->
-                       <int>0x202F</int>       <!-- NARROW NO-BREAK SPACE -->
-                       <int>0x205F</int>       <!-- MEDIUM MATHEMATICAL SPACE -->
-                       <int>0x2060</int>       <!-- WORD JOINER -->
-                       <int>0x2061</int>       <!-- FUNCTION APPLICATION -->
-                       <int>0x2062</int>       <!-- INVISIBLE TIMES -->
-                       <int>0x2063</int>       <!-- INVISIBLE SEPARATOR -->
-                       <int>0x206A</int>       <!-- INHIBIT SYMMETRIC SWAPPING -->
-                       <int>0x206B</int>       <!-- ACTIVATE SYMMETRIC SWAPPING -->
-                       <int>0x206C</int>       <!-- INHIBIT ARABIC FORM SHAPING -->
-                       <int>0x206D</int>       <!-- ACTIVATE ARABIC FORM SHAPING -->
-                       <int>0x206E</int>       <!-- NATIONAL DIGIT SHAPES -->
-                       <int>0x206F</int>       <!-- NOMINAL DIGIT SHAPES -->
-                       <int>0x2800</int>       <!-- BRAILLE PATTERN BLANK -->
-                       <int>0x3000</int>       <!-- IDEOGRAPHIC SPACE -->
-                       <int>0x3164</int>       <!-- HANGUL FILLER -->
-                       <int>0xFEFF</int>       <!-- ZERO WIDTH NO-BREAK SPACE -->
-                       <int>0xFFA0</int>       <!-- HALFWIDTH HANGUL FILLER -->
-                       <int>0xFFF9</int>       <!-- INTERLINEAR ANNOTATION ANCHOR -->
-                       <int>0xFFFA</int>       <!-- INTERLINEAR ANNOTATION SEPARATOR -->
-                       <int>0xFFFB</int>       <!-- INTERLINEAR ANNOTATION TERMINATOR -->
-               </blank>
-<!--
-  Rescan configuration every 30 seconds when FcFontSetList is called
- -->
-               <rescan>
-                       <int>30</int>
-               </rescan>
-       </config>
-
-</fontconfig>
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.dtd b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.dtd
deleted file mode 100755 (executable)
index cbdfdab..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-<!-- This is the Document Type Definition for font configuration files -->
-<!ELEMENT fontconfig (dir | 
-                     cache | 
-                     cachedir |
-                     include | 
-                     config |
-                     selectfont |
-                     match | 
-                     alias)* >
-
-<!-- 
-    Add a directory that provides fonts
--->
-<!ELEMENT dir (#PCDATA)>
-<!ATTLIST dir xml:space (default|preserve) 'preserve'>
-
-<!--
-    Define the per-user file that holds cache font information.
-
-    If the filename begins with '~', it is replaced with the users
-    home directory path.
--->
-<!ELEMENT cache (#PCDATA)>
-<!ATTLIST cache xml:space (default|preserve) 'preserve'>
-
-<!--
-    Add a directory that is searched for font cache files.
-    These hold per-directory cache data and are searched in
-    order for each directory. When writing cache files, the first
-    directory which allows the cache file to be created is used.
-
-    A leading '~' in a directory name is replaced with the users
-    home directory path.
--->
-<!ELEMENT cachedir (#PCDATA)>
-<!ATTLIST cachedir xml:space (default|preserve) 'preserve'>
-
-<!--
-    Reference another configuration file; note that this
-    is another complete font configuration file and not
-    just a file included by the XML parser.
-
-    Set 'ignore_missing' to 'yes' if errors are to be ignored.
-
-    If the filename begins with '~', it is replaced with the users
-    home directory path.
--->
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
-         ignore_missing    (no|yes)            "no"
-         xml:space         (default|preserve)  "preserve">
-
-<!--
-    Global library configuration data
- -->
-<!ELEMENT config (blank|rescan)*>
-
-<!--
-    Specify the set of Unicode encoding values which
-    represent glyphs that are allowed to contain no
-    data.  With this list, fontconfig can examine
-    fonts for broken glyphs and eliminate them from
-    the set of valid Unicode chars.  This idea
-    was borrowed from Mozilla
- -->
-<!ELEMENT blank (int)*>
-
-<!--
-    Aliases are just a special case for multiple match elements
-
-    They are syntactically equivalent to:
-
-    <match>
-       <test name="family">
-           <string value=[family]/>
-       </test>
-       <edit name="family" mode="prepend">
-           <string value=[prefer]/>
-           ...
-       </edit>
-       <edit name="family" mode="append">
-           <string value=[accept]/>
-           ...
-       </edit>
-       <edit name="family" mode="append_last">
-           <string value=[default]/>
-           ...
-       </edit>
-    </match>
--->
-<!--
-    Periodically rescan the font configuration and
-    directories to synch internal state with filesystem
- -->
-<!ELEMENT rescan (int)>
-
-<!--
-    Edit list of available fonts at startup/reload time
- -->
-<!ELEMENT selectfont (rejectfont | acceptfont)* >
-
-<!ELEMENT rejectfont (glob | pattern)*>
-
-<!ELEMENT acceptfont (glob | pattern)*>
-
-<!ELEMENT glob (#PCDATA)>
-
-<!ELEMENT pattern (patelt)*>
-
-<!ENTITY % constant 'int|double|string|matrix|bool|charset|const'>
-
-<!ELEMENT patelt (%constant;)*>
-<!ATTLIST patelt
-         name CDATA    #REQUIRED>
-
-<!ELEMENT alias (family*, prefer?, accept?, default?)>
-<!ATTLIST alias
-         binding (weak|strong|same) "weak">
-<!ELEMENT prefer (family)*>
-<!ELEMENT accept (family)*>
-<!ELEMENT default (family)*>
-<!ELEMENT family (#PCDATA)>
-<!ATTLIST family xml:space (default|preserve) 'preserve'>
-
-<!ENTITY % expr 'int|double|string|matrix|bool|charset
-               |name|const
-               |or|and|eq|not_eq|less|less_eq|more|more_eq|contains|not_contains
-               |plus|minus|times|divide|not|if|floor|ceil|round|trunc'>
-
-<!--
-    Match and edit patterns.
-
-    If 'target' is 'pattern', execute the match before selecting a font.
-    if 'target' is 'font', execute the match on the result of a font
-    selection.
--->
-<!ELEMENT match (test*, edit*)>
-<!ATTLIST match
-         target (pattern|font|scan) "pattern">
-
-<!--
-    Match a field in a pattern
-
-    if 'qual' is 'any', then the match succeeds if any value in the field matches.
-    if 'qual' is 'all', then the match succeeds only if all values match.
-    if 'qual' is 'first', then the match succeeds only if the first value matches.
-    if 'qual' is 'not_first', then the match succeeds only if any value other than
-       the first matches.
-    For match elements with target=font, if test 'target' is 'pattern',
-    then the test is applied to the pattern used in matching rather than
-    to the resulting font.
-
-    Match elements with target=scan are applied as fonts are scanned.
-    They edit the pattern generated from the scanned font and affect
-    what the fontconfig database contains.
--->
-<!ELEMENT test (%expr;)*>
-<!ATTLIST test 
-         qual (any|all|first|not_first)    "any"
-         name CDATA        #REQUIRED
-         target (pattern|font|default)         "default"
-         compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains)   "eq">
-
-<!--
-    Edit a field in a pattern
-
-    The enclosed values are used together to edit the list of values
-    associated with 'name'.
-
-    If 'name' matches one of those used in a test element for this match element:
-       if 'mode' is 'assign', replace the matched value.
-       if 'mode' is 'assign_replace', replace all of the values
-       if 'mode' is 'prepend', insert before the matched value
-       if 'mode' is 'append', insert after the matched value
-       if 'mode' is 'prepend_first', insert before all of the values
-       if 'mode' is 'append_last', insert after all of the values
-    If 'name' doesn't match any of those used in a test element:
-       if 'mode' is 'assign' or 'assign_replace, replace all of the values
-       if 'mode' is 'prepend' or 'prepend_first', insert before all of the values
-       if 'mode' is 'append' or 'append_last', insert after all of the values
--->
-<!ELEMENT edit (%expr;)*>
-<!ATTLIST edit
-         name CDATA        #REQUIRED
-         mode (assign|assign_replace|prepend|append|prepend_first|append_last) "assign"
-         binding (weak|strong|same) "weak">
-
-<!--
-    Elements of expressions follow
--->
-<!ELEMENT int (#PCDATA)>
-<!ATTLIST int xml:space (default|preserve) 'preserve'>
-<!ELEMENT double (#PCDATA)>
-<!ATTLIST double xml:space (default|preserve) 'preserve'>
-<!ELEMENT string (#PCDATA)>
-<!ATTLIST string xml:space (default|preserve) 'preserve'>
-<!ELEMENT matrix (double,double,double,double)>
-<!ELEMENT bool (#PCDATA)>
-<!ELEMENT charset (#PCDATA)>
-<!ATTLIST charset xml:space (default|preserve) 'preserve'>
-<!ELEMENT name (#PCDATA)>
-<!ATTLIST name xml:space (default|preserve) 'preserve'>
-<!ELEMENT const (#PCDATA)>
-<!ATTLIST const xml:space (default|preserve) 'preserve'>
-<!ELEMENT or (%expr;)*>
-<!ELEMENT and (%expr;)*>
-<!ELEMENT eq ((%expr;), (%expr;))>
-<!ELEMENT not_eq ((%expr;), (%expr;))>
-<!ELEMENT less ((%expr;), (%expr;))>
-<!ELEMENT less_eq ((%expr;), (%expr;))>
-<!ELEMENT more ((%expr;), (%expr;))>
-<!ELEMENT more_eq ((%expr;), (%expr;))>
-<!ELEMENT contains ((%expr;), (%expr;))>
-<!ELEMENT not_contains ((%expr;), (%expr;))>
-<!ELEMENT plus (%expr;)*>
-<!ELEMENT minus (%expr;)*>
-<!ELEMENT times (%expr;)*>
-<!ELEMENT divide (%expr;)*>
-<!ELEMENT not (%expr;)>
-<!ELEMENT if ((%expr;), (%expr;), (%expr;))>
-<!ELEMENT floor (%expr;)>
-<!ELEMENT ceil (%expr;)>
-<!ELEMENT round (%expr;)>
-<!ELEMENT trunc (%expr;)>
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders
deleted file mode 100644 (file)
index f8852a2..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# GdkPixbuf Image Loader Modules file
-# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders from gtk+-2.6.10
-#
-# LoaderDir = /sw.haha/lib/gtk-2.0/2.4.0/loaders
-#
-"./libpixbufloader-bmp.so"
-"bmp" 5 "gtk20" "The BMP image format"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules
deleted file mode 100644 (file)
index 9eecea4..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Pango Modules file
-# Automatically generated file, do not edit
-#
-# ModulesPath = /sw.haha/lib/pango/1.4.0/modules
-#
-./pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc armenian:* bopomofo:* cherokee:* coptic:* cyrillic:* deseret:* ethiopic:* georgian:* gothic:* greek:* han:* hiragana:* katakana:* latin:* ogham:* old-italic:* runic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* common:
-./pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common:
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc
deleted file mode 100644 (file)
index 282e977..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[Pango]
-ModuleFiles = ./pango.modules
-
-[PangoX]
-AliasFiles = ./pangox.aliases
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases
deleted file mode 100644 (file)
index 9b41aa7..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-# File defining aliases of PangoFontDescription to X font set
-#
-# family style variant weight stretch   XLFD
-
-sans normal normal normal normal \
-  "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -*-gulim-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-sans italic normal normal normal \
-  "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\
-   -*-gulim-medium-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-sans normal normal bold normal \
-  "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\
-   -*-gulim-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-sans italic normal bold normal \
-  "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\
-   -*-gulim-bold-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-
-serif normal normal normal normal \
-  "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-serif italic normal normal normal \
-  "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\
-   -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-serif normal normal bold normal \
-  "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\
-   -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-serif italic normal bold normal \
-  "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\
-   -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-monospace normal normal normal normal \
-  "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-monospace italic normal normal normal \
-  "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\
-   -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-monospace normal normal bold normal \
-  "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\
-   -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-monospace italic normal bold normal \
-  "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\
-   -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
diff --git a/setup/data/osx/NetRadiant.app/Contents/PkgInfo b/setup/data/osx/NetRadiant.app/Contents/PkgInfo
deleted file mode 100644 (file)
index bd04210..0000000
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings b/setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings
deleted file mode 100755 (executable)
index 4a182e5..0000000
Binary files a/setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/NetRadiant.icns b/setup/data/osx/NetRadiant.app/Contents/Resources/NetRadiant.icns
deleted file mode 100644 (file)
index 339e718..0000000
Binary files a/setup/data/osx/NetRadiant.app/Contents/Resources/NetRadiant.icns and /dev/null differ
diff --git a/setup/data/tools-src/notex.xcf b/setup/data/tools-src/notex.xcf
new file mode 100644 (file)
index 0000000..6aa111a
Binary files /dev/null and b/setup/data/tools-src/notex.xcf differ
diff --git a/setup/data/tools-src/shadernotex.xcf b/setup/data/tools-src/shadernotex.xcf
new file mode 100644 (file)
index 0000000..de43725
Binary files /dev/null and b/setup/data/tools-src/shadernotex.xcf differ
diff --git a/setup/data/tools/bitmaps/black.bmp b/setup/data/tools/bitmaps/black.bmp
deleted file mode 100644 (file)
index 8fc59ba..0000000
Binary files a/setup/data/tools/bitmaps/black.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/black.png b/setup/data/tools/bitmaps/black.png
new file mode 100644 (file)
index 0000000..6d3e454
Binary files /dev/null and b/setup/data/tools/bitmaps/black.png differ
diff --git a/setup/data/tools/bitmaps/brush_flipx.bmp b/setup/data/tools/bitmaps/brush_flipx.bmp
deleted file mode 100644 (file)
index 48ee0db..0000000
Binary files a/setup/data/tools/bitmaps/brush_flipx.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_flipx.png b/setup/data/tools/bitmaps/brush_flipx.png
new file mode 100644 (file)
index 0000000..6207339
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_flipx.png differ
diff --git a/setup/data/tools/bitmaps/brush_flipy.bmp b/setup/data/tools/bitmaps/brush_flipy.bmp
deleted file mode 100644 (file)
index d740877..0000000
Binary files a/setup/data/tools/bitmaps/brush_flipy.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_flipy.png b/setup/data/tools/bitmaps/brush_flipy.png
new file mode 100644 (file)
index 0000000..ce537f3
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_flipy.png differ
diff --git a/setup/data/tools/bitmaps/brush_flipz.bmp b/setup/data/tools/bitmaps/brush_flipz.bmp
deleted file mode 100644 (file)
index 017c33e..0000000
Binary files a/setup/data/tools/bitmaps/brush_flipz.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_flipz.png b/setup/data/tools/bitmaps/brush_flipz.png
new file mode 100644 (file)
index 0000000..d2d0708
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_flipz.png differ
diff --git a/setup/data/tools/bitmaps/brush_rotatex.bmp b/setup/data/tools/bitmaps/brush_rotatex.bmp
deleted file mode 100644 (file)
index c7e5505..0000000
Binary files a/setup/data/tools/bitmaps/brush_rotatex.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_rotatex.png b/setup/data/tools/bitmaps/brush_rotatex.png
new file mode 100644 (file)
index 0000000..37c46fc
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_rotatex.png differ
diff --git a/setup/data/tools/bitmaps/brush_rotatey.bmp b/setup/data/tools/bitmaps/brush_rotatey.bmp
deleted file mode 100644 (file)
index e50e5d6..0000000
Binary files a/setup/data/tools/bitmaps/brush_rotatey.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_rotatey.png b/setup/data/tools/bitmaps/brush_rotatey.png
new file mode 100644 (file)
index 0000000..c3b33e7
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_rotatey.png differ
diff --git a/setup/data/tools/bitmaps/brush_rotatez.bmp b/setup/data/tools/bitmaps/brush_rotatez.bmp
deleted file mode 100644 (file)
index 52ab554..0000000
Binary files a/setup/data/tools/bitmaps/brush_rotatez.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_rotatez.png b/setup/data/tools/bitmaps/brush_rotatez.png
new file mode 100644 (file)
index 0000000..e56f1cb
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_rotatez.png differ
diff --git a/setup/data/tools/bitmaps/cap_bevel.bmp b/setup/data/tools/bitmaps/cap_bevel.bmp
deleted file mode 100644 (file)
index 3bb4186..0000000
Binary files a/setup/data/tools/bitmaps/cap_bevel.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_bevel.png b/setup/data/tools/bitmaps/cap_bevel.png
new file mode 100644 (file)
index 0000000..b39565d
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_bevel.png differ
diff --git a/setup/data/tools/bitmaps/cap_curve.png b/setup/data/tools/bitmaps/cap_curve.png
new file mode 100644 (file)
index 0000000..6ce1c0c
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_curve.png differ
diff --git a/setup/data/tools/bitmaps/cap_cylinder.bmp b/setup/data/tools/bitmaps/cap_cylinder.bmp
deleted file mode 100644 (file)
index 2196926..0000000
Binary files a/setup/data/tools/bitmaps/cap_cylinder.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_cylinder.png b/setup/data/tools/bitmaps/cap_cylinder.png
new file mode 100644 (file)
index 0000000..9688930
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_cylinder.png differ
diff --git a/setup/data/tools/bitmaps/cap_endcap.bmp b/setup/data/tools/bitmaps/cap_endcap.bmp
deleted file mode 100644 (file)
index e6cea65..0000000
Binary files a/setup/data/tools/bitmaps/cap_endcap.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_endcap.png b/setup/data/tools/bitmaps/cap_endcap.png
new file mode 100644 (file)
index 0000000..049b250
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_endcap.png differ
diff --git a/setup/data/tools/bitmaps/cap_ibevel.bmp b/setup/data/tools/bitmaps/cap_ibevel.bmp
deleted file mode 100644 (file)
index b1fa49b..0000000
Binary files a/setup/data/tools/bitmaps/cap_ibevel.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_ibevel.png b/setup/data/tools/bitmaps/cap_ibevel.png
new file mode 100644 (file)
index 0000000..c284b66
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_ibevel.png differ
diff --git a/setup/data/tools/bitmaps/cap_iendcap.bmp b/setup/data/tools/bitmaps/cap_iendcap.bmp
deleted file mode 100644 (file)
index da1f5b6..0000000
Binary files a/setup/data/tools/bitmaps/cap_iendcap.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_iendcap.png b/setup/data/tools/bitmaps/cap_iendcap.png
new file mode 100644 (file)
index 0000000..11a3f16
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_iendcap.png differ
diff --git a/setup/data/tools/bitmaps/console.bmp b/setup/data/tools/bitmaps/console.bmp
deleted file mode 100644 (file)
index 7fe64b0..0000000
Binary files a/setup/data/tools/bitmaps/console.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/console.png b/setup/data/tools/bitmaps/console.png
new file mode 100644 (file)
index 0000000..4004739
Binary files /dev/null and b/setup/data/tools/bitmaps/console.png differ
diff --git a/setup/data/tools/bitmaps/curve_cap.bmp b/setup/data/tools/bitmaps/curve_cap.bmp
deleted file mode 100644 (file)
index 574e761..0000000
Binary files a/setup/data/tools/bitmaps/curve_cap.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/dontselectcurve.bmp b/setup/data/tools/bitmaps/dontselectcurve.bmp
deleted file mode 100644 (file)
index a7b9795..0000000
Binary files a/setup/data/tools/bitmaps/dontselectcurve.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/dontselectcurve.png b/setup/data/tools/bitmaps/dontselectcurve.png
new file mode 100644 (file)
index 0000000..66254df
Binary files /dev/null and b/setup/data/tools/bitmaps/dontselectcurve.png differ
diff --git a/setup/data/tools/bitmaps/dontselectmodel.bmp b/setup/data/tools/bitmaps/dontselectmodel.bmp
deleted file mode 100644 (file)
index e81b118..0000000
Binary files a/setup/data/tools/bitmaps/dontselectmodel.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/dontselectmodel.png b/setup/data/tools/bitmaps/dontselectmodel.png
new file mode 100644 (file)
index 0000000..82c472a
Binary files /dev/null and b/setup/data/tools/bitmaps/dontselectmodel.png differ
diff --git a/setup/data/tools/bitmaps/ellipsis.bmp b/setup/data/tools/bitmaps/ellipsis.bmp
deleted file mode 100644 (file)
index a4360a9..0000000
Binary files a/setup/data/tools/bitmaps/ellipsis.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/ellipsis.png b/setup/data/tools/bitmaps/ellipsis.png
new file mode 100644 (file)
index 0000000..270f7b1
Binary files /dev/null and b/setup/data/tools/bitmaps/ellipsis.png differ
diff --git a/setup/data/tools/bitmaps/entities.bmp b/setup/data/tools/bitmaps/entities.bmp
deleted file mode 100644 (file)
index ce3d812..0000000
Binary files a/setup/data/tools/bitmaps/entities.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/entities.png b/setup/data/tools/bitmaps/entities.png
new file mode 100644 (file)
index 0000000..e6fa2d1
Binary files /dev/null and b/setup/data/tools/bitmaps/entities.png differ
diff --git a/setup/data/tools/bitmaps/file_open.bmp b/setup/data/tools/bitmaps/file_open.bmp
deleted file mode 100644 (file)
index 754f10f..0000000
Binary files a/setup/data/tools/bitmaps/file_open.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/file_open.png b/setup/data/tools/bitmaps/file_open.png
new file mode 100644 (file)
index 0000000..bbfe7cc
Binary files /dev/null and b/setup/data/tools/bitmaps/file_open.png differ
diff --git a/setup/data/tools/bitmaps/file_save.bmp b/setup/data/tools/bitmaps/file_save.bmp
deleted file mode 100644 (file)
index 651afb6..0000000
Binary files a/setup/data/tools/bitmaps/file_save.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/file_save.png b/setup/data/tools/bitmaps/file_save.png
new file mode 100644 (file)
index 0000000..2d5a09f
Binary files /dev/null and b/setup/data/tools/bitmaps/file_save.png differ
diff --git a/setup/data/tools/bitmaps/icon.bmp b/setup/data/tools/bitmaps/icon.bmp
deleted file mode 100644 (file)
index 01aec6e..0000000
Binary files a/setup/data/tools/bitmaps/icon.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/icon.png b/setup/data/tools/bitmaps/icon.png
new file mode 100644 (file)
index 0000000..15fcf02
Binary files /dev/null and b/setup/data/tools/bitmaps/icon.png differ
diff --git a/setup/data/tools/bitmaps/lightinspector.bmp b/setup/data/tools/bitmaps/lightinspector.bmp
deleted file mode 100644 (file)
index 00b00a9..0000000
Binary files a/setup/data/tools/bitmaps/lightinspector.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/lightinspector.png b/setup/data/tools/bitmaps/lightinspector.png
new file mode 100644 (file)
index 0000000..93688b3
Binary files /dev/null and b/setup/data/tools/bitmaps/lightinspector.png differ
diff --git a/setup/data/tools/bitmaps/logo.bmp b/setup/data/tools/bitmaps/logo.bmp
deleted file mode 100644 (file)
index ddbd346..0000000
Binary files a/setup/data/tools/bitmaps/logo.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/logo.png b/setup/data/tools/bitmaps/logo.png
new file mode 100644 (file)
index 0000000..fd5afd4
Binary files /dev/null and b/setup/data/tools/bitmaps/logo.png differ
diff --git a/setup/data/tools/bitmaps/modify_edges.bmp b/setup/data/tools/bitmaps/modify_edges.bmp
deleted file mode 100644 (file)
index 7b048f9..0000000
Binary files a/setup/data/tools/bitmaps/modify_edges.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/modify_edges.png b/setup/data/tools/bitmaps/modify_edges.png
new file mode 100644 (file)
index 0000000..0bb8714
Binary files /dev/null and b/setup/data/tools/bitmaps/modify_edges.png differ
diff --git a/setup/data/tools/bitmaps/modify_faces.bmp b/setup/data/tools/bitmaps/modify_faces.bmp
deleted file mode 100644 (file)
index 03d9f8c..0000000
Binary files a/setup/data/tools/bitmaps/modify_faces.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/modify_faces.png b/setup/data/tools/bitmaps/modify_faces.png
new file mode 100644 (file)
index 0000000..7615c5b
Binary files /dev/null and b/setup/data/tools/bitmaps/modify_faces.png differ
diff --git a/setup/data/tools/bitmaps/modify_vertices.bmp b/setup/data/tools/bitmaps/modify_vertices.bmp
deleted file mode 100644 (file)
index c434732..0000000
Binary files a/setup/data/tools/bitmaps/modify_vertices.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/modify_vertices.png b/setup/data/tools/bitmaps/modify_vertices.png
new file mode 100644 (file)
index 0000000..70aa38a
Binary files /dev/null and b/setup/data/tools/bitmaps/modify_vertices.png differ
diff --git a/setup/data/tools/bitmaps/noFalloff.bmp b/setup/data/tools/bitmaps/noFalloff.bmp
deleted file mode 100644 (file)
index e86d10c..0000000
Binary files a/setup/data/tools/bitmaps/noFalloff.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/noFalloff.png b/setup/data/tools/bitmaps/noFalloff.png
new file mode 100644 (file)
index 0000000..55c6a80
Binary files /dev/null and b/setup/data/tools/bitmaps/noFalloff.png differ
diff --git a/setup/data/tools/bitmaps/notex.bmp b/setup/data/tools/bitmaps/notex.bmp
deleted file mode 100644 (file)
index b06664a..0000000
Binary files a/setup/data/tools/bitmaps/notex.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/notex.png b/setup/data/tools/bitmaps/notex.png
new file mode 100644 (file)
index 0000000..e09df39
Binary files /dev/null and b/setup/data/tools/bitmaps/notex.png differ
diff --git a/setup/data/tools/bitmaps/patch_bend.bmp b/setup/data/tools/bitmaps/patch_bend.bmp
deleted file mode 100644 (file)
index af4fc94..0000000
Binary files a/setup/data/tools/bitmaps/patch_bend.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_bend.png b/setup/data/tools/bitmaps/patch_bend.png
new file mode 100644 (file)
index 0000000..62eb756
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_bend.png differ
diff --git a/setup/data/tools/bitmaps/patch_drilldown.bmp b/setup/data/tools/bitmaps/patch_drilldown.bmp
deleted file mode 100644 (file)
index 01ebcf3..0000000
Binary files a/setup/data/tools/bitmaps/patch_drilldown.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_drilldown.png b/setup/data/tools/bitmaps/patch_drilldown.png
new file mode 100644 (file)
index 0000000..1794a13
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_drilldown.png differ
diff --git a/setup/data/tools/bitmaps/patch_insdel.bmp b/setup/data/tools/bitmaps/patch_insdel.bmp
deleted file mode 100644 (file)
index b60b76b..0000000
Binary files a/setup/data/tools/bitmaps/patch_insdel.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_insdel.png b/setup/data/tools/bitmaps/patch_insdel.png
new file mode 100644 (file)
index 0000000..362285e
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_insdel.png differ
diff --git a/setup/data/tools/bitmaps/patch_showboundingbox.bmp b/setup/data/tools/bitmaps/patch_showboundingbox.bmp
deleted file mode 100644 (file)
index 357cfaf..0000000
Binary files a/setup/data/tools/bitmaps/patch_showboundingbox.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_showboundingbox.png b/setup/data/tools/bitmaps/patch_showboundingbox.png
new file mode 100644 (file)
index 0000000..891f3c7
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_showboundingbox.png differ
diff --git a/setup/data/tools/bitmaps/patch_weld.bmp b/setup/data/tools/bitmaps/patch_weld.bmp
deleted file mode 100644 (file)
index a0c9973..0000000
Binary files a/setup/data/tools/bitmaps/patch_weld.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_weld.png b/setup/data/tools/bitmaps/patch_weld.png
new file mode 100644 (file)
index 0000000..3d53a6b
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_weld.png differ
diff --git a/setup/data/tools/bitmaps/patch_wireframe.bmp b/setup/data/tools/bitmaps/patch_wireframe.bmp
deleted file mode 100644 (file)
index 9804274..0000000
Binary files a/setup/data/tools/bitmaps/patch_wireframe.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_wireframe.png b/setup/data/tools/bitmaps/patch_wireframe.png
new file mode 100644 (file)
index 0000000..78bb81e
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_wireframe.png differ
diff --git a/setup/data/tools/bitmaps/popup_selection.bmp b/setup/data/tools/bitmaps/popup_selection.bmp
deleted file mode 100644 (file)
index 676c4d9..0000000
Binary files a/setup/data/tools/bitmaps/popup_selection.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/popup_selection.png b/setup/data/tools/bitmaps/popup_selection.png
new file mode 100644 (file)
index 0000000..217fa82
Binary files /dev/null and b/setup/data/tools/bitmaps/popup_selection.png differ
diff --git a/setup/data/tools/bitmaps/redo.bmp b/setup/data/tools/bitmaps/redo.bmp
deleted file mode 100644 (file)
index 32a373a..0000000
Binary files a/setup/data/tools/bitmaps/redo.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/redo.png b/setup/data/tools/bitmaps/redo.png
new file mode 100644 (file)
index 0000000..befec6e
Binary files /dev/null and b/setup/data/tools/bitmaps/redo.png differ
diff --git a/setup/data/tools/bitmaps/refresh_models.bmp b/setup/data/tools/bitmaps/refresh_models.bmp
deleted file mode 100644 (file)
index b6507f6..0000000
Binary files a/setup/data/tools/bitmaps/refresh_models.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/refresh_models.png b/setup/data/tools/bitmaps/refresh_models.png
new file mode 100644 (file)
index 0000000..ca77acb
Binary files /dev/null and b/setup/data/tools/bitmaps/refresh_models.png differ
diff --git a/setup/data/tools/bitmaps/scalelockx.bmp b/setup/data/tools/bitmaps/scalelockx.bmp
deleted file mode 100644 (file)
index 61363da..0000000
Binary files a/setup/data/tools/bitmaps/scalelockx.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/scalelockx.png b/setup/data/tools/bitmaps/scalelockx.png
new file mode 100644 (file)
index 0000000..9714120
Binary files /dev/null and b/setup/data/tools/bitmaps/scalelockx.png differ
diff --git a/setup/data/tools/bitmaps/scalelocky.bmp b/setup/data/tools/bitmaps/scalelocky.bmp
deleted file mode 100644 (file)
index 812394d..0000000
Binary files a/setup/data/tools/bitmaps/scalelocky.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/scalelocky.png b/setup/data/tools/bitmaps/scalelocky.png
new file mode 100644 (file)
index 0000000..7836242
Binary files /dev/null and b/setup/data/tools/bitmaps/scalelocky.png differ
diff --git a/setup/data/tools/bitmaps/scalelockz.bmp b/setup/data/tools/bitmaps/scalelockz.bmp
deleted file mode 100644 (file)
index 5692e4a..0000000
Binary files a/setup/data/tools/bitmaps/scalelockz.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/scalelockz.png b/setup/data/tools/bitmaps/scalelockz.png
new file mode 100644 (file)
index 0000000..f967680
Binary files /dev/null and b/setup/data/tools/bitmaps/scalelockz.png differ
diff --git a/setup/data/tools/bitmaps/select_mouseresize.bmp b/setup/data/tools/bitmaps/select_mouseresize.bmp
deleted file mode 100644 (file)
index ca0c9ac..0000000
Binary files a/setup/data/tools/bitmaps/select_mouseresize.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/select_mouseresize.png b/setup/data/tools/bitmaps/select_mouseresize.png
new file mode 100644 (file)
index 0000000..c841f05
Binary files /dev/null and b/setup/data/tools/bitmaps/select_mouseresize.png differ
diff --git a/setup/data/tools/bitmaps/select_mouserotate.bmp b/setup/data/tools/bitmaps/select_mouserotate.bmp
deleted file mode 100644 (file)
index 7f18a56..0000000
Binary files a/setup/data/tools/bitmaps/select_mouserotate.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/select_mouserotate.png b/setup/data/tools/bitmaps/select_mouserotate.png
new file mode 100644 (file)
index 0000000..6174568
Binary files /dev/null and b/setup/data/tools/bitmaps/select_mouserotate.png differ
diff --git a/setup/data/tools/bitmaps/select_mousescale.bmp b/setup/data/tools/bitmaps/select_mousescale.bmp
deleted file mode 100644 (file)
index d8f3902..0000000
Binary files a/setup/data/tools/bitmaps/select_mousescale.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/select_mousescale.png b/setup/data/tools/bitmaps/select_mousescale.png
new file mode 100644 (file)
index 0000000..2ab67b2
Binary files /dev/null and b/setup/data/tools/bitmaps/select_mousescale.png differ
diff --git a/setup/data/tools/bitmaps/select_mousetranslate.bmp b/setup/data/tools/bitmaps/select_mousetranslate.bmp
deleted file mode 100644 (file)
index 04962fd..0000000
Binary files a/setup/data/tools/bitmaps/select_mousetranslate.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/select_mousetranslate.png b/setup/data/tools/bitmaps/select_mousetranslate.png
new file mode 100644 (file)
index 0000000..8d85268
Binary files /dev/null and b/setup/data/tools/bitmaps/select_mousetranslate.png differ
diff --git a/setup/data/tools/bitmaps/selection_csgmerge.bmp b/setup/data/tools/bitmaps/selection_csgmerge.bmp
deleted file mode 100644 (file)
index fb5df4f..0000000
Binary files a/setup/data/tools/bitmaps/selection_csgmerge.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_csgmerge.png b/setup/data/tools/bitmaps/selection_csgmerge.png
new file mode 100644 (file)
index 0000000..eabaecf
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_csgmerge.png differ
diff --git a/setup/data/tools/bitmaps/selection_csgsubtract.bmp b/setup/data/tools/bitmaps/selection_csgsubtract.bmp
deleted file mode 100644 (file)
index 267d374..0000000
Binary files a/setup/data/tools/bitmaps/selection_csgsubtract.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_csgsubtract.png b/setup/data/tools/bitmaps/selection_csgsubtract.png
new file mode 100644 (file)
index 0000000..71d9263
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_csgsubtract.png differ
diff --git a/setup/data/tools/bitmaps/selection_makehollow.bmp b/setup/data/tools/bitmaps/selection_makehollow.bmp
deleted file mode 100644 (file)
index 8c5d60c..0000000
Binary files a/setup/data/tools/bitmaps/selection_makehollow.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_makehollow.png b/setup/data/tools/bitmaps/selection_makehollow.png
new file mode 100644 (file)
index 0000000..44416e8
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_makehollow.png differ
diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall.bmp b/setup/data/tools/bitmaps/selection_selectcompletetall.bmp
deleted file mode 100644 (file)
index 8d2c104..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectcompletetall.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall.png b/setup/data/tools/bitmaps/selection_selectcompletetall.png
new file mode 100644 (file)
index 0000000..3f5813e
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selectcompletetall.png differ
diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall_old.bmp b/setup/data/tools/bitmaps/selection_selectcompletetall_old.bmp
deleted file mode 100644 (file)
index 1f911e8..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectcompletetall_old.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selectinside.bmp b/setup/data/tools/bitmaps/selection_selectinside.bmp
deleted file mode 100644 (file)
index 12b22af..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectinside.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selectinside.png b/setup/data/tools/bitmaps/selection_selectinside.png
new file mode 100644 (file)
index 0000000..457805a
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selectinside.png differ
diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall.bmp b/setup/data/tools/bitmaps/selection_selectpartialtall.bmp
deleted file mode 100644 (file)
index d21ddc2..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectpartialtall.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall.png b/setup/data/tools/bitmaps/selection_selectpartialtall.png
new file mode 100644 (file)
index 0000000..e378e47
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selectpartialtall.png differ
diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall_old.bmp b/setup/data/tools/bitmaps/selection_selectpartialtall_old.bmp
deleted file mode 100644 (file)
index 77b418b..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectpartialtall_old.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selecttouching.bmp b/setup/data/tools/bitmaps/selection_selecttouching.bmp
deleted file mode 100644 (file)
index e6d5c4b..0000000
Binary files a/setup/data/tools/bitmaps/selection_selecttouching.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selecttouching.png b/setup/data/tools/bitmaps/selection_selecttouching.png
new file mode 100644 (file)
index 0000000..f4cf1c0
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selecttouching.png differ
diff --git a/setup/data/tools/bitmaps/shadernotex.bmp b/setup/data/tools/bitmaps/shadernotex.bmp
deleted file mode 100644 (file)
index 6be415e..0000000
Binary files a/setup/data/tools/bitmaps/shadernotex.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/shadernotex.png b/setup/data/tools/bitmaps/shadernotex.png
new file mode 100644 (file)
index 0000000..0eab827
Binary files /dev/null and b/setup/data/tools/bitmaps/shadernotex.png differ
diff --git a/setup/data/tools/bitmaps/show_entities.bmp b/setup/data/tools/bitmaps/show_entities.bmp
deleted file mode 100644 (file)
index 9188bee..0000000
Binary files a/setup/data/tools/bitmaps/show_entities.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/show_entities.png b/setup/data/tools/bitmaps/show_entities.png
new file mode 100644 (file)
index 0000000..97bc49b
Binary files /dev/null and b/setup/data/tools/bitmaps/show_entities.png differ
diff --git a/setup/data/tools/bitmaps/splash.bmp b/setup/data/tools/bitmaps/splash.bmp
deleted file mode 100644 (file)
index a484997..0000000
Binary files a/setup/data/tools/bitmaps/splash.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/splash.png b/setup/data/tools/bitmaps/splash.png
new file mode 100644 (file)
index 0000000..af09ccd
Binary files /dev/null and b/setup/data/tools/bitmaps/splash.png differ
diff --git a/setup/data/tools/bitmaps/texture_browser.bmp b/setup/data/tools/bitmaps/texture_browser.bmp
deleted file mode 100644 (file)
index 22f7250..0000000
Binary files a/setup/data/tools/bitmaps/texture_browser.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/texture_browser.png b/setup/data/tools/bitmaps/texture_browser.png
new file mode 100644 (file)
index 0000000..3c145c5
Binary files /dev/null and b/setup/data/tools/bitmaps/texture_browser.png differ
diff --git a/setup/data/tools/bitmaps/texture_lock.bmp b/setup/data/tools/bitmaps/texture_lock.bmp
deleted file mode 100644 (file)
index 0a003bc..0000000
Binary files a/setup/data/tools/bitmaps/texture_lock.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/texture_lock.png b/setup/data/tools/bitmaps/texture_lock.png
new file mode 100644 (file)
index 0000000..2a6c271
Binary files /dev/null and b/setup/data/tools/bitmaps/texture_lock.png differ
diff --git a/setup/data/tools/bitmaps/textures_popup.bmp b/setup/data/tools/bitmaps/textures_popup.bmp
deleted file mode 100644 (file)
index 5333382..0000000
Binary files a/setup/data/tools/bitmaps/textures_popup.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/textures_popup.png b/setup/data/tools/bitmaps/textures_popup.png
new file mode 100644 (file)
index 0000000..b238679
Binary files /dev/null and b/setup/data/tools/bitmaps/textures_popup.png differ
diff --git a/setup/data/tools/bitmaps/undo.bmp b/setup/data/tools/bitmaps/undo.bmp
deleted file mode 100644 (file)
index fd2b839..0000000
Binary files a/setup/data/tools/bitmaps/undo.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/undo.png b/setup/data/tools/bitmaps/undo.png
new file mode 100644 (file)
index 0000000..c0408dd
Binary files /dev/null and b/setup/data/tools/bitmaps/undo.png differ
diff --git a/setup/data/tools/bitmaps/view_cameratoggle.bmp b/setup/data/tools/bitmaps/view_cameratoggle.bmp
deleted file mode 100644 (file)
index 4ec79ed..0000000
Binary files a/setup/data/tools/bitmaps/view_cameratoggle.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_cameratoggle.png b/setup/data/tools/bitmaps/view_cameratoggle.png
new file mode 100644 (file)
index 0000000..375e3de
Binary files /dev/null and b/setup/data/tools/bitmaps/view_cameratoggle.png differ
diff --git a/setup/data/tools/bitmaps/view_cameraupdate.bmp b/setup/data/tools/bitmaps/view_cameraupdate.bmp
deleted file mode 100644 (file)
index dbb1195..0000000
Binary files a/setup/data/tools/bitmaps/view_cameraupdate.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_cameraupdate.png b/setup/data/tools/bitmaps/view_cameraupdate.png
new file mode 100644 (file)
index 0000000..62aa228
Binary files /dev/null and b/setup/data/tools/bitmaps/view_cameraupdate.png differ
diff --git a/setup/data/tools/bitmaps/view_change.bmp b/setup/data/tools/bitmaps/view_change.bmp
deleted file mode 100644 (file)
index 977ee1e..0000000
Binary files a/setup/data/tools/bitmaps/view_change.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_change.png b/setup/data/tools/bitmaps/view_change.png
new file mode 100644 (file)
index 0000000..e72238f
Binary files /dev/null and b/setup/data/tools/bitmaps/view_change.png differ
diff --git a/setup/data/tools/bitmaps/view_clipper.bmp b/setup/data/tools/bitmaps/view_clipper.bmp
deleted file mode 100644 (file)
index 606a209..0000000
Binary files a/setup/data/tools/bitmaps/view_clipper.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_clipper.png b/setup/data/tools/bitmaps/view_clipper.png
new file mode 100644 (file)
index 0000000..b006c0c
Binary files /dev/null and b/setup/data/tools/bitmaps/view_clipper.png differ
diff --git a/setup/data/tools/bitmaps/view_cubicclipping.bmp b/setup/data/tools/bitmaps/view_cubicclipping.bmp
deleted file mode 100644 (file)
index 16f7cb0..0000000
Binary files a/setup/data/tools/bitmaps/view_cubicclipping.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_cubicclipping.png b/setup/data/tools/bitmaps/view_cubicclipping.png
new file mode 100644 (file)
index 0000000..e01508a
Binary files /dev/null and b/setup/data/tools/bitmaps/view_cubicclipping.png differ
diff --git a/setup/data/tools/bitmaps/view_entity.bmp b/setup/data/tools/bitmaps/view_entity.bmp
deleted file mode 100644 (file)
index 851ec2c..0000000
Binary files a/setup/data/tools/bitmaps/view_entity.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_entity.png b/setup/data/tools/bitmaps/view_entity.png
new file mode 100644 (file)
index 0000000..4a29d90
Binary files /dev/null and b/setup/data/tools/bitmaps/view_entity.png differ
diff --git a/setup/data/tools/bitmaps/white.bmp b/setup/data/tools/bitmaps/white.bmp
deleted file mode 100644 (file)
index cbf038f..0000000
Binary files a/setup/data/tools/bitmaps/white.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/white.png b/setup/data/tools/bitmaps/white.png
new file mode 100644 (file)
index 0000000..4af01bd
Binary files /dev/null and b/setup/data/tools/bitmaps/white.png differ
diff --git a/setup/data/tools/bitmaps/window1.bmp b/setup/data/tools/bitmaps/window1.bmp
deleted file mode 100644 (file)
index a8913c7..0000000
Binary files a/setup/data/tools/bitmaps/window1.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/window1.png b/setup/data/tools/bitmaps/window1.png
new file mode 100644 (file)
index 0000000..c880b89
Binary files /dev/null and b/setup/data/tools/bitmaps/window1.png differ
diff --git a/setup/data/tools/bitmaps/window2.bmp b/setup/data/tools/bitmaps/window2.bmp
deleted file mode 100644 (file)
index 6db9e56..0000000
Binary files a/setup/data/tools/bitmaps/window2.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/window2.png b/setup/data/tools/bitmaps/window2.png
new file mode 100644 (file)
index 0000000..94e936c
Binary files /dev/null and b/setup/data/tools/bitmaps/window2.png differ
diff --git a/setup/data/tools/bitmaps/window3.bmp b/setup/data/tools/bitmaps/window3.bmp
deleted file mode 100644 (file)
index e81a299..0000000
Binary files a/setup/data/tools/bitmaps/window3.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/window3.png b/setup/data/tools/bitmaps/window3.png
new file mode 100644 (file)
index 0000000..e739968
Binary files /dev/null and b/setup/data/tools/bitmaps/window3.png differ
diff --git a/setup/data/tools/bitmaps/window4.bmp b/setup/data/tools/bitmaps/window4.bmp
deleted file mode 100644 (file)
index d753945..0000000
Binary files a/setup/data/tools/bitmaps/window4.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/window4.png b/setup/data/tools/bitmaps/window4.png
new file mode 100644 (file)
index 0000000..891ca41
Binary files /dev/null and b/setup/data/tools/bitmaps/window4.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.bmp
deleted file mode 100644 (file)
index 5223950..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.png b/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.png
new file mode 100644 (file)
index 0000000..0b99438
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.bmp
deleted file mode 100644 (file)
index 8939d5d..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.png b/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.png
new file mode 100644 (file)
index 0000000..c4de5d1
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.bmp
deleted file mode 100644 (file)
index 2fcdcba..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.png b/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.png
new file mode 100644 (file)
index 0000000..2210926
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_merge.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_merge.bmp
deleted file mode 100644 (file)
index 2184f7a..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_merge.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_merge.png b/setup/data/tools/plugins/bitmaps/bobtoolz_merge.png
new file mode 100644 (file)
index 0000000..e50d4b1
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_merge.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_poly.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_poly.bmp
deleted file mode 100644 (file)
index e714f3b..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_poly.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_poly.png b/setup/data/tools/plugins/bitmaps/bobtoolz_poly.png
new file mode 100644 (file)
index 0000000..897cbcb
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_poly.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_split.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_split.bmp
deleted file mode 100644 (file)
index 7e1dc72..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_split.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_split.png b/setup/data/tools/plugins/bitmaps/bobtoolz_split.png
new file mode 100644 (file)
index 0000000..5387ec2
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_split.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.bmp
deleted file mode 100644 (file)
index 3d47fdc..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.png b/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.png
new file mode 100644 (file)
index 0000000..271c612
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.bmp
deleted file mode 100644 (file)
index 03b1ae3..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.png b/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.png
new file mode 100644 (file)
index 0000000..c8d2863
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.bmp
deleted file mode 100644 (file)
index 66537dc..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.png b/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.png
new file mode 100644 (file)
index 0000000..4a1038a
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.bmp
deleted file mode 100644 (file)
index 5c967ab..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.png b/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.png
new file mode 100644 (file)
index 0000000..c0d8765
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.bmp
deleted file mode 100644 (file)
index b72cb2a..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.png b/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.png
new file mode 100644 (file)
index 0000000..20cbb41
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_actorclip.bmp b/setup/data/tools/plugins/bitmaps/ufoai_actorclip.bmp
deleted file mode 100644 (file)
index 4a2887c..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_actorclip.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_actorclip.png b/setup/data/tools/plugins/bitmaps/ufoai_actorclip.png
new file mode 100644 (file)
index 0000000..0412c95
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_actorclip.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level1.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level1.bmp
deleted file mode 100644 (file)
index 80a4b29..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level1.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level1.png b/setup/data/tools/plugins/bitmaps/ufoai_level1.png
new file mode 100644 (file)
index 0000000..d5a3979
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level1.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level2.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level2.bmp
deleted file mode 100644 (file)
index e84e254..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level2.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level2.png b/setup/data/tools/plugins/bitmaps/ufoai_level2.png
new file mode 100644 (file)
index 0000000..7f07a02
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level2.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level3.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level3.bmp
deleted file mode 100644 (file)
index 141c324..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level3.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level3.png b/setup/data/tools/plugins/bitmaps/ufoai_level3.png
new file mode 100644 (file)
index 0000000..7b3f1e3
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level3.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level4.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level4.bmp
deleted file mode 100644 (file)
index 3783a80..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level4.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level4.png b/setup/data/tools/plugins/bitmaps/ufoai_level4.png
new file mode 100644 (file)
index 0000000..6801aae
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level4.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level5.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level5.bmp
deleted file mode 100644 (file)
index 8f62851..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level5.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level5.png b/setup/data/tools/plugins/bitmaps/ufoai_level5.png
new file mode 100644 (file)
index 0000000..48a9294
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level5.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level6.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level6.bmp
deleted file mode 100644 (file)
index 418fdd2..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level6.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level6.png b/setup/data/tools/plugins/bitmaps/ufoai_level6.png
new file mode 100644 (file)
index 0000000..eab3b50
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level6.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level7.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level7.bmp
deleted file mode 100644 (file)
index d82dab6..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level7.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level7.png b/setup/data/tools/plugins/bitmaps/ufoai_level7.png
new file mode 100644 (file)
index 0000000..bfb85a7
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level7.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level8.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level8.bmp
deleted file mode 100644 (file)
index c380953..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level8.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level8.png b/setup/data/tools/plugins/bitmaps/ufoai_level8.png
new file mode 100644 (file)
index 0000000..686d8b1
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level8.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_nodraw.bmp b/setup/data/tools/plugins/bitmaps/ufoai_nodraw.bmp
deleted file mode 100644 (file)
index 3eaa529..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_nodraw.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_nodraw.png b/setup/data/tools/plugins/bitmaps/ufoai_nodraw.png
new file mode 100644 (file)
index 0000000..5dbf903
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_nodraw.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_stepon.bmp b/setup/data/tools/plugins/bitmaps/ufoai_stepon.bmp
deleted file mode 100644 (file)
index b73896f..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_stepon.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_stepon.png b/setup/data/tools/plugins/bitmaps/ufoai_stepon.png
new file mode 100644 (file)
index 0000000..7ad5d5b
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_stepon.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.bmp b/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.bmp
deleted file mode 100644 (file)
index 799468b..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.png b/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.png
new file mode 100644 (file)
index 0000000..d1fea27
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.png differ