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

3814 Commits

Author SHA1 Message Date
Simon Giraudot 41519e3010 Proposal for imported targets 2020-04-15 14:05:18 +02:00
Sebastien Loriot 2167d4ffef
Merge pull request #4454 from maxGimeno/TDS-file_input-maxGimeno 
Triangulation_3: Add a function to file_input() with a similar API to the advanced copy_tds()
 2020-04-08 16:09:36 +02:00
Simon Giraudot 25c7c570eb Update CHANGES.md 2020-04-06 09:05:29 +02:00
Sebastien Loriot 560243e72a
Merge pull request #4198 from afabri/Distance-robustify-GF 
Make 2d segment segment distance more robust for kernel with inexact constructions
 2020-04-02 15:01:46 +02:00
Maxime Gimeno e02a3fc37e Merge remote-tracking branch 'cgal/master' into TDS-file_input-maxGimeno 2020-04-02 15:00:23 +02:00
Maxime Gimeno 383eb3d147 Merge tag 'master_before_no_tws_nor_tabs' into TDS-file_input-maxGimeno 2020-04-02 14:56:03 +02:00
Andreas Fabri fcb25ae136 Add change entry 2020-04-02 13:30:04 +01:00
Andreas Fabri f595a34959 Add change entry 2020-04-02 14:27:16 +02:00
Sébastien Loriot 950ce31a0c Merge pull request #4180 from maxGimeno/Doc_enhancements_and_clarifications-GF 
PMP: Add a function to sample a triangle soup.
 2020-04-02 14:10:42 +02:00
Sébastien Loriot b0a1e84c07 Merge pull request #4104 from sgiraudot/BGL-Alpha_expansion_graphcut-GF 
BGL: Alpha Expansion Graphcut
 2020-04-02 14:00:16 +02:00
Maxime Gimeno 9689a1c1a3 Merge remote-tracking branch 'cgal/master' into Doc_enhancements_and_clarifications-GF 2020-03-27 16:16:47 +01:00
Maxime Gimeno 5ff8d88151 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:15:38 +01:00
Maxime Gimeno b13e863065 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:12:19 +01:00
Sébastien Loriot 92f5f0242e Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:04:33 +01:00
Sébastien Loriot 4421fff65f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:50 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces 
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
 2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch' 
whitespace+tab removal, merged with option -Xignore-space-change
 2020-03-26 14:22:32 +01: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
Mael 855003baa1
Merge branch 'master' into BGL-Alpha_expansion_graphcut-GF 2020-03-24 08:18:23 +01:00
Sebastien Loriot 6d2ada806c
Merge pull request #4153 from necipfazil/gsoc2019-pointmatcher_icp_wrapper-necipfazil 
[Small Feature] OpenGR and PointMatcher wrappers
 2020-03-23 13:35:48 +01:00
Laurent Rineau 2f4e49bfff Fix forward-declarations of CGAL::Surface_mesh 
In the forward-declaration, the template parameters do not matter, but
they do if the code is read by an IDE (with IntelliSense for example).
 2020-03-23 09:47:01 +01:00
Sébastien Loriot eb5d1d9a95 Update from master 2020-03-20 08:58:52 +01:00
Mael de563e9844
Merge branch 'master' into PMP-new_functions-GF 2020-03-20 08:48:39 +01:00
Sébastien Loriot 954d23a64c Merge pull request #4418 from sloriot/PMP-soup_to_mesh_add_vpm 
PMP: Add `point_map` and `vertex_point_map` to `polygon_soup_to_polygon_mesh`
 2020-03-19 16:22:58 +01:00
Mael ddc13ecd69
Update CHANGES.md 2020-03-19 16:07:57 +01:00
Sébastien Loriot 8eeee9c9a8 Update from master after default initialized index maps 
Merge-commit + default map fixes
 2020-03-18 08:10:54 +01:00
Mael 8ee3ec8f7b
Merge branch 'master' into PMP-Add_split_to_clip-GF 2020-03-17 19:47:28 +01:00
Sebastien Loriot 1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno 
PMP: Default Property_maps for Index_maps
 2020-03-17 18:27:55 +01:00
Mael 7406e48f98
Update CHANGES.md 2020-03-17 18:22:38 +01:00
Sébastien Loriot cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF 
Third party libs: improve documentation + introduce new CMake functions
 2020-03-17 18:19:40 +01:00
Sébastien Loriot 08872b80d0 try to fix conflict with master 2020-03-17 16:10:13 +01:00
Sébastien Loriot 60a846a04b update changes 2020-03-17 11:19:35 +01:00
Sebastien Loriot 0c8e9cb0c1
Merge pull request #4212 from maxGimeno/Demo-Save_the_scene_entirely-maxGimeno 
CGAL 3D Demo: Enhancement of the Scene Saving System
 2020-03-16 16:35:45 +01:00
Sébastien Loriot 32813dc976 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-16 16:32:47 +01:00
Maxime Gimeno 2424d54e30 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-12 12:10:44 +01:00
Laurent Rineau 41316e25ef Protect MSVC specific compilation flags with $<COMPILE_LANGUAGE:CXX> 
Fix issue #4571
 2020-03-11 09:57:46 +01:00
Simon Giraudot feaa8ce598 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-03-05 15:58:17 +01:00
Laurent Rineau 57e699ac67 Merge pull request #4502 from maxGimeno/Convex_hull_3-Overload_for_VertexListGraph-maxGimeno 
Convex_hull_3: Overload for VertexListGraph
 2020-03-05 14:52:25 +01:00
Maxime Gimeno 14669c213c Doc 2020-02-26 12:32:05 +01:00
Laurent Rineau 2b01447391 Next release on this branch will be 5.0.3 2020-02-25 09:46:40 +01:00
Laurent Rineau e40aaafd28 Next release in this branch will be 4.14.4 2020-02-25 09:43:08 +01:00
Maxime Gimeno d8fd359399 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2020-02-24 16:41:34 +01:00
Laurent Rineau e828e60b8d Merge pull request #4521 from maxGimeno/Installation-Fix_CGAL_WITH_Qt5-maxGimeno 
Fix CGAL_Qt5_FOUND issue
 2020-02-14 14:39:11 +01:00
Maxime Gimeno 2dbce59bd8 Merge remote-tracking branch 'cgal/master' into Convex_hull_3-Overload_for_VertexListGraph-maxGimeno 2020-02-14 09:21:38 +01:00
Maxime Gimeno 1955510176 Add CHANGES.md 2020-02-13 15:31:49 +01:00
Maxime Gimeno 8645e59f00 Fix Qt5 COMPONENT installation and don't copy Qt/* at installation step. 2020-02-12 14:24:29 +01:00
Maxime Gimeno 0378d7825f Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-02-10 15:53:05 +01:00
Maxime Gimeno a357a90b1f Changes after review 2020-02-10 15:49:54 +01:00