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

312 Commits (2bdf02d35257e5b4f698d596b670b89cb530a75a)

Author SHA1 Message Date
Marius Kintel 2bdf02d352 Cleaned up c++11 config a bit 2014-11-06 12:53:53 +01:00
Marius Kintel 637244d59e Merge remote-tracking branch 'origin/master' into c++11 2014-11-06 12:41:54 +01:00
Torsten Paul ebb7dde012 Fix status handling for docked windows. 
Especially for the case where the windows are docked as tabs in the
same position, the "visibility-changed" signal does not work as close
indicator. The window is also treated as invisible when just the tab
is invisible, not only in case the window is closed.
 2014-10-20 00:21:06 +02:00
Marius Kintel a4b999e0d4 Use same UI inheritance style for launchingscreen as other components, indentation fixes 2014-10-09 17:21:15 -04:00
Marius Kintel 7343290ffc Removed empty toolbar subtypes 2014-09-30 17:25:01 -04:00
Marius Kintel 6ed2acf791 Merge remote-tracking branch 'origin/master' into Toolbar2 2014-09-29 11:46:45 -04:00
Torsten Paul 4eb53d3355 Add fonts folder to 'make install'. 2014-09-21 21:38:40 +02:00
Torsten Paul e68fc74c87 Merge branch 'master' into Toolbar2 
Conflicts:
	openscad.pro
	openscad.qrc
 2014-09-15 21:49:47 +02:00
Torsten Paul f8336029f1 Merge branch 'master' into launchingscreen 
Conflicts:
	openscad.pro
 2014-09-15 19:58:55 +02:00
Keven Villeneuve adbe4c9d86 Modernise help library info 2014-09-14 22:08:18 -04:00
shaina7837 3f37cf8c50 toolbar splitted into two 2014-09-14 20:39:12 +02:00
shaina7837 efb23fc9bd toolBar-subclass of QToolBar added 2014-09-14 20:39:05 +02:00
shaina7837 7345de27b1 toolbar set 2014-09-14 20:38:20 +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 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 3a3ffc0118 Merge remote-tracking branch 'origin/master' into c++11 2014-09-02 00:16:38 -04:00
Marius Kintel 67c68634b6 Be more verbose when using c++11 2014-09-02 00:16:36 -04:00
Marius Kintel e3960304bd #879 Implemented wheel zoom for scintilla editor 2014-08-23 01:18:51 -04:00
Marius Kintel 79f44ae7fa Fix file drops to legacy editor, misc. cosmetics 2014-08-22 14:17:24 -04:00
Marius Kintel 138d5bc57e Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	src/MainWindow.h
	src/Preferences.ui
	src/mainwin.cc
 2014-08-22 12:59:10 -04:00
Marius Kintel de6bcb1786 small reorg of cgalutils namespace 2014-08-19 22:02:08 -04:00
Marius Kintel 6405456c8a Renamed CGAL_renderer to CGAL_OGL_Polyhedron for clarity 2014-08-15 13:04:34 -04:00
Marius Kintel e70bc04197 Colormap functionality from pull request #816, mostly by Don Bright, includes new colormaps by shaina 2014-08-14 17:16:24 -04:00
shaina7837 ad11bd8cd2 launching screen 2014-08-01 22:32:55 +05:30
Marius Kintel af8c3ee9d1 Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	src/PlatformUtils.cc
 2014-07-22 14:48:45 -04:00
Marius Kintel 28864037ee Split info() function into separate file as it depends on too many defines and external libs 2014-07-22 13:32:44 -04:00
Marius Kintel 68962e1c01 Allow building without scintilla 2014-07-17 15:28:23 -04:00
Marius Kintel 6270441341 Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	openscad.pro
	src/mainwin.cc
 2014-07-17 15:07:42 -04:00
Marius Kintel b394da33c7 Mac: Disallow c++11 if dependencies are linked against libstdc++ 2014-06-21 16:52:35 -04:00
Marius Kintel a0875c845c Merge remote-tracking branch 'origin/master' into c++11 2014-06-21 16:15:56 -04:00
Marius Kintel 458d60faa6 Refactored the camera handling a bit, added --viewall cmd-line parameter 2014-06-19 17:47:38 -04:00
shaina7837 25bf6dd20b new lexer added 2014-06-17 21:45:04 +05:30
shaina7837 5936bc2243 added 2014-06-17 21:27:28 +05:30
shaina7837 9d35c792ed scad lexer added 2014-06-17 21:04:54 +05:30
Marius Kintel 11ca82dbb5 Moved scintilla config to scintilla.pri, enabled scintilla by default 2014-06-13 14:41:40 -04:00
Marius Kintel c4f369fbf8 Merge branch 'master' into c++11 
Conflicts:
	openscad.pro
 2014-06-10 00:16:05 -04:00
Marius Kintel da56dff89d minor c++11 config fixes 2014-06-10 00:15:14 -04:00
Marius Kintel a5a3d8f4cf Some minor cleanup 2014-06-10 00:14:45 -04:00
Marius Kintel 27a2be8411 Applied Oskar's libc++ patches from #828 to master 2014-06-09 23:36:24 -04:00
Marius Kintel 7b4411bbcc We're actually checking for libc++, not c++11 2014-06-09 23:35:33 -04:00
Marius Kintel 35222064c1 Adapt to using CONFIG+=c++11 2014-06-08 00:03:06 -04:00
Marius Kintel 7f782832d7 Merge remote-tracking branch 'origin/mac_libc++_build' into c++11 2014-06-07 23:45:31 -04:00
Oskar Linde c5bc92d97c Mac: Automate build with libc++ when not using OPENSCAD_LIBRARIES 
Conflicts:
	openscad.pro
 2014-06-08 01:27:44 +02:00
Marius Kintel 2eb96a2a88 Build as c++11. On Mac, build as c++11 if as libc++-linked boost exists 2014-06-07 17:48:42 -04:00
shaina 950ffe9722 layout problem of editor is solved 2014-06-07 17:43:52 +02:00
Marius Kintel 22e884d08f Quick and dirty fixup 2014-06-07 17:43:52 +02:00
shaina 59a71b7e6e added scintilla editor classes 2014-06-07 17:43:52 +02:00
shaina 5a0df4e6d9 legacyeditor 2014-06-07 17:43:46 +02:00
Marius Kintel 2cf6dcacf2 Merge branch 'master' into c++11 2014-06-05 19:18:33 -04:00
Marius Kintel 2cba2a1b55 Merge branch 'master' into text-module 
Conflicts:
	scripts/macosx-build-homebrew.sh
	scripts/mingw-x-build-dependencies.sh
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh
	src/GeometryEvaluator.h
	src/MainWindow.ui
	src/clipper-utils.h
	src/mainwin.cc
	tests/CMakeLists.txt
 2014-04-26 22:08:31 -04:00