vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity
5,459 Commits
29 Branches
9 Tags
31 MiB
Commit Graph

643 Commits (5ad4b1303629cce72ebf9e374b0b55e2c12ad617)

Author SHA1 Message Date
Marius Kintel 9ef1717459 Conflicts: 
openscad.pro
	scripts/publish-macosx.sh
	scripts/publish-mingw-x.sh
	scripts/release-common.sh
	tests/CMakeLists.txt
 2015-03-14 16:17:07 -04:00
Marius Kintel 5e46cb2ff8 Add snapshot to CONFIG for snapshot builds 2015-03-10 17:18:17 -04:00
Marius Kintel ca72a5ab5d Reverted version to master after release 2015-03-10 10:46:46 -04:00
Marius Kintel a7bf4fe69b Bumped version to 2015.03 2015-03-10 10:45:40 -04:00
Marius Kintel 71cc091c26 Upload release version in correct location 2015-03-10 10:44:01 -04:00
Marius Kintel c4f42011fc Disable test with z buffer tearing 2015-03-09 01:00:02 -04:00
Marius Kintel df9a05e46c Ignore throwntogethertest_issue964 2015-03-08 22:46:53 -04:00
Marius Kintel f67c116c9d Disable freetype issue on travis 2015-03-07 18:52:34 -05:00
Torsten Paul f7303223c0 Extract strings for translation from JSON file. 2015-03-06 23:26:06 +01:00
David Kreuter 4ca4677265 Bugfix: scripts/check-dependencies.sh can't determine version of opencsg. 
Grep doesn't return matching lines when it believes that the file is a binary.
The header for opencsg seems to trigger this behaviour. Added the -a switch to
the grep invocation to force interpretation as text file.
 2015-03-06 12:21:29 +01:00
Marius Kintel f8e732e25a Merge remote-tracking branch 'origin/master' into examples-cleanup 
Conflicts:
	locale/ru.po
 2015-03-05 16:09:54 -05:00
Marius Kintel 08e3722bcb Updated version variable info 2015-03-05 15:42:46 -05:00
Marius Kintel a46c43b444 Include all source files 2015-03-05 14:57:53 -05:00
Marius Kintel 66230e2680 Merge remote-tracking branch 'origin/master' into examples-cleanup 2015-03-05 14:35:04 -05:00
Marius Kintel 82e560aed4 Put appcast on files.openscad.org to be able to log activity 2015-03-05 14:34:23 -05:00
Marius Kintel 8a8926db3d Merge remote-tracking branch 'origin/master' into examples-cleanup 2015-03-05 10:24:20 -05:00
Don Bright 252a870059 add some debugging for qsci 2015-03-05 02:36:46 -06:00
Don Bright c7fb84685a don't check gcc version, it has been removed from README 2015-03-05 02:28:50 -06:00
Don Bright a40d9c9150 speed up gmp search 2015-03-05 02:21:51 -06:00
Marius Kintel c830906a3f Merge remote-tracking branch 'origin/master' into examples-cleanup 2015-03-03 14:12:23 -05:00
Marius Kintel 78f83e17d2 Keep 05-osx-fonts.conf in fonts dir to make the fonts work in development mode 2015-03-03 13:25:53 -05:00
Marius Kintel f54a968391 Merge remote-tracking branch 'origin/master' into examples-cleanup 2015-03-01 22:04:57 -05:00
Marius Kintel b9e1b6603e Bumped to Qt-5.4.1 2015-02-25 18:58:20 -05:00
Marius Kintel 2cf9de36e2 Disable opencsgtest_issue11105b for travis; Gallium issue 2015-02-20 00:38:55 -05:00
Marius Kintel ef9b06040f Disable opencsgtest_issue1215 for travis as it causes an OpenCSG rendering difference 2015-02-20 00:22:09 -05:00
Marius Kintel 9dc76d2012 Bump CGAL to 4.5.2, don't automatically build 32-bit binaries in deployment mode 2015-02-16 23:52:55 -05:00
Marius Kintel 571d2140c1 Updated Mac dependency build: Allow package selection on the cmd-line, allow forcing reinstall of already installed package 2015-02-09 19:19:00 -05:00
Lenbok 47f5815b49 Fix problem with check-dependencies.sh during detection of qt under 
some circumstances.

