Skip to content

Commit

Permalink
Merge branch 'release/v2.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
bigfug committed Feb 17, 2017
2 parents 02bb4c1 + 32a79b5 commit 752eb59
Show file tree
Hide file tree
Showing 58 changed files with 7,697 additions and 312 deletions.
6 changes: 6 additions & 0 deletions FugioApp/FugioApp.pro
Original file line number Diff line number Diff line change
Expand Up @@ -492,3 +492,9 @@ windows:exists( "C:/Program Files (x86)/PrimeSense/NiTE2/Redist" ) {
LIBS += -L"C:/Program Files (x86)/PrimeSense/NiTE2/Redist"
}

#------------------------------------------------------------------------------
# V8

windows:exists( $$(LIBS)/v8/v8/include/v8.h ) {
LIBS += -L$$(LIBS)/v8/v8/out.gn/ia32.release
}
4 changes: 2 additions & 2 deletions FugioApp/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Package>
<DisplayName>Fugio</DisplayName>
<Description>The Fugio patch editor.</Description>
<Version>2.2.0</Version>
<ReleaseDate>2017-01-19</ReleaseDate>
<Version>2.3.0</Version>
<ReleaseDate>2017-02-17</ReleaseDate>
<Default>True</Default>
</Package>
2 changes: 1 addition & 1 deletion FugioApp/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.0
2.3.0
2 changes: 1 addition & 1 deletion config.osx.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>Fugio</Name>
<Version>2.2.0</Version>
<Version>2.3.0</Version>
<Title>Fugio Installer</Title>
<Publisher>www.bigfug.com</Publisher>
<StartMenuDir>Fugio</StartMenuDir>
Expand Down
2 changes: 1 addition & 1 deletion config.win.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>Fugio</Name>
<Version>2.2.0</Version>
<Version>2.3.0</Version>
<Title>Fugio Installer</Title>
<Publisher>www.bigfug.com</Publisher>
<StartMenuDir>Fugio</StartMenuDir>
Expand Down
171 changes: 171 additions & 0 deletions examples/Core/Flip Flop.fug
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
[fugio]
version=2
duration=30

[meta]
name=Untitled

[nodes]
1ade412c-1362-4dc5-8673-fa5167f67e34=183e08a7-6470-4398-a3ad-05ccf54f5722
46254f38-b132-4827-8b32-652ab982a8bd=006462c8-2b6e-4481-96a2-5365b5db7ffc
de001270-9d40-4b07-b9ea-cfb1ac1f35f6=63794cc4-fa17-4de0-a512-ff038d467fd1
da7a3ce1-6dbf-4c76-9c11-3daba9c9a655=02afabae-a99b-43d7-9fcd-252b45f4f989
7b281cb2-c749-49b1-a2fc-4c2a822cb040=63794cc4-fa17-4de0-a512-ff038d467fd1

[connections]
1a67777b-9a45-4b08-8ac0-0215c1880c5e=c89fa1fb-ba4a-46ff-b514-e300a7c0c3b9
b7db13db-45db-4789-8443-7da122d99897=abf5b96f-b951-4741-8222-b8be06018320
d8dfd82c-2d9d-458e-b69f-3fb22c6819a4=9ee69512-56e6-49a7-ae74-08954e375f57
dd24c79d-0048-40bb-b3d4-53ae451f9d3f=5f62c334-b365-4d28-bed8-c94937270ce8

[1ade412c-1362-4dc5-8673-fa5167f67e34]
version=2
name=Button
inputs\size=0
outputs\1\abf5b96f-b951-4741-8222-b8be06018320=9f47ca6a-f8b8-4029-8dee-98caa049374e
outputs\2\0f0ab5eb-14f6-4293-b891-8ce3164b0de2=bd9c608a-2320-4a3e-baf7-96c6577da904
outputs\3\490a2e8e-26b8-4ae2-bff1-8d7d8480db3b=bd9c608a-2320-4a3e-baf7-96c6577da904
outputs\size=3
control\toggle=true

[490a2e8e-26b8-4ae2-bff1-8d7d8480db3b]
version=2
name=Toggle
direction=2
order=2
uuid=261cc653-d7fa-4c34-a08b-3603e8ae71d5

[0f0ab5eb-14f6-4293-b891-8ce3164b0de2]
version=2
name=Boolean
direction=2
order=1
uuid=1b5e9ce8-acb9-478d-b84b-9288ab3c42f5

