mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-02 14:26:17 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit Graph

  • e3a5aa5444 Merge pull request #43 from gambhiro/script-improvements Matt Feemster 2015-12-18 09:59:47 -08:00
  • c6ff23fc9a check that version numbers agree Gambhiro 2015-12-18 17:43:37 +00:00
  • dca47ac5c9 readme upd linux deps Gambhiro 2015-12-18 15:16:46 +00:00
  • 2975069a91 helper script for symlinks Gambhiro 2015-12-18 15:14:21 +00:00
  • ca35cd4c94 read the package version from the changelog file Gambhiro 2015-12-18 15:13:42 +00:00
  • fae3aadb3a Merge pull request #38 from gambhiro/ubuntu-15.10-nvidia Matt Feemster 2015-12-16 17:30:05 -08:00
  • efed23cf66 using ocl-icd-libopencl1 Gambhiro 2015-12-16 17:27:36 +00:00
  • 2ce1e31a80 Deps is now Build/include/vendor Gambhiro 2015-12-16 16:41:20 +00:00
  • f37fb43197 readme upd Gambhiro 2015-12-16 16:25:28 +00:00
  • eaf802c562 opengl-headers 1.2 in vendor folder Gambhiro 2015-12-16 14:54:14 +00:00
  • ea261c4c5e lib symlink fix Gambhiro 2015-12-16 04:28:25 +00:00
  • d142ca6d07 mkdir lib and include Gambhiro 2015-12-15 18:27:14 +00:00
  • f9923a673c local symlinks Gambhiro 2015-12-15 18:24:46 +00:00
  • 7318bff32c OpenCL 1.2 is supported in the Linux Nvidia drivers now Gambhiro 2015-12-15 16:26:22 +00:00
  • 994c05ba68 include paths Gambhiro 2015-12-15 16:22:51 +00:00
  • a9a189e9a4 dependencies for Ubuntu 15.10 Wily Werevolf Gambhiro 2015-12-15 16:21:35 +00:00
  • edf81fbe51 exclude debian folder from tarball Gambhiro 2015-12-15 16:20:39 +00:00
  • 85ba79c861 don't ignore flam3-palettes.xml Gambhiro 2015-12-15 16:19:03 +00:00
  • 914b5412c3 Merge pull request #35 from gambhiro/linux-mac-0.9.9.2 Matt Feemster 2015-12-11 22:23:14 -08:00
  • 43d0aef5a4 Merge remote-tracking branch 'origin/master' into linux-mac-0.9.9.2 Gambhiro 2015-12-11 12:00:46 +00:00
  • b3cf5892c2 resurrect previous build scripts for reference Gambhiro 2015-12-11 11:55:36 +00:00
  • e20ea74113 Merge pull request #34 from gh2k/buildscript-tweak Matt Feemster 2015-12-10 20:32:20 -08:00
  • aece4afc60 --Bug fixes: -Omit duplicate entries in error reports. -Properly report missing palette file in command line programs. mfeemster 2015-12-10 20:19:41 -08:00
  • 599b0653e3 remove checkinstall suggestion Gambhiro 2015-12-10 18:21:20 +00:00
  • 5ab1d45bb2 readme instructions for building Gambhiro 2015-12-10 18:17:02 +00:00
  • fe6a949e03 better options Gambhiro 2015-12-10 18:16:46 +00:00
  • c11b2b4fc2 palette and theme install Gambhiro 2015-12-10 18:05:51 +00:00
  • 08428d155c unix and macx scoping Gambhiro 2015-12-10 18:03:04 +00:00
  • 06d4c95975 look harder for a palette Gambhiro 2015-12-10 18:02:24 +00:00
  • 88724376da options for linux packaging helper Gambhiro 2015-12-09 21:40:59 +00:00
  • 0aaa7bb490 warn and exit if PPA folder already exists Gambhiro 2015-12-09 18:15:14 +00:00
  • c2d227b403 look for the palettes in various places Gambhiro 2015-12-09 18:08:21 +00:00
  • 66aa8fa6a1 successful Mac build on OSX 10.10 Gambhiro 2015-12-09 16:14:33 +00:00
  • fd6e14d651 remove autotools from deps Gambhiro 2015-12-09 16:05:09 +00:00
  • fa5e6188ee squashed linux packaging commits Gambhiro 2015-12-08 11:49:19 +00:00
  • e7d275ca16 Fix incorrect syntax in qmake variable assignment Simon Detheridge 2015-12-03 11:46:54 +00:00
  • d60bc4dc6c hard-code /usr/share/fractorium for now Gambhiro 2015-12-01 17:33:27 +00:00
  • 49e2104fd2 --Code changes: -Cleanup. mfeemster 2015-11-25 14:32:34 -08:00
  • cbead15e18 --Bug fixes: -Crash on linux when saving style due to null pointer in m_Theme variable. mfeemster 2015-11-25 14:27:49 -08:00
  • 7269d2176a --Bug fixes: -Qualify sqrt with std:: in Variations06.h mfeemster 2015-11-25 13:30:37 -08:00
  • cdcbd409ab --Bug fixes: -Add Zeps to global OpenCL function list for any ember that contains 3D params. mfeemster 2015-11-23 16:33:43 -08:00
  • 5e82167155 Linux build. mfeemster 2015-11-22 17:03:11 -08:00
  • 330074cfb2 --User changes -Add new variations: bubbleT3D, crob, hexaplay3D, hexcrop, hexes, hexnix3D, loonie2, loonie3, nBlur, octapol and synth. -Allow for pre/post versions of dc_bubble, dc_cylinder and dc_linear whereas before they were omitted. -When saving a file with multiple embers in it, detect if time values are all the same and if so, start them at zero and increment by 1 for each ember. -Allow for numerous quality increases to be coalesced into one. It will pick up at the end of the current render. -Show selection highlight on variations tree in response to mouse hover. This makes it easier to see for which variation or param the current mouse wheel action will apply. -Make default temporal samples be 100, whereas before it was 1000 which was overkill. -Require the shift key to be held with delete for deleting an ember to prevent it from triggering when the user enters delete in the edit box. -This wasn't otherwise fixable without writing a lot more code. mfeemster 2015-11-22 14:15:07 -08:00
  • 04e72c27de --User changes -Add a new dialog for editing QSS stylesheets. Allow for saving, reloading and setting styles as default. --Include a dark style with the installation called dark.qss. --Also add support for themes such as Fusion. --Resize some controls to better fit with the new style. -Add an option to specify the number of random embers generated on startup. 1 is the minimum and the default. mfeemster 2015-10-26 21:31:35 -07:00
  • 9f524e1ad1 -Bug fixes: --Xaos table was not updating when pasting xforms. mfeemster 2015-09-27 12:06:47 -07:00
  • e978e63d5a --Bug fixes: Fix crash on startup when no GPU present. mfeemster 2015-09-21 17:44:19 -07:00
  • 34d6325be8 0.9.9.0 Beta 09/19/2015 --User changes Thread image writing in EmberAnimate and when doing animation sequence in final render dialog. Add total time output for verbose mode in EmberAnimate to match EmberRender. mfeemster 2015-09-19 18:03:25 -07:00
  • d67e56c794 -Bug fixes: --Set auto fill background for all of the nested tabs on the ui. This has ping ponged back and forth since the beginning of this project. mfeemster 2015-09-14 22:10:46 -07:00
  • 171b687421 -Bug fixes --Adjust height of final render dialog to make it look better on Linux. mfeemster 2015-09-14 21:34:37 -07:00
  • 16dbbf1b29 -Bug fixes: --Adjust xaos cells when any group modification is made, such as random, clear, or row/col change. --Remove some old style sheet code on the xforms tab that doesn't seem to make sense and was probably just a workaround for a transient Qt bug, of which there are hundreds. mfeemster 2015-09-14 20:53:19 -07:00
  • e8b8d70f47 --Bug fixes: -Make xform weight cell slightly wider, it was getting clipped on Linux. mfeemster 2015-09-13 12:10:58 -07:00
  • 63f0d5cdad --Bug fixes: -Wraparound bug when generating random flames. -Make combo boxes have zero margins, they were getting clipped on Linux. mfeemster 2015-09-13 11:53:14 -07:00
  • 2f0227755b --User changes: Resize options and about dialogs for Linux. mfeemster 2015-09-12 20:10:47 -07:00
  • 018ba26b5f --User changes -Add support for multiple GPU devices. --These options are present in the command line and in Fractorium. -Change scheme of specifying devices from platform,device to just total device index. --Single number on the command line. --Change from combo boxes for device selection to a table of all devices in Fractorium. -Temporal samples defaults to 100 instead of 1000 which was needless overkill. mfeemster 2015-09-12 18:33:45 -07:00
  • a4aae06b02 --User changes -Add Simon Detheridge's name to the About Box. mfeemster 2015-08-12 18:51:07 -07:00
  • 6b813c8dac Fix Linux build. mfeemster 2015-08-10 20:59:09 -07:00
  • 34568b297b Merge branch 'master' of https://github.com/mfeemster/fractorium.git mfeemster 2015-08-10 20:18:15 -07:00
  • eecd3c254f --User changes -Remove Hue as a saved parameter, as well as animation parameters associated with it. It's now a GUI-only field that is never saved. -Make histogram, density filter buffer, and all associated fields always float, even when using double. In that case, only the iteration calculations are now double. Suggested by Thomas Ludwig. -Print all three kernels in EmberRender when the --dump_kernel option is specified. -Apply variations filter to randoms. mfeemster 2015-08-10 20:10:23 -07:00
  • e1808c9bda Merge pull request #28 from gh2k/qmake-debugrel Matt Feemster 2015-08-01 06:54:23 -07:00
  • c857ca6f65 Ensure debug and release options are explicitly specified with qmake Simon Detheridge 2015-08-01 10:59:27 +01:00
  • 6b702334b9 Branch sync mfeemster 2015-07-31 19:50:13 -07:00
  • fda1fdeee7 --Bug fixes -Nvidia OpenCL compilation was broken for density filtering due to ambiguity in the arguments to min(). Fix it by casting. -Put Nvidia block size in DE back to 24 where it used to be. Nvidia fails when it's 32. -Fix misspelling of the word "Rendering" in failure messages in final render dialog. -Put FillSummary() back when loading an ember. -Properly disable add final xform button when a final xform is present. mfeemster 2015-07-31 19:46:53 -07:00
  • 1f77ca2098 Merge pull request #26 from gh2k/osx-packager Matt Feemster 2015-07-29 17:44:06 -07:00
  • 28a25644a2 Merge pull request #27 from gh2k/osx-native-menus Matt Feemster 2015-07-29 17:42:49 -07:00
  • 51df7b3681 Merge branch 'master' of https://github.com/mfeemster/fractorium mfeemster 2015-07-29 17:35:38 -07:00
  • 2317be332a --User changes -Add toolbar buttons to switch some rendering options without having to open the options dialog. mfeemster 2015-07-29 17:25:02 -07:00
  • 916863dd0a Force creation of native menu bar when main window is shown Simon Detheridge 2015-07-29 14:55:55 +01:00
  • 26bc0d1b72 Look for flam3-palettes.xml in executable dir, not working dir Simon Detheridge 2015-07-24 11:10:18 +01:00
  • fd5e177df7 Fix output directory in qt projects to be relative to the repository Simon Detheridge 2015-07-24 11:09:44 +01:00
  • 3be0a9b469 Add script to package necessary binaries into app package Simon Detheridge 2015-07-26 20:56:52 +01:00
  • df64fb4b1e Merge branch 'master' into travis Simon Detheridge 2015-07-28 16:39:55 +01:00
  • 0e8e63202d Merge pull request #25 from gh2k/char-exceptions Matt Feemster 2015-07-27 06:40:08 -07:00
  • 84c87c966a Display char* excptions when Something Bad happens Simon Detheridge 2015-07-24 12:59:07 +01:00
  • 3928000f55 Merge branch 'master' into travis Simon Detheridge 2015-07-24 16:31:32 +01:00
  • c005755a50 Merge pull request #24 from gh2k/menu-hotkeys Matt Feemster 2015-07-24 08:05:00 -07:00
  • 24ce030c2f Change hotkeys for copy/paste selected xforms Simon Detheridge 2015-07-24 15:52:37 +01:00
  • ad7d4a3b4f Merge pull request #22 from gh2k/opencl-hole Matt Feemster 2015-07-24 06:41:42 -07:00
  • e81dfc3000 Merge branch 'master' into travis Simon Detheridge 2015-07-24 13:05:31 +01:00
  • 328a413c59 Fix opencl crash in 'hole' variation Simon Detheridge 2015-07-24 11:06:14 +01:00
  • e16c6a825f --User changes -Add variations filter/selection dialog. mfeemster 2015-07-23 18:16:36 -07:00
  • 63f52759ea Merge branch 'master' into travis Simon Detheridge 2015-07-23 15:56:56 +01:00
  • 2019dcb605 --Code changes -Forgot EmberMotion.h mfeemster 2015-07-22 17:06:14 -07:00
  • fc7923e8af Merge branch 'master' into travis Simon Detheridge 2015-07-22 14:14:37 +01:00
  • 3aa9e13194 --User changes -Add Summary tab to the info dock, place existing bounds related info in a new Bounds tab. -Add a toolbar with the most common actions on it. -Remove old toolbar at the top of the library tab. mfeemster 2015-07-15 20:27:32 -07:00
  • fb262c2469 --User changes -Add motion support from Simon Detheridge at the ember level instead of just individual xforms: Add the ability to manipulate camera pitch, yaw and other goodies during flame rotation using a new element specified at the top-level of the flame. Create a new 'saw' motion function, so that these values can effectively be looped (e.g. yaw -1 to +1) over the course of a rotation. Add an offset to existing motion elements, to start them partway through their cycle. This would (for example) enable creating circular motion of xform affines, by combining two offset sine waves, one with an offset of 0.25 or 0.75. Fix loops in EmberGenome (they only had an on/off effect - this was broken in flame-genome as well) and make the loop count floating-point as well. For sequence animations, it's not necessary for clips to loop precisely if they're not designed specifically for the ES project. Similarly, there's no need for motion_frequency to be an integer value either so this was changed to allow motion that doesn't necessarily start or end at the loop boundary. I've attempted to keep each bit of functionality in its own commit. There's an argument as to whether to call the new flame motion elements <flame_motion/> (to differentiate programmatically) or just <motion/> (for consistency within the file) -- I opted for the former because it was easier to modify the xml parser that way. mfeemster 2015-07-06 21:36:46 -07:00
  • 3a9ce0928f Merge branch 'motion-goodies' of https://github.com/gh2k/fractorium mfeemster 2015-07-06 20:22:52 -07:00
  • 0839d610c1 Merge branch 'master' of https://github.com/mfeemster/fractorium.git mfeemster 2015-07-06 20:05:05 -07:00
  • 570331adb5 --Bug fixes -Allow for empty fields in template files. mfeemster 2015-07-06 20:04:38 -07:00
  • 3fa59be990 Add new 'motion_offset' parameter to motion elements Simon Detheridge 2015-07-06 15:05:43 +01:00
  • efb39f8160 Make 'loops' param to EmberGenome work correcly, and convert to double Simon Detheridge 2015-07-06 12:06:20 +01:00
  • f606986b7d Apply flame motion elements when generating flame sequence for animation Simon Detheridge 2015-07-02 18:01:37 +01:00
  • 679a8b4129 Serialise FlameMotion elements to/from XML Simon Detheridge 2015-06-26 21:23:27 +01:00
  • 9d5f3e8578 Add new class to store flame motion parameters Simon Detheridge 2015-06-24 11:23:17 +01:00
  • d75a15136d Convert motion_frequency to floating point Simon Detheridge 2015-06-24 10:52:21 +01:00
  • 1a37504b09 Add 'saw' motion function Simon Detheridge 2015-06-22 14:50:43 +01:00
  • 40ff655be0 Merge branch 'master' into travis Simon Detheridge 2015-07-02 16:23:06 +01:00
  • 957779639f Merge pull request #19 from gh2k/interference2-pow Matt Feemster 2015-07-02 08:18:54 -07:00
  • 9c7bd807b4 Fix ambiguous call to 'pow' in 'Interface2' variation Simon Detheridge 2015-07-02 16:10:29 +01:00
  • 448840f32b Merge branch 'master' into travis Simon Detheridge 2015-06-30 14:46:13 +01:00
  • fa3175aad1 --Code changes -Better use of const functions. -Ember.pro should not define BUILDING_EMBERCL, instead define BUILDING_EMBER. mfeemster 2015-06-29 20:13:53 -07:00