Commit Graph

663 Commits

Author SHA1 Message Date
21311ce0aa Fixed colors and Y position 2019-05-21 21:09:11 -03:00
6f42938bd7 Merged mfeemster/fractorium into master 2019-05-21 20:50:24 -03:00
28ce868a9f --Code changes
-Formatting.
2019-05-21 16:28:37 -07:00
c02762178e Merged in mmastriani/fractorium_michel (pull request #18)
Changes for Linux Palette Editor
2019-05-21 22:57:58 +00:00
96e8bcdb23 FractoriumPalette.cpp edited online with Bitbucket 2019-05-21 22:35:23 +00:00
fcdfb0b300 Removed duplicated code 2019-05-21 19:15:45 -03:00
9fdf512a1f Solving Linux-Gnome Palette Editor problem 2019-05-21 13:33:00 -03:00
f29dda2ec0 Merged mfeemster/fractorium into master 2019-05-21 13:20:06 -03:00
243be8d702 --Bug fixes
-Dragging library items to a new position was not properly resetting the current flame pointer, so subsequent edits would unintentionally overwrite different flames.
2019-05-20 18:24:32 -07:00
142b597565 --Bug fixes
-Switching between SP/DP was resetting palette rotation.
2019-05-20 15:44:46 -07:00
2d2d561e29 Solving Gnome Palette Editor problem 2019-05-19 18:10:56 -03:00
4550f9dc87 --Bug fixes
-Right clicking when showing only current affines caused a crash.
2019-05-18 22:25:22 -07:00
1ed8f09eb3 --Bug fixes
-Auger was implemented wrong.
2019-05-18 18:46:49 -07:00
30c2a103c9 --Bug fixes
-Case insensitive comparisons via stricmp() were wrong on non-Windows systems.
2019-05-18 14:31:16 -07:00
8614ae86a9 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2019-05-16 20:56:15 -07:00
d8b3dd40d6 --Bug fixes
-Fix some recently changed calls to fma().

--Code changes
 -Update version to 1.0.0.16.
2019-05-16 20:56:05 -07:00
1d9e3e1ade Merged in mmastriani/fractorium_michel (pull request #14)
finishing mac build

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2019-05-17 01:27:19 +00:00
d2d5a0d55b finishing mac build 2019-05-16 22:06:09 -03:00
7d8007d3f7 Merged mfeemster/fractorium into master 2019-05-16 21:47:55 -03:00
07541c1307 Merged in mmastriani/fractorium_michel (pull request #13)
Mac build

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2019-05-17 00:40:32 +00:00
9f7535a08a Mac build 2019-05-16 21:23:46 -03:00
71b362efb7 Merged mfeemster/fractorium into master 2019-05-16 20:19:26 -03:00
b4e5c01b5a changelog edited online with Bitbucket 2019-05-16 13:59:16 +00:00
1346fe4eeb Product.wxs edited online with Bitbucket 2019-05-16 13:56:22 +00:00
d1078e4eb2 FractoriumInstaller.wixproj edited online with Bitbucket 2019-05-16 13:54:25 +00:00
9909391475 EmberDefines.h edited online with Bitbucket 2019-05-16 13:51:57 +00:00
7a2fa57d04 control.package edited online with Bitbucket 2019-05-16 13:47:01 +00:00
f79d717520 Fractorium.spec edited online with Bitbucket 2019-05-16 13:45:30 +00:00
c430deeea6 defaults.pri edited online with Bitbucket 2019-05-16 13:43:52 +00:00
b12cdc5da3 --Bug fixes
-The variation unicorngaloshen was wrong.

--Code changes
 -Add precalc optimizations for the following variations: starblur2, modulusx, modulusy, rotate, shift, waves3, waves4, waves23, waves42.
2019-05-15 23:42:52 -07:00
70eaeffbf8 --Bug fixes
-Parsing parameters of the oscilloscope variation in a .chaos file was failing.
2019-05-15 20:07:00 -07:00
5e662714d2 1.0.0.15 Release 2019-05-13 22:57:54 -07:00
654ef36b56 Merged in mmastriani/fractorium_michel (pull request #12)
linux bench

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2019-05-14 02:40:52 +00:00
833f98366b linux bench 2019-05-13 22:30:07 -03:00
43a44d11ba linux bench 2019-05-13 22:27:52 -03:00
9867c97a18 Merged mfeemster/fractorium into master 2019-05-13 22:26:40 -03:00
e4a29f56cb --Bug fixes
-K2 adjustments were not being applied properly.
2019-05-13 18:15:18 -07:00
6c66985776 Merged mfeemster/fractorium into master 2019-05-13 21:37:11 -03:00
ca27ae1eb7 --Code changes
-Get EmberBench.ps1 working on linux.
2019-05-13 17:12:24 -07:00
f05209093d Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2019-05-13 15:46:43 -07:00
83d109c282 --Code changes
-Remove some debug printing.
2019-05-13 15:46:36 -07:00
99dcc3a6f9 Merged mfeemster/fractorium into master 2019-05-13 13:22:42 -03:00
8457a9c4e9 BuildGuideQtCreator.md edited online with Bitbucket 2019-05-13 15:14:52 +00:00
04761955b2 BuildGuideQtCreator.md edited online with Bitbucket 2019-05-13 15:09:15 +00:00
540e234688 control.package edited online with Bitbucket 2019-05-13 14:57:39 +00:00
9c4f541eae package-linux.sh edited online with Bitbucket 2019-05-13 14:40:35 +00:00
4bf4908822 copyright edited online with Bitbucket 2019-05-13 14:36:51 +00:00
8f19bca460 control edited online with Bitbucket 2019-05-13 14:36:06 +00:00
cf4a7be7cd Merged in mmastriani/fractorium_michel (pull request #11)
linux fix arguments

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2019-05-13 00:39:57 +00:00
0cb5bc7b1b linux fix arguments 2019-05-12 18:29:01 -03:00