songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
64,306 Commits 3 Branches 156 Tags 965 MiB
Commit Graph

64306 Commits

Author SHA1 Message Date
Andreas Fabri df76f756d4 static_casts; gl ->> gl.gl 2015-07-10 12:41:36 +02:00
Laurent Rineau 7e6e3f62ba Fix a link error "multiple definition of" 
Trivial fix for bug #158
 2015-07-10 12:29:23 +02:00
Andreas Fabri 135f70c65a Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-10 12:28:49 +02:00
Andreas Fabri 46fac706ec fixes for VC++ 2015-07-10 12:28:27 +02:00
Sébastien Loriot e36ae9666b display skeleton widget only once 2015-07-10 12:21:43 +02:00
Sébastien Loriot 3113b619a7 update the name of the skeleton widget 2015-07-10 12:10:01 +02:00
Sébastien Loriot 62a4255b6a update the scene when new items are added 2015-07-10 12:06:24 +02:00
Sébastien Loriot 47b7ac3c07 update script to find QGLviewer so that the environment variable is used first 2015-07-10 11:32:20 +02:00
Laurent Rineau 12e3bde909 updated crontab (automated commit) 2015-07-10 10:49:52 +02:00
Clement Jamin c419bd1246 Added some "using" for the exact same reason 2015-07-10 10:47:12 +02:00
Clement Jamin 580211cc6a Added some this-> to make GCC happy again 
I know, he's right to be angry...
 2015-07-10 10:41:10 +02:00
Clement Jamin 870a49b868 Removed temporary testing code 2015-07-10 10:37:10 +02:00
Sébastien Loriot 0c97a4e39c update installation instruction for configuring Qt5 2015-07-10 10:23:15 +02:00
Clement Jamin 0f17afa049 Octree: bugfix + use of Construct_xxx 2015-07-10 10:00:45 +02:00
Clement Jamin f4f9a75c44 Let's get back to the real traits class 2015-07-10 09:08:54 +02:00
Clement Jamin b0add30089 Updated the concept accordingly 2015-07-10 09:08:20 +02:00
Clement Jamin bb5b745d98 The torus is working fine, now 2015-07-10 09:08:07 +02:00
Clement Jamin fbb6494658 Restore Point_set_shape_detection_3/test_torus_connected_component.cpp 2015-07-10 08:39:20 +02:00
Sven Oesau 3e218a2c07 adapted torus to traits concept 
ToDo: Collinear_2 needs to be adapted
 2015-07-10 00:14:09 +02:00
Sven Oesau bb2998e11f bugfix 2015-07-10 00:12:32 +02:00
Sébastien Loriot 3498e2e61e update layout so that the dock widget shows up 
(cherry picked from commit 386b1c3490)
 2015-07-09 19:23:36 +02:00
Sébastien Loriot 386b1c3490 update layout so that the dock widget shows up 2015-07-09 19:22:12 +02:00
Laurent Rineau 9ce70faffb Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt

There was also a "conceptual conflict" in:
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp
-> Adapt the declaration of the plugin to the Qt5 way.
 2015-07-09 18:04:09 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos 
Previous versions are not tested by the CGAL daily test suite.
 2015-07-09 17:50:22 +02:00
Laurent Rineau 672d2134a8 Fix the CXXDEBUG/OpenMesh issue 2015-07-09 17:40:58 +02:00
Sébastien Loriot e7563d3e05 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' 
Conflicts:
	Installation/changes.html
 2015-07-09 17:30:24 +02:00
Sébastien Loriot ccb823f71d remove unused references 2015-07-09 17:26:59 +02:00
Sébastien Loriot 02a98c3ca4 bugfix: add missing concept for solving normal equation 2015-07-09 17:22:27 +02:00
Andreas Fabri ae168ef060 qt4_wrap_ui -> qt5_wrap_ui but only for this one plugin 
This and the previous commit make that the plugin only builds
if this branch gets merged with the QT5 branch
 2015-07-09 16:38:26 +02:00
Andreas Fabri 2306dae379 upgrade plugin interface 2015-07-09 16:30:32 +02:00
Andreas Fabri 2daae8eb1b static_casts 2015-07-09 16:18:01 +02:00
Sebastien Loriot 279c7129c1 Merge pull request #168 from lrineau/CGAL_ImageIO-fix_VTK_6_support-lrineau 
Update the CGAL_ImageIO-VTK support to VTK 6.x
 2015-07-09 15:03:40 +02:00
Laurent Rineau 6b24740299 Update the VTK support to VTK 6.x 2015-07-09 14:44:02 +02:00
Sébastien Loriot ef02b42c4f add missing } 2015-07-09 14:00:53 +02:00
Andreas Fabri 6c46be1d01 static_casts 2015-07-09 13:17:41 +02:00
Andreas Fabri 2289e5a2af static_ccasts 2015-07-09 13:05:22 +02:00
Andreas Fabri 0ad1c00e68 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-09 12:03:42 +02:00
Andreas Fabri daa8d210b8 int -> size_t 2015-07-09 11:59:48 +02:00
Maxime Gimeno c40f54a7a9 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-09 11:40:33 +02:00
Maxime Gimeno 0365d8611a SEGFAULT fix 
- a GL_FLAT/GL_SMOOTH was remaining, I changed them into Flat || FlatPlusEdges and Gouraud.
 2015-07-09 11:37:47 +02:00
Andreas Fabri 51a972f3d1 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' of github.com:CGAL/cgal-public-dev into gsoc13-CurveSkeleton-new_package-xgao 2015-07-09 11:37:25 +02:00
Andreas Fabri 728f9a86a8 static_casts 2015-07-09 11:36:38 +02:00
Sébastien Loriot 85f6b81666 move position of the package in the overview 2015-07-09 10:43:44 +02:00
Sébastien Loriot 5489927234 remove merge conflict markers 2015-07-09 10:38:41 +02:00
Sébastien Loriot e3e0ccceee update package info 2015-07-09 10:35:45 +02:00
Sebastien Loriot 43de56ba21 Merge pull request #167 from afabri/AvoidMergeConflicts 
Add place holders for the packages to be integrated
 2015-07-09 10:33:23 +02:00
Clement Jamin 00e48dd169 Added right header in comments 2015-07-09 10:27:14 +02:00
Clement Jamin 7ee1ac7c41 Fix warnings 2015-07-09 10:22:43 +02:00
Clement Jamin 33d1b9f971 Doc: updated requirements for the shapes 2015-07-09 10:01:45 +02:00
Clement Jamin 7c45024d90 Dispatched utilities 2015-07-09 09:38:08 +02:00