Commit Graph

Select branches

Hide Pull Requests

animate_review_prework_part2

master

mfeemster/buildguidelinuxmd-edited-online-with-bit-1513990142950

mfeemster/linuxreleasemd-edited-online-with-bitbuc-1466724359516

mfeemster/linuxreleasemd-edited-online-with-bitbuc-1489712364161

Mono Color

• 9f7535a08a Mac build Mastriani 2019-05-16 21:23:46 -03:00
• 71b362efb7 Merged mfeemster/fractorium into master Michel Mastriani 2019-05-16 20:19:26 -03:00
• b4e5c01b5a changelog edited online with Bitbucket Matt Feemster 2019-05-16 13:59:16 +00:00
• 1346fe4eeb Product.wxs edited online with Bitbucket Matt Feemster 2019-05-16 13:56:22 +00:00
• d1078e4eb2 FractoriumInstaller.wixproj edited online with Bitbucket Matt Feemster 2019-05-16 13:54:25 +00:00
• 9909391475 EmberDefines.h edited online with Bitbucket Matt Feemster 2019-05-16 13:51:57 +00:00
• 7a2fa57d04 control.package edited online with Bitbucket Matt Feemster 2019-05-16 13:47:01 +00:00
• f79d717520 Fractorium.spec edited online with Bitbucket Matt Feemster 2019-05-16 13:45:30 +00:00
• c430deeea6 defaults.pri edited online with Bitbucket Matt Feemster 2019-05-16 13:43:52 +00:00
• b12cdc5da3 --Bug fixes -The variation unicorngaloshen was wrong. Person 2019-05-15 23:42:52 -07:00
• 70eaeffbf8 --Bug fixes -Parsing parameters of the oscilloscope variation in a .chaos file was failing. Person 2019-05-15 20:07:00 -07:00
• 5e662714d2 1.0.0.15 Release Person 2019-05-13 22:57:54 -07:00
• 654ef36b56 Merged in mmastriani/fractorium_michel (pull request #12) Michel Mastriani 2019-05-14 02:40:52 +00:00
• 833f98366b linux bench Michel Mastriani 2019-05-13 22:30:07 -03:00
• 43a44d11ba linux bench Michel Mastriani 2019-05-13 22:27:52 -03:00
• 9867c97a18 Merged mfeemster/fractorium into master Michel Mastriani 2019-05-13 22:26:40 -03:00
• e4a29f56cb --Bug fixes -K2 adjustments were not being applied properly. Person 2019-05-13 18:15:18 -07:00
• 6c66985776 Merged mfeemster/fractorium into master Michel Mastriani 2019-05-13 21:37:11 -03:00
• ca27ae1eb7 --Code changes -Get EmberBench.ps1 working on linux. Person 2019-05-13 17:12:24 -07:00
• f05209093d Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium Person 2019-05-13 15:46:43 -07:00
• 83d109c282 --Code changes -Remove some debug printing. Person 2019-05-13 15:46:36 -07:00
• 99dcc3a6f9 Merged mfeemster/fractorium into master Michel Mastriani 2019-05-13 13:22:42 -03:00
• 8457a9c4e9 BuildGuideQtCreator.md edited online with Bitbucket Matt Feemster 2019-05-13 15:14:52 +00:00
• 04761955b2 BuildGuideQtCreator.md edited online with Bitbucket Matt Feemster 2019-05-13 15:09:15 +00:00
• 540e234688 control.package edited online with Bitbucket Matt Feemster 2019-05-13 14:57:39 +00:00
• 9c4f541eae package-linux.sh edited online with Bitbucket Matt Feemster 2019-05-13 14:40:35 +00:00
• 4bf4908822 copyright edited online with Bitbucket Matt Feemster 2019-05-13 14:36:51 +00:00
• 8f19bca460 control edited online with Bitbucket Matt Feemster 2019-05-13 14:36:06 +00:00
• cf4a7be7cd Merged in mmastriani/fractorium_michel (pull request #11) Michel Mastriani 2019-05-13 00:39:57 +00:00
• 0cb5bc7b1b linux fix arguments Michel Mastriani 2019-05-12 18:29:01 -03:00
• 1304099f73 Merged in mmastriani/fractorium_michel (pull request #10) Michel Mastriani 2019-05-08 01:16:20 +00:00
• abbbd1de87 linux installer changes Michel Mastriani 2019-05-07 21:29:49 -03:00
• b4ba6d6a82 --User changes -Add new variations waves22, waves23, waves42, waves3 and waves4 from user tatasz. -Add new stylesheet called lightdark.qss which gives a more modern look to the dark theme. Started by Michel Mastriani (triptychaos). --Included in the qmake and Wix installers. Person 2019-05-06 19:29:27 -07:00
• 5faa8aa5bd --Bug fixes -Deleting a flame in the library tree was taking three tries. Person 2019-04-26 16:18:21 -07:00
• 5f98be7336 --User changes -Clear all color curves when clicking Reset while holding down Ctrl. -Interpolate color curves when generating a sequence. Person 2019-04-25 22:34:09 -07:00
• 77515aae73 --User changes -Clear all color curves when clicking Reset while holding down Ctrl. Person 2019-04-23 19:50:42 -07:00
• 5209ead086 --Code changes -Change some menu capitalization to make the text easier on the eyes. Person 2019-04-14 23:46:45 -07:00
• 20f76cd090 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium Person 2019-04-13 19:08:54 -07:00
• db1e2755e0 Fix benchmark. Person 2019-04-13 19:08:45 -07:00
• 3ea2d61332 Merged in mmastriani/fractorium/mmastriani/-updated-qt-version-1554835017990 (pull request #8) Michel Mastriani 2019-04-14 02:02:55 +00:00
• c25a9a2f2b Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium Person 2019-04-13 19:00:55 -07:00
• 90ec5b8246 --User changes: -Show common folder locations such as documents, downloads, pictures in the sidebar in all file dialogs. -Warning message about exceeding memory in final render dialog now suggests strips as the solution to the problem. -Strips now has a tooltip explaining what it does. -Allow more digits in the spinners on the color section the flame tab. -Add manually adjustable size spinners in the final render dialog. Percentage scale and absolute size are fully synced. -Default prefix in final render is now the filename when doing animations (coming from sequence section of the library tab). -Changed the elliptic variation back to using a less precise version for float, and a more precise version for double. The last release had it always using double. -New applied xaos table that shows a read-only view of actual weights by taking the base xform weights and multiplying them by the xaos values. -New table in the xaos tab that gives a graphical representation of the probability that each xform is chosen, with and without xaos. -Add button to transpose the xaos rows and columns. -Add support for importing .chaos files from Chaotica. --Pasting back to Chaotica will work for most, but not all, variations due to incompatible parameter names in some. -Curves are now splines instead of Bezier. This adds compatibility with Chaotica, but breaks it for Apophysis. Xmls are still pastable, but the color curves will look different. --The curve editor on the palette tab can now add points by clicking on the lines and remove points by clicking on the points themselves, just like Chaotica. --Splines are saved in four new xml fields: overall_curve, red_curve, green_curve and blue_curve. -Allow for specifying the percentage of a sub batch each thread should iterate through per kernel call when running with OpenCL. This gives a roughly 1% performance increase due to having to make less kernel calls while iterating. --This field is present for interactive editing (where it's not very useful) and in the final render dialog. --On the command line, this is specified as --sbpctth for EmberRender and EmberAnimate. -Allow double clicking to toggle the supersample field in the flame tab between 1 and 2 for easily checking the effect of the field. -When showing affine values as polar coordinates, show angles normalized to 360 to match Chaotica. -Fuse Count spinner now toggles between 15 and 100 when double clicking for easily checking the effect of the field. -Added field for limiting the range in the x and y direction that the initial points are chosen from. -Added a field called K2 which is an alternative way to set brightness, ignored when zero. --This has no effect for many variations, but hs a noticeable effect for some. -Added new variations: arcsech arcsech2 arcsinh arctanh asteria block bwraps_rand circlecrop2 coth_spiral crackle2 depth_blur depth_blur2 depth_gaussian depth_gaussian2 depth_ngon depth_ngon2 depth_sine depth_sine2 dragonfire dspherical dust excinis exp2 flipx flowerdb foci_p gaussian glynnia2 glynnsim4 glynnsim5 henon henon hex_rand hex_truchet hypershift lazyjess lens lozi lozi modulusx modulusy oscilloscope2 point_symmetry pointsymmetry projective pulse rotate scry2 shift smartshape spher squares starblur2 swirl3 swirl3r tanh_spiral target0 target2 tile_hlp truchet_glyph truchet_inv truchet_knot unicorngaloshen vibration vibration2 --hex_truchet, hex_rand should always use double. They are extremely sensitive. Person 2019-04-13 19:00:46 -07:00
• 04c463cb31 -- updated QT version Michel Mastriani 2019-04-09 18:37:00 +00:00
• 6097e9b0c3 Merged in SConaway/fractorium-1/SConaway/readmemd-edited-online-with-bitbucket-1550118725863 (pull request #7) Steven Conaway 2019-02-14 04:57:14 +00:00
• 9d00c1043b README.md edited online with Bitbucket Steven Conaway 2019-02-14 04:32:08 +00:00
• 3412060634 Merged in SConaway/fractorium/SConaway/change-macos-bundle-identifier-1549516162079 (pull request #6) Steven Conaway 2019-02-08 06:02:38 +00:00
• 363149f401 Change MacOS Bundle Identifier Steven Conaway 2019-02-07 05:09:23 +00:00
• d9bfe17b42 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium Person 2018-11-07 19:04:29 -08:00
• e09e2fbfbe --Code changes -Fix Mac build which was failing due to multiple definitions of TRUE and FALSE. Person 2018-11-07 19:04:06 -08:00
• bf3ae414a7 README.md edited online with Bitbucket Matt Feemster 2018-10-26 02:24:31 +00:00
• c88085e938 update version in qt file Person 2018-10-21 20:39:39 -07:00
• 2089363bb0 1.0.0.14 Release --Bug fixes -File saving was broken. Person 2018-10-20 23:08:20 -07:00
• 6d548a0023 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium Person 2018-10-20 18:41:03 -07:00
• f50226e52a 1.0.0.14 Release --Bug fixes -File saving was broken. Person 2018-10-20 18:40:46 -07:00
• eb315768ea README.md edited online with Bitbucket Matt Feemster 2018-10-16 22:40:41 +00:00
• d023565cff Release 1.0.0.13 Person 2018-10-09 17:36:26 -07:00
• 79ec141d92 --Update version history. Person 2018-10-09 16:02:31 -07:00
• a0b658481a --User changes -Disable Start button in final render dialog when Pause is clicked. Person 2018-10-05 19:50:38 -07:00
• 784bd9cca2 README.md edited online with Bitbucket Matt Feemster 2018-10-01 01:19:50 +00:00
• b45c170cdf README.md edited online with Bitbucket Matt Feemster 2018-10-01 01:18:29 +00:00
• ac289031f4 README.md edited online with Bitbucket Matt Feemster 2018-10-01 01:17:38 +00:00
• 68c13b7dae --Code changes -Update Mac deployment script to use Qt 5.11.2 Person 2018-09-30 18:13:27 -07:00
• 5d9ab35164 --Code changes -Revert back to libopenxr22 on bionic instead of libopenexr23 on cosmic for linux. Person 2018-09-30 16:11:20 -07:00
• 822c54993e --Code changes -Remove non-windows qss files from windows wix installer. Person 2018-09-30 14:29:22 -07:00
• c91866acc3 --User changes -Add a button to swap the pre and post affine values for all selected xforms. Person 2018-09-30 14:20:02 -07:00
• 02c3c3967b --Code changes -Update visual studio project files. -Cleanup makedeps.bat. Person 2018-09-29 23:12:22 -07:00
• 2d27eecd5e --Code changes -Upgrade to Qt 5.11.2 Person 2018-09-29 13:28:03 -07:00
• 0a27382c8a --Code changes -Get mac build working. Person 2018-09-28 09:12:23 -07:00
• e737efbb58 --Code changes -Linux build. Person 2018-09-27 23:13:41 -07:00
• aa382f0882 --Code changes -Update linux package builder to use libopenexr23. Person 2018-09-27 23:11:00 -07:00
• 2ca9160b21 --Code changes -Change linux installer to use cosmic. Artful is obsolete. Person 2018-09-27 22:01:09 -07:00
• 7e6532f656 --Code changes -Prepare installers and release notes. Person 2018-09-27 21:36:46 -07:00
• fc0fefec01 --Bug fixes -OpenCL renderer would occasionally crash on first run. Person 2018-09-27 17:02:34 -07:00
• 585d0f99d5 --User changes -Change the thickness of some of the lines used to draw the affine.. Person 2018-09-25 19:12:48 -07:00
• 5283250204 --User changes -Use a green dot for the x axis and purple dot for the y axis when drawing affines to help distinguish them more easily. Person 2018-09-25 18:37:26 -07:00
• ace4f6a7d7 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium Person 2018-09-21 22:42:31 -07:00
• 55a2c393cf --User changes -Add new palettes from user Rubydeva. Person 2018-09-21 22:42:18 -07:00
• 82f11707ec BuildGuideQtCreator.md edited online with Bitbucket Matt Feemster 2018-09-22 05:19:46 +00:00
• 6f11f7df92 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium Person 2018-09-18 21:05:32 -07:00
• 267e734176 --Code changes -Change makedeps.bat Person 2018-09-18 21:05:25 -07:00
• 139fee5b9a BuildGuideQtCreator.md edited online with Bitbucket Matt Feemster 2018-09-19 04:02:20 +00:00
• 033e0d3c1d BuildGuideQtCreator.md edited online with Bitbucket Matt Feemster 2018-09-19 03:55:25 +00:00
• 5f3a97e825 --User changes -Further work on the About box. --Change qss files to make the text box in the About box be the same color as the one in the style dialog, so the link text is easier to see. --This requires reloading the qss file. Person 2018-09-18 20:49:38 -07:00
• 0a3d41de36 --User changes -New look for the About dialog, it was growing too large before. More work to be done on it in a follow up commit. Person 2018-09-17 22:16:12 -07:00
• 1bc9ded7ac --Code changes -Update dependencies build script to use the latest version of openexr and other libraries. -Update windows platform version. Person 2018-09-17 19:54:26 -07:00
• 15fdc860b8 --User changes -Add buttons to copy and paste affine transforms. -Show xform names on the column headers of the xaos table. -Add a color-coded third column to the variations tree which shows any properties of each variation which are non-standard. -Draw a transparent circle over hovered xforms. -Change how xforms respond to dragging. Rotate only is now the default, and scale will only happen with shift. --Optionally do scale and rotate when holding shift, via a setting in the options dialog. Person 2018-09-15 03:11:12 -07:00
• dee4304bf2 --User changes -Attempt to preserve xaos when adding xforms. Note this is not an exact copy, but just a preservation of some values based on position. -Add some acceleration to the changing of spinner values when dragging the right mouse button to adjust. -Make the pivot be the center of the viewable area when doing drag/rotate/scale with the right mouse button. --Clamp minimum scale to 10 --Draw a line from the mouse position to the pivot. -Keep a cache of the last added final xform with each flame so that it can be quickly added, removed, then added back for testing its effect. --This is not saved with the xml file and is solely for interactive editing. Person 2018-08-10 18:06:04 -07:00
• 26c558a2f5 --User changes -Give tabs a height of 4px in the qss files. Looks a little large on 4k screens, but just right on HD screens which are much more common. -Allow for styling of zero and non-zero variation tree nodes via qss. -Allow for toggling whether to interpolate between colors in the palette editor, or to do hard cuts between colors. -Allow for adjusting spinner values with the + = or up arrow keys to increase, and - _ or down arrow keys to decrease. -Allow for responding to global presses of + = and - _ to cycle up or down to specify which xform is set as the current one. -Allow for adding "layers" via xaos which will add a user-specified number of xforms, and set certain xaos values to 0 or 1. -Add a new menu item under the Edit menu to copy the OpenCL iteration kernel source to the clipboard. -Show text on the status bar which indicates that an OpenCL kernel compilation is taking place. -Show xform name on xform combo box when expanded. Adjust size to fit all names. -Draw post affine circles using dashed lines. -Prevent QSS dialog from styling its editor, which makes it easier to see text when creating styles which have custom colors for text boxes. Person 2018-07-30 21:39:41 -07:00
• 0deabd45b8 Merged in luyuju151/fractorium/out-master (pull request #5) Yuju Lu 2018-07-13 22:54:37 +00:00
• d88d8bb2ea Let xform combo show the names of xforms luyuju151 2018-07-09 14:55:57 +08:00
• e58deb1194 Change the method that normalized weight text displayed from spinner box suffix to a Qlabel to prevent annoying interruption when typing weight. luyuju151 2018-07-09 01:25:08 +08:00
• 8b2d5c9697 Make variation tree background colors themable. luyuju151 2018-07-08 23:46:23 +08:00
• 235381b4b9 --User changes -Double clicking on width or height spinner resizes both, but scales to the one double clicked. Person 2018-07-08 08:31:26 -07:00
• 264aa8c454 --Bug fixes -Fix out of bounds crash in EmberGenome. Person 2018-06-19 19:32:20 -07:00
• f84389d7a5 1.0.0.10 Release. Person 2018-06-17 18:54:40 -07:00
• 8da7b96dd6 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium Person 2018-06-12 21:20:37 -07:00
• 6ff199d1ef --User changes -No longer constrain pitch, yaw or depth spinners to -180 - 180. Person 2018-06-12 21:20:15 -07:00
• 5929f5df4a README.md edited online with Bitbucket Matt Feemster 2018-05-13 19:31:12 +00:00
• 05fabda748 1.0.0.9 5/13/2017 --Bug fixes -Pausing did not work when using OpenCL renderer. Person 2018-05-13 11:21:39 -07:00
• f240e2bfd7 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium Person 2018-05-13 11:02:46 -07:00