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

4536 Commits (e533d2a71ad7b8fd8f4edaf1bef3c58a9f45c2c1)

Author SHA1 Message Date
Oskar Linde e533d2a71a Mac: Findbuffer support 2014-09-19 22:35:20 +02:00
Oskar Linde 8d3d2fe9f4 Editor: Restore lost 'use selection for find' functionality 2014-09-19 19:52:59 +02:00
Oskar Linde 2e1f24b4dc Bugfix. Fixes #953 2014-09-18 23:14:16 +02:00
Marius Kintel e1fd9c83b8 #948 Allow export of collinear triangles to avoid creating holes in meshes 2014-09-15 20:51:41 -04:00
Marius Kintel cf8844c19d Added testcase for #947 2014-09-15 18:41:30 -04:00
Marius Kintel ff73aaaac7 OpenCSG-1.4.0 patch for Mac 2014-09-15 18:41:09 -04:00
Marius Kintel 72e09b6891 Updated to OpenCSG-1.4.0 2014-09-15 18:27:40 -04:00
Marius Kintel 988333abb8 Merge branch 'master' of github.com:openscad/openscad 2014-09-15 15:43:05 -04:00
Marius Kintel d5235f2b2c Merge pull request #894 from openscad/launchingscreen 
Launching screen
 2014-09-15 15:42:51 -04:00
Marius Kintel 41348f2166 Merge branch 'launchingscreen' of github.com:openscad/openscad into launchingscreen 2014-09-15 15:35:24 -04:00
Marius Kintel d9ae0dab10 #894 Let enter key open last selected item, allow cursor keys for item selection 2014-09-15 15:35:21 -04:00
Torsten Paul c19df82b72 Use HTML to render the headline text. 2014-09-15 21:29:32 +02:00
Marius Kintel 52797177b2 Auto-fill search field for search&replace 2014-09-15 14:43:31 -04:00
Torsten Paul f8336029f1 Merge branch 'master' into launchingscreen 
Conflicts:
	openscad.pro
 2014-09-15 19:58:55 +02:00
Torsten Paul 131119fd28 Fix stylesheet issue (wrong scrollbar style; unreadable tooltips on MacOS). 2014-09-15 18:12:00 +02:00
Marius Kintel 5ff8bbfe11 Merge pull request #951 from kevenv/libraryinfo 
Modernise help library info
 2014-09-14 22:45:19 -04:00
Keven Villeneuve adbe4c9d86 Modernise help library info 2014-09-14 22:08:18 -04:00
Torsten Paul d67b01c7f2 Default to show welcome screen if no settings value available. 2014-09-14 04:00:17 +02:00
Torsten Paul 78e341cd4c Add bigger logo image. 2014-09-14 03:18:32 +02:00
Torsten Paul aec33dd75f Separate launching screen from main window and show before main window opens. 2014-09-14 02:08:57 +02:00
Torsten Paul 8c892907c2 Make welcome screen resizable and update some minor UI issues. 
- Move images to icons folder
- Move "Show welcome screen" to advanced tab in preferences
- Set button styles via Qt stylesheet to handle hover and disable
- Rename config setting to "launcher/showOnStartup" and add default
 2014-09-13 23:52:21 +02:00
Torsten Paul e7d3025753 Merge branch 'master' into launchingscreen 
Conflicts:
	openscad.pro
	openscad.pro.user
	src/MainWindow.h
	src/Preferences.cc
	src/Preferences.h
	src/Preferences.ui
	src/mainwin.cc
	src/openscad.cc
 2014-09-13 21:19:44 +02:00
Marius Kintel 5252bae1f9 Merge pull request #941 from openscad/qscintilla-fedora20-fix 
Use fallback if CONFIG+=qscintilla2 does not add a lib reference
 2014-09-05 14:42:06 -04:00
Torsten Paul d08e7bbe82 Use fallback if CONFIG+=qscintilla2 does not add a lib reference (fixes #938). 2014-09-05 20:31:54 +02:00
Torsten Paul 155c275180 Add qscintilla2 to dependency list. 2014-09-05 19:58:31 +02:00
Torsten Paul af69e95bbe Check also lib64 path for glib-2.0; fixes detection on fedora20/64bit. 2014-09-05 18:43:37 +02:00
Marius Kintel 771f764533 Use --render=cgal in export-import tests, added testcase for #936 2014-09-04 17:36:52 -04:00
Marius Kintel 51c54f2e5b Add --render=cgal option for test purposes (forces conversion to CGAL Nef polyhedron before rendering 2014-09-04 17:35:32 -04:00
Marius Kintel cfb15466e4 #337 Print warning on non-simple export instead of refusing to export 2014-09-04 17:34:53 -04:00
Marius Kintel f15a177132 Added expected files for #904 2014-09-04 14:43:34 -04:00
Marius Kintel efc552b0bf Only print one degenerate triangle warning per polyset 2014-09-04 14:40:03 -04:00
Marius Kintel 2c11e397d1 #904 testcase 2014-09-04 14:36:23 -04:00
Marius Kintel fc26d25011 #915 Make QScintilla editor the default 2014-09-04 14:25:41 -04:00
Marius Kintel 15d596099c Disabled some tests for Travis which fails due to Gallium 0.4 driver issues on Ubuntu 12.04 2014-09-04 13:49:12 -04:00
Marius Kintel 0d304f7e43 #924 Made MDI and undocking options visible again 2014-09-04 12:18:46 -04:00
Marius Kintel c4485cfdeb Merge pull request #879 from openscad/scintillaeditor 
Scintilla Editor
 2014-09-03 16:44:35 -04:00
Torsten Paul dab35ffa40 Use strong bindings for the liberation font aliases. 2014-09-03 21:55:18 +02:00
Marius Kintel 45a649d6ab #879 fix some keyboard binding issues 2014-09-03 15:00:52 -04:00
Marius Kintel 9ef3349e4e #879 fixed some minor layout and shortcut issues 2014-09-03 14:52:41 -04:00
Marius Kintel 845df0cce1 Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	scripts/mingw-x-build-dependencies.sh
 2014-09-03 12:46:54 -04:00
Marius Kintel de2e1090ca Merge branch 'master' of github.com:openscad/openscad 2014-09-03 12:28:16 -04:00
Marius Kintel c7f8d283e2 Merge pull request #928 from openscad/mingw-master 
MXE master / Fix Windows cache folder
 2014-09-03 12:14:42 -04:00
Marius Kintel 546c8dd1d7 constness, codingstyle 2014-09-03 12:14:27 -04:00
Marius Kintel 98fb23f6b3 Merge pull request #929 from openscad/fix-fontconfig 
Fix fontconfig logic
 2014-09-03 12:12:00 -04:00
Torsten Paul af9843d91b Remove code to add Windows font folder - handled by fonts.conf. 2014-09-03 17:46:27 +02:00
Torsten Paul 3d2290c203 Use FcMatchPattern to make alias replacement work. 2014-09-03 17:43:19 +02:00
Torsten Paul 64e66bb397 Move additional conf files for fontconfig back to previous location. 2014-09-03 15:37:57 +02:00
Torsten Paul 2959cd0f30 Install fontconfig configuration folder. 2014-09-03 00:36:05 +02:00
Torsten Paul fde1b89cd9 Switch to MXE master branch using mingw-w64/static targets. 2014-09-03 00:36:05 +02:00
Torsten Paul a95b14da42 Add platform abstraction for setenv() which is not supported on MinGW. 2014-09-03 00:36:05 +02:00