[abf5b96f-b951-4741-8222-b8be06018320]
version=2
name=Trigger
direction=2
order=0
uuid=9e154e12-bcd8-4ead-95b1-5a59833bcf4e

[46254f38-b132-4827-8b32-652ab982a8bd]
version=2
name=Flip Flop
inputs\1\1a67777b-9a45-4b08-8ac0-0215c1880c5e=00000000-0000-0000-0000-000000000000
inputs\2\b7db13db-45db-4789-8443-7da122d99897=00000000-0000-0000-0000-000000000000
inputs\size=2
outputs\1\5f62c334-b365-4d28-bed8-c94937270ce8=00000000-0000-0000-0000-000000000000
outputs\2\9ee69512-56e6-49a7-ae74-08954e375f57=00000000-0000-0000-0000-000000000000
outputs\size=2

[1a67777b-9a45-4b08-8ac0-0215c1880c5e]
version=2
name=Input
direction=1
order=0
uuid=9e154e12-bcd8-4ead-95b1-5a59833bcf4e

[9ee69512-56e6-49a7-ae74-08954e375f57]
version=2
name=Output 2
direction=2
order=1
uuid=b13398e2-4e71-460f-a3b1-499ce9af224d

[5f62c334-b365-4d28-bed8-c94937270ce8]
version=2
name=Output 1
direction=2
order=0
uuid=1b5e9ce8-acb9-478d-b84b-9288ab3c42f5

[b7db13db-45db-4789-8443-7da122d99897]
version=2
name=Switch
direction=1
order=1
uuid=5064e449-8b0b-4447-9009-c81997f754ef

[de001270-9d40-4b07-b9ea-cfb1ac1f35f6]
version=2
name=LCD Number
inputs\1\d8dfd82c-2d9d-458e-b69f-3fb22c6819a4=00000000-0000-0000-0000-000000000000
inputs\size=1
outputs\size=0

[d8dfd82c-2d9d-458e-b69f-3fb22c6819a4]
version=2
name=Number
direction=1
order=0
uuid=9e154e12-bcd8-4ead-95b1-5a59833bcf4e

[da7a3ce1-6dbf-4c76-9c11-3daba9c9a655]
version=2
name=Dial
inputs\size=0
outputs\1\c89fa1fb-ba4a-46ff-b514-e300a7c0c3b9=7de7061f-c1fa-4cd8-b5ed-612618df3d3f
outputs\size=1
control\value=@Variant(\0\0\0\x87?H\x8f%)

[c89fa1fb-ba4a-46ff-b514-e300a7c0c3b9]
version=2
name=
direction=2
order=0
uuid=9e154e12-bcd8-4ead-95b1-5a59833bcf4e

[7b281cb2-c749-49b1-a2fc-4c2a822cb040]
version=2
name=LCD Number
inputs\1\dd24c79d-0048-40bb-b3d4-53ae451f9d3f=00000000-0000-0000-0000-000000000000
inputs\size=1
outputs\size=0

[dd24c79d-0048-40bb-b3d4-53ae451f9d3f]
version=2
name=Number
direction=1
order=0
uuid=9e154e12-bcd8-4ead-95b1-5a59833bcf4e

[positions]
version=2
1ade412c-1362-4dc5-8673-fa5167f67e34="-460,-80"
46254f38-b132-4827-8b32-652ab982a8bd="-280,-200"
7b281cb2-c749-49b1-a2fc-4c2a822cb040="-100,-200"
da7a3ce1-6dbf-4c76-9c11-3daba9c9a655="-460,-200"
de001270-9d40-4b07-b9ea-cfb1ac1f35f6="-100,-120"

[notes]
version=2
1\note="The Flip Flop takes any Input and outputs it to one of\nits two Output pins, depending on the value of Switch,\nwhich can be a boolean or a trigger."
1\position="-459,-328"
1\uuid=bf82e6ad-5aa2-451b-a135-c45829453cac
size=1

[groups]
version=3
size=0

[node-groups]
version=2

