mirror-github-bspeice/fractorium
1
0
複製 0
镜像来自 https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 22:06:10 -04:00
程式碼 問題管理 Actions Packages Projects 版本發佈 Wiki Activity

--User changes

瀏覽代碼 
-Allow dragging in folders which will be recursively traversed for flame files.
 -Allow for adjusting scale via keyboard with the < and > keys.
 -Show the count of opened flames on the header of the library tree.

--Bug fixes
 -Attempt to preserve xaos when pasting xforms.

--Code changes
 -Default flam3 compatibility mode to true.
This commit is contained in:
Person
2020-03-08 14:17:13 -07:00
父節點 3ef32565c7
當前提交 61ddc06151
共有 147 個文件被更改，包括 3486 次插入 和 24044 次删除
Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/MSVC/Installer/FractoriumInstaller.wixproj
查看文件

@ -6,7 +6,7 @@
<ProductVersion>3.7</ProductVersion>
<ProjectGuid>{c8096c47-e358-438c-a520-146d46b0637d}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>Fractorium_1.0.0.18</OutputName>
<OutputName>Fractorium_1.0.0.19</OutputName>
<OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

50
Builds/MSVC/Installer/Product.wxs
查看文件

@ -50,6 +50,7 @@
<Feature Id="MainApplication" Title="Main Application" Level="1">
<ComponentGroupRef Id="ProductComponents" />
<ComponentGroupRef Id="BenchComponents" />
<ComponentGroupRef Id="ExampleComponents" />
<ComponentGroupRef Id="PlatformComponents" />
<ComponentGroupRef Id="ImageFormatComponents" />
<ComponentRef Id="FractoriumStartMenuShortcut"/>
@ -84,6 +85,7 @@
<Directory Id="AppDataFolder" >
<Directory Id="INSTALLFOLDER" Name="Fractorium" >
<Directory Id="INSTALLFOLDERBENCH" Name="Bench" />
<Directory Id="INSTALLFOLDEREXAMPLES" Name="FlameExamples" />
<Directory Id="INSTALLFOLDERPLATFORMS" Name="platforms" />
<Directory Id="INSTALLFOLDERIMAGEFORMATS" Name="imageformats" />
</Directory>
@ -241,6 +243,22 @@
<File Id="tatasz_pack_03.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_03.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="tatasz_pack_04.gradient" Guid="455d27f4-215f-4db8-9a06-826e8327b8b3">
<File Id="tatasz_pack_04.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_04.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="tatasz_pack_05.gradient" Guid="6a146786-9514-4a3a-b7d7-31d3074e2101">
<File Id="tatasz_pack_05.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_05.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="tatasz_pack_06.gradient" Guid="927c7a40-093f-4e1f-8f53-869bb31f219a">
<File Id="tatasz_pack_06.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_06.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="tatasz_pack_07.gradient" Guid="917183d1-7e85-478f-9c73-3ca34f50ac70">
<File Id="tatasz_pack_07.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_07.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="Quartz_Varieties.ugr" Guid="b319cfb3-9037-490f-a7bc-608c4fc51361">
<File Id="Quartz_Varieties.ugr" Source="$(var.SolutionDir)..\..\..\Data\Quartz_Varieties.ugr" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
@ -318,6 +336,38 @@
</Component>
</ComponentGroup>
</Fragment>
<Fragment>
<ComponentGroup Id="ExampleComponents" Directory="INSTALLFOLDEREXAMPLES">
<Component Id="pillemaster_hexagonal_tilings.flame" Guid="a0b85758-30b2-49e7-85ca-438046cb83e8">
<File Id="pillemaster_hexagonal_tilings.flame" Source="$(var.SolutionDir)..\..\..\Data\FlameExamples\pillemaster_hexagonal_tilings.flame" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="plangkye_examples.flame" Guid="aa6c81a6-28e4-49e7-bef6-fdebfe21e47c">
<File Id="plangkye_examples.flame" Source="$(var.SolutionDir)..\..\..\Data\FlameExamples\plangkye_examples.flame" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="tatasz_examples.flame" Guid="27d621ec-88b7-4957-ae5f-9b3cc8c8f21a">
<File Id="tatasz_examples.flame" Source="$(var.SolutionDir)..\..\..\Data\FlameExamples\tatasz_examples.flame" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="tatasz_substitution.flame" Guid="bb1cb196-e5d9-4250-843a-1e649c896ba8">
<File Id="tatasz_substitution.flame" Source="$(var.SolutionDir)..\..\..\Data\FlameExamples\tatasz_substitution.flame" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="tyrantwave_base_forms.flame" Guid="8773ff3a-d29f-4a41-acb4-e06cafb236ad">
<File Id="tyrantwave_base_forms.flame" Source="$(var.SolutionDir)..\..\..\Data\FlameExamples\tyrantwave_base_forms.flame" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="b33rheart_examples.flame" Guid="c014f5b0-d45f-4bb5-9af7-ac98326dcef1">
<File Id="b33rheart_examples.flame" Source="$(var.SolutionDir)..\..\..\Data\FlameExamples\b33rheart_examples.flame" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
<Component Id="b33rheart_sierpinski.flame" Guid="535430de-6878-41b2-913e-cb35e915cb4f">
<File Id="b33rheart_sierpinski.flame" Source="$(var.SolutionDir)..\..\..\Data\FlameExamples\b33rheart_sierpinski.flame" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
</Component>
</ComponentGroup>
</Fragment>
<Fragment>
<ComponentGroup Id="PlatformComponents" Directory="INSTALLFOLDERPLATFORMS">