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

687 Commits

Author SHA1 Message Date
Laurent Rineau 46923342ad Merge pull request #7576 from albert-github/feature/issue_7395 
issue #7395 Improvement of layout of model relations

# Conflicts:
#	Kernel_23/doc/Kernel_23/CGAL/Vector_2.h
 2023-09-07 10:48:34 +02:00
Laurent Rineau b32a8331ed Merge branch '5.6.x-branch' 
# Conflicts:
#	Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
 2023-09-07 10:41:33 +02:00
Laurent Rineau 5223c8e85d fix issue Sphere_3 intersection with interval arithmetic fails on 5.6 (works on 5.2.2) #7666 
There was a compilation error because the conversion from
`Needs_FT<Uncertain<bool>>` to 'bool' requires two user-defined
conversions. With an explicit conversion, that compiles and works.
 2023-08-28 15:19:27 +02:00
albert-github 93001308f4 Merge branch 'master' into feature/issue_7395 
# Conflicts:
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
 2023-08-18 11:10:42 +02:00
Sébastien Loriot 5db2fd0195 fix CK3 demo 2023-08-04 10:39:37 +02:00
albert-github ad41766454 issue #7395 Improvement of layout of model relations 
Corrected `cgalModels` to `cgalHasModes` inside `cgalHasNodelsBegin` / `cgalHasModelsEnd`
 2023-07-18 13:23:37 +02:00
albert-github 4e5578d469 issue #7395 Improvement of layout of model relations 
- based on review
 2023-07-15 13:12:15 +02:00
albert-github 301728a8a9 issue #7395 Improvement of layout of model relations 
- Completed the cgalModels part
 2023-07-09 12:43:36 +02:00
albert-github ee2a55279d issue #7395 Improvement of layout of model relations 
- Completed the cgalHasModel part
- corrected spelling of `Has Model` and `Is Model Of` to `Has model` and `Is model of`
 2023-07-06 17:35:34 +02:00
Sébastien Loriot e759fb46fa remove usage of old Object API 2023-06-29 12:57:53 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot 9a0bdb5d96 boost::variant ---> std::variant 2023-06-15 10:57:10 +02:00
Laurent Rineau fe5a36c08e fix all the CMakeLists.txt for Qt5 2023-04-27 17:27:37 +02:00
albert-github 2d60f46985 issue #7231 Improvement of layout of refines relations. 
- Adjusted cgalRefines according to reviews
- Implemented it in all files
 2023-03-14 17:37:50 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
albert-github 45478184de spelling corrections 
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
 2022-11-15 13:39:40 +01:00
albert-github 7a62583efa spelling corrections 
Some spelling corrections (Directories starting with `C`)
 2022-11-14 19:14:33 +01:00
Mael Rouxel-Labbé 7cb21c24b0 Uniformize message() for missing 3rd party libraries 
STATUS for non-essential, NOTICE for important stuff
 2022-09-06 16:07:31 +02:00
Sébastien Loriot b96f6d5ce9 move is_iterator to type_traits 2022-06-10 09:43:59 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +01:00
Sébastien Loriot 58181afcdb remove useless include directives 2021-11-09 10:16:12 +01:00
Maxime Gimeno 499301c759 More fixes 2021-08-31 16:00:37 +02:00
Mael 8226666398
Merge branch 'master' into Triangulation_on_sphere_2-GF 2021-04-17 11:22:30 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno 
Update maximum cmake versions
 2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Maxime Gimeno 17602e589e Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF 2021-04-07 09:17:51 +02:00
Mael Rouxel-Labbé c5294181db Comment two unreleastic assertions 2021-03-23 14:06:16 +01:00
Mael Rouxel-Labbé ede18b776c Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2021-03-18 10:42:52 +01:00
Maxime Gimeno 7eefc0152a Upgrade demo to Qt5 and modern openGL (base don Circular_kernel_3 demo) 2021-03-16 10:50:20 +01:00
Dmitry Anisimov 00c185b028
Merge branch 'master' into Kernels-decltypes-danston 2021-03-12 12:06:20 +01:00
Maxime Gimeno cc99fd94ad Demo Pass 2021-02-19 16:02:12 +01:00
Dmitry Anisimov 81d9556707 Merge remote-tracking branch 'upstream/master' into Kernels-decltypes-danston 2021-02-10 10:06:45 +01:00
Maxime Gimeno 0e4345741c Do the cpp too 2021-02-10 08:55:34 +01:00
Maxime Gimeno 2500331070 Merge remote-tracking branch 'cgal/master' into Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno 2021-02-09 12:33:52 +01:00
Maxime Gimeno 9cd0d450f9 Remove QDomElements and need for QtXml 2021-02-09 11:31:34 +01:00
Laurent Rineau c5ba414c72 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno 
Graphics_view: Upgrade glsl version in basic_viewer_shaders
 2021-02-05 16:12:42 +01:00
Maxime Gimeno dfc613c342 Add missing makeCurrent() 2021-01-21 10:22:51 +01:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 17e83d573d Fix demos 2021-01-08 11:40:09 +01:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Jane Tournois 5c8df6672a remove CGAL_CFG_MATCHING_BUG_ variants 
the "matching bug" of msvc has been fixed since at least vs 2015
 2020-09-25 14:25:14 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Dmitry Anisimov ad813b4cb0 further removed result_of and result 2020-07-30 16:19:02 +02:00
Dmitry Anisimov acdf4c6bee circular kernel 3 result_of to decltype 2020-07-22 15:23:09 +02:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces 
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
 2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch' 
whitespace+tab removal, merged with option -Xignore-all-space
 2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Laurent Rineau 2c5826dd6f Merge pull request #4474 from sloriot/CGAL-warning_macro 
Update warning macro usages

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
 2020-01-17 16:29:49 +01:00