[colours]
version=2
1ade412c-1362-4dc5-8673-fa5167f67e34=@Variant(\0\0\0\x43\x1\xff\xff\xcc\xcc\xff\xff\xff\xff\0\0)
1ade412c-1362-4dc5-8673-fa5167f67e34\abf5b96f-b951-4741-8222-b8be06018320=@Variant(\0\0\0\x43\x1\xff\xff\xc0\xc0\xc0\xc0\xc0\xc0\0\0)
1ade412c-1362-4dc5-8673-fa5167f67e34\0f0ab5eb-14f6-4293-b891-8ce3164b0de2=@Variant(\0\0\0\x43\x1\xff\xff\xc0\xc0\xc0\xc0\xc0\xc0\0\0)
1ade412c-1362-4dc5-8673-fa5167f67e34\490a2e8e-26b8-4ae2-bff1-8d7d8480db3b=@Variant(\0\0\0\x43\x1\xff\xff\xc0\xc0\xc0\xc0\xc0\xc0\0\0)
46254f38-b132-4827-8b32-652ab982a8bd=@Variant(\0\0\0\x43\x1\xff\xff\xcc\xcc\xff\xff\xff\xff\0\0)
46254f38-b132-4827-8b32-652ab982a8bd\5f62c334-b365-4d28-bed8-c94937270ce8=@Variant(\0\0\0\x43\x1\xff\xff\xc0\xc0\xc0\xc0\xc0\xc0\0\0)
46254f38-b132-4827-8b32-652ab982a8bd\9ee69512-56e6-49a7-ae74-08954e375f57=@Variant(\0\0\0\x43\x1\xff\xff\xc0\xc0\xc0\xc0\xc0\xc0\0\0)
7b281cb2-c749-49b1-a2fc-4c2a822cb040=@Variant(\0\0\0\x43\x1\xff\xff\xcc\xcc\xff\xff\xff\xff\0\0)
da7a3ce1-6dbf-4c76-9c11-3daba9c9a655=@Variant(\0\0\0\x43\x1\xff\xff\xcc\xcc\xff\xff\xff\xff\0\0)
da7a3ce1-6dbf-4c76-9c11-3daba9c9a655\c89fa1fb-ba4a-46ff-b514-e300a7c0c3b9=@Variant(\0\0\0\x43\x1\xff\xff\xc0\xc0\xc0\xc0\xc0\xc0\0\0)
de001270-9d40-4b07-b9ea-cfb1ac1f35f6=@Variant(\0\0\0\x43\x1\xff\xff\xcc\xcc\xff\xff\xff\xff\0\0)