- If qtchooser is installed but qmake could not be found (either qt4
  or qt5), the check would hang due to grep expecting input from
  stdin.

- If qtchooser is installed but qmake for qt5 is not installed, the
  code would not actually check for the existence of qt4 qmake, since
  the test for ! -e $qtpath doesn't do what you want when $qtpath is
  empty.
 2015-02-06 12:03:07 +13:00
Marius Kintel 448b38fe9e Added Makefile for generating examples html pages. From @t-paul 2015-02-04 15:13:37 -05:00
Marius Kintel c80bb8a624 Bumped freetype to 2.5.5 2015-01-22 16:18:07 -05:00
Torsten Paul 668a5211ff Fix ragel URL and bump to version 6.9. 2015-01-11 19:31:42 +01:00
Torsten Paul e3441b50a1 Move winconsole to separate folder. 2015-01-08 19:12:13 +01:00
Marius Kintel a300cddfb5 Suppress a few test cases triggering Gallium bugs on Ubuntu-12.04 2015-01-06 00:14:14 -05:00
Marius Kintel 5b865293a6 Library updates; qt-5.4.0, eigen-3.2.3, boost-1.57, cgal-4.5.1, glew-1.11, gettext-0.19.4, libffi-3.2.1, glib-2.42.1, libxml2-2.9.2 2015-01-05 01:56:24 -05:00
Marius Kintel 743732d874 Fix bug in harfbuzz build causing us to require OS X 10.9+ 2014-12-31 15:31:27 -05:00
Marius Kintel 6fc720d1b7 Bumped Eigen to 3.2.2 2014-12-31 15:02:20 -05:00
Torsten Paul 0bf2d4e286 No need to update translation in release-common.sh it's done by the build. 2014-12-25 19:18:55 +01:00
Marius Kintel 0007684c5b Merge pull request #1077 from openscad/winconsole-fix 
Use separate project for winconsole and don't statically link Qt
 2014-12-23 00:32:15 -05:00
Marius Kintel 77a568cda0 Less verbose 2014-12-22 19:31:40 -05:00
Torsten Paul 1126a0ef17 Use separate project for winconsole and don't statically link Qt (fixes #870). 2014-12-16 23:35:42 +01:00
Torsten Paul dd274b744a Fix download urls for freetype and ragel; bump freetype to 2.5.4. 2014-12-11 19:42:35 +01:00
Marius Kintel 82b599e8ba Bumped Qt to 5.3.2 2014-12-07 18:07:53 -05:00
Torsten Paul 80f1a31143 Update translation file generator scripts. 2014-12-04 23:20:25 +01:00
Torsten Paul 441160d8e8 Fix release package creation. 2014-11-14 21:31:42 +01:00
Torsten Paul ca3672b19c Move translation files to locale folder instead of po. 
While this is not the standard name for the files, this makes the
resource handling easier as the PlatformUtils code already handles
lookup for both installed and dev layouts. At least for Linux the
installed name would be /usr/share/locale, so we use that in source
too for now.
 2014-11-13 00:24:44 +01:00
Torsten Paul 59c4dec623 Merge branch 'master' into translation2 2014-11-12 23:21:42 +01:00
Marius Kintel 31b90d1acb Merge pull request #1008 from openscad/externalize-colorschemes2 
Externalize colorschemes
 2014-11-08 20:49:15 -05:00
Marius Kintel 4ef9f3e817 Bumped QScintilla to 2.8.4 2014-11-08 19:45:02 -05:00
Marius Kintel 01b845397a Added buildonly option 2014-11-05 18:59:06 +04:00
Torsten Paul 073c6fe2b3 Add color schemes to Windows installer. 2014-11-02 16:39:03 +01:00