[mainwindow]
geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\xff\xff\xff\xf8\xff\xff\xff\xf8\0\0\a\x87\0\0\x4\x8f\0\0\x2G\0\0\0\x17\0\0\x5\xde\0\0\x2\\\0\0\0\0\x2\0\0\0\a\x80)
state="@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x3\0\0\0\0\0\0\x1x\0\0\x4H\xfc\x2\0\0\0\x3\xfb\0\0\0\x1e\0m\0N\0o\0\x64\0\x65\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\0\x15\0\0\x2r\0\0\0\xe0\0\xff\xff\xff\xfc\0\0\x2\x8b\0\0\x1\xd2\0\0\0r\x1\0\0\x14\xfa\0\0\0\x2\x1\0\0\0\x4\xfb\0\0\0,\0m\0P\0\x65\0r\0\x66\0o\0r\0m\0\x61\0n\0\x63\0\x65\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\0\0\xff\xff\xff\xff\0\0\0P\0\xff\xff\xff\xfb\0\0\0\x14\0\x64\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\xfb\0\0\0 \0m\0\x44\0o\0\x63\0k\0W\0i\0\x64\0t\0h\0L\0o\0g\0g\0\x65\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0P\0\xff\xff\xff\xfb\0\0\0\x18\0\x64\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\0_\0\x33\x1\0\0\0\0\0\0\x1\x16\0\0\0\0\0\0\0\0\xfb\0\0\0\"\0M\0u\0l\0t\0i\0m\0\x65\0\x64\0i\0\x61\0 \0P\0l\0\x61\0y\0\x65\0r\x1\0\0\x3\xa7\0\0\0\xb6\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\x1x\0\0\x4H\xfc\x2\0\0\0\x5\xfb\0\0\0*\0m\0S\0t\0y\0l\0\x65\0S\0h\0\x65\0\x65\0t\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0z\0\xff\xff\xff\xfb\0\0\0$\0m\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\0\x42\0r\0o\0w\0s\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0]\0\xff\xff\xff\xfb\0\0\0&\0m\0S\0n\0i\0p\0p\0i\0t\0s\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\0\0\0\x1=\0\0\x2\x1\0\0\0\0\0\0\0\0\xfb\0\0\0&\0m\0S\0n\0i\0p\0p\0\x65\0t\0s\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\0\x15\0\0\x4H\0\0\0w\0\xff\xff\xff\xfb\0\0\0L\0{\0\x35\0\x32\0\x63\0\x61\0\x63\0\x33\0\x33\0\x37\0-\0\x64\0\x30\0\x63\0\x36\0-\0\x34\0\x33\0\x63\0\x30\0-\0\x61\0\x65\0\x32\0\x64\0-\0\x30\0\x36\0\x38\0\x37\0\x66\0\x35\0\x61\0\x39\0\x63\0\x38\0\x61\0\x64\0}\x1\0\0\x1\x45\0\0\x1~\0\0\0\0\0\0\0\0\0\0\0\x3\0\0\a\x80\0\0\x1\x96\xfc\x1\0\0\0\x16\xfb\0\0\0\x10\0\x46\0r\0\x61\0g\0m\0\x65\0n\0t\x1\0\0\0\0\0\0\x2\xbe\0\0\0\0\0\0\0\0\xfb\0\0\0\f\0V\0\x65\0r\0t\0\x65\0x\x1\0\0\x2\xc2\0\0\x1>\0\0\0\0\0\0\0\0\xfb\0\0\0\x1e\0m\0P\0l\0\x61\0y\0L\0i\0s\0t\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\xfb\0\0\0\x1e\0\x46\0r\0\x61\0g\0m\0\x65\0n\0t\0 \0S\0h\0\x61\0\x64\0\x65\0r\x1\0\0\0\0\0\0\x4\x17\0\0\0\0\0\0\0\0\xfb\0\0\0\x1a\0V\0\x65\0r\0t\0\x65\0x\0 \0S\0h\0\x61\0\x64\0\x65\0r\x1\0\0\x4\x18\0\0\x1\x88\0\0\0\0\0\0\0\0\xfb\0\0\0\x1a\0I\0m\0\x61\0g\0\x65\0 \0P\0r\0\x65\0v\0i\0\x65\0w\x1\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\xfb\0\0\0\x16\0T\0\x65\0x\0t\0 \0\x45\0\x64\0i\0t\0o\0r\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\xfb\0\0\0\x16\0T\0\x65\0x\0t\0 \0\x45\0\x64\0i\0t\0o\0r\0\0\0\0\0\0\0\x2\xd1\0\0\0\0\0\0\0\0\xfb\0\0\0\x16\0T\0\x65\0x\0t\0 \0\x45\0\x64\0i\0t\0o\0r\0\0\0\0\0\0\0\x3\xbe\0\0\0\0\0\0\0\0\xfb\0\0\0\x16\0T\0\x65\0x\0t\0 \0\x45\0\x64\0i\0t\0o\0r\0\0\0\0\0\0\0\x5\xe0\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x32\0\x64\0\x32\0\x65\0\x36\0\x30\0\x65\0\x64\0-\0\x31\0\x64\0\x38\0\x64\0-\0\x34\0\x36\0\x65\0\x35\0-\0\x38\0\x63\0\x30\0\x37\0-\0\x37\0\x64\0\x38\0\x64\0\x39\0\x64\0\x65\0\x36\0\x30\0\x38\0\x65\0\x62\0}\0\0\0\0\0\0\0\x3\b\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x62\0\x35\0\x33\0\x61\0\x36\0\x37\0\x38\0\x37\0-\0\x34\0\x32\0\x36\0\x36\0-\0\x34\0\x39\0\x64\0\x33\0-\0\x38\0\x35\0\x36\0\x37\0-\0\x30\0\x31\0\x32\0\x34\0\x66\0\x64\0\x38\0\x39\0\x35\0\x34\0\x37\0\x39\0}\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x63\0\x63\0\x38\0\x36\0\x66\0\x34\0\x61\0\x39\0-\0\x61\0\x30\0\x37\0\x37\0-\0\x34\0\x35\0\x37\0\x62\0-\0\x38\0\x61\0\x61\0\x61\0-\0\x66\0\x32\0\x64\0\x61\0\x34\0\x63\0\x64\0\x64\0\x61\0\x37\0\x33\0\x35\0}\0\0\0\0\0\0\0\x2}\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x65\0\x39\0\x31\0\x61\0\x61\0\x38\0\x34\0\x62\0-\0\x31\0\x35\0\x34\0\x35\0-\0\x34\0\x32\0\x66\0\x31\0-\0\x39\0\x33\0\x63\0\x38\0-\0\x36\0\x39\0\x33\0\x39\0\x64\0\x63\0\x65\0\x34\0\x62\0\x61\0\x38\0\x30\0}\0\0\0\x4\xb1\0\0\x2\xcf\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x38\0\x63\0\x32\0\x66\0\x39\0\x32\0\x63\0\x32\0-\0\x38\0\x38\0\x66\0\x38\0-\0\x34\0\x35\0\x37\0\x61\0-\0\x62\0\x65\0\x38\0\x65\0-\0\x32\0\x38\0\x35\0\x64\0\x36\0\x35\0\x38\0\x37\0\x61\0\x61\0\x32\0\x36\0}\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x36\0\x38\0\x30\0\x62\0\x62\0\x36\0\x63\0\x33\0-\0\x35\0\x36\0\x38\0\x30\0-\0\x34\0\x65\0\x35\0\x39\0-\0\x38\0\x34\0\x63\0\x37\0-\0\x37\0\x34\0\x61\0\x64\0\x65\0\x39\0\x36\0\x36\0\x35\0\x62\0\x63\0\x31\0}\x1\0\0\x5\xa0\0\0\x1\xe0\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x37\0\x34\0\x32\0\x66\0\x63\0\x66\0\x34\0\x32\0-\0\x63\0\x65\0\x61\0\x30\0-\0\x34\0\x39\0\x34\0\x64\0-\0\x39\0\x34\0\x36\0\x62\0-\0\x63\0\x30\0\x35\0\x38\0\x30\0\x66\0\x37\0\x62\0\x35\0\x36\0\x64\0\x34\0}\x1\0\0\0\0\0\0\x2\xfb\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x64\0\x38\0\x31\0\x33\0\x37\0\x65\0\x32\0\x35\0-\0\x66\0\x61\0\x31\0\x34\0-\0\x34\0\x36\0\x37\0\x35\0-\0\x39\0\x66\0\x33\0\x63\0-\0\x64\0\x62\0\x30\0\x63\0\x66\0\x66\0\x63\0\x30\0\x36\0\x36\0\x38\0\x63\0}\x1\0\0\x2\xff\0\0\x4\x81\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x33\0\x38\0\x63\0\x33\0\x66\0\x35\0\x34\0\x33\0-\0\x65\0\x61\0\x34\0\x65\0-\0\x34\0\x34\0\x66\0\x63\0-\0\x61\0\x38\0\x33\0\x63\0-\0\x61\0\x39\0\x37\0\x65\0\x30\0\x34\0\x30\0\x62\0\x35\0\x63\0\x38\0\x64\0}\0\0\0\x6\x9f\0\0\0\xe1\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x34\0\x66\0\x61\0\x31\0\x33\0\x63\0\x35\0\x36\0-\0\x33\0\x37\0\x65\0\x30\0-\0\x34\0\x62\0\x61\0\x66\0-\0\x62\0\x31\0\x38\0\x35\0-\0\x63\0\x35\0\x63\0\x64\0\x62\0\x64\0\x65\0\x64\0\x30\0\x35\0\x30\0\x34\0}\0\0\0\0\0\0\0\x3\xe6\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x36\0\x32\0\x64\0\x64\0\x34\0\x33\0\x31\0\x39\0-\0\x61\0\x39\0\x66\0\x64\0-\0\x34\0\x39\0\x38\0\x35\0-\0\x39\0\x66\0\x62\0\x62\0-\0\x65\0\x32\0\x32\0\x61\0\x32\0\x36\0\x63\0\x32\0\x38\0\x37\0\x39\0\x31\0}\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\xfb\0\0\0L\0{\0\x36\0\x36\0\x37\0\x33\0\x61\0\x62\0\x35\0\x30\0-\0\x63\0\x33\0\x65\0\x64\0-\0\x34\0\x62\0\x63\0\x38\0-\0\x61\0\x36\0\x38\0\x66\0-\0\x36\0\x38\0\x38\0\x62\0\x63\0\x66\0\x37\0\x62\0\x61\0\x36\0\x64\0\x61\0}\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x4\x88\0\0\x4H\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)"
Loading

0 comments on commit 752eb59

Please sign in to comment.