Commit Graph
61 Commits
Author SHA1 Message Date
Alec Jacobson 05812f73a6 Merge pull request #1371 from libigl/alecjacobson-dev
Phong color mapping for scalar field data, refactor tutorials
2019-12-01 12:14:13 -05:00
Alec Jacobson 8f17104fdc Merge branch 'quad-grid' of https://github.com/libigl/libigl into alecjacobson-dev 2019-11-30 13:05:32 -05:00
Alec Jacobson 6c50f857a9 Merge pull request #1365 from libigl/alecjacobson-patch-test_common
Update test_common.h
2019-11-30 11:53:02 -05:00
Alec Jacobson 017be56c49 Merge pull request #1352 from libigl/alecjacobson-patch-1
Update heat_geodesics.cpp
2019-11-29 08:37:01 -05:00
Alec Jacobson 024785513b Merge pull request #1345 from libigl/alecjacobson-patch-2
fix https://github.com/libigl/libigl/issues/1343
2019-11-10 15:13:07 -05:00
Alec Jacobson 7ab7dc7394 Merge pull request #1344 from libigl/alecjacobson-patch-1
Fix underflow issue when computing normalization
2019-11-08 14:30:02 -05:00
Alec Jacobson b856e042e2 Merge pull request #1337 from libigl/alecjacobson-patch-1
Bug fix in marching_tets
2019-11-03 10:46:04 -05:00
Alec Jacobson 6571c463e3 Merge pull request #1029 from libigl/alecjacobson-patch-1
Eigen Alignment issue
2018-11-26 23:05:11 -05:00
Alec Jacobson d0ccc52e51 Merge pull request #1023 from libigl/alecjacobson-patch-1
Update DownloadProject.CMakeLists.cmake.in
2018-11-19 20:53:59 -05:00
Alec Jacobson db6c89aa0a Merge pull request #1022 from libigl/alecjacobson-patch-1
Update DownloadProject.CMakeLists.cmake.in
2018-11-19 20:52:53 -05:00
Alec Jacobson e32ff7b261 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 92119b407a
2018-09-20 09:11:28 -04:00
Alec Jacobson 43ec627721 Merge branch 'alecjacobson-patch-2' of github.com:libigl/libigl into alecjacobson
Former-commit-id: d2c0af8aed
2018-09-19 10:30:36 -04:00
Alec Jacobson 88e74f8b91 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 0c826a14d0
2018-07-12 09:04:13 -04:00
Alec Jacobson c62871c3c4 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 34a777b10b
2018-05-24 23:16:17 -04:00
Alec Jacobson a9d05645b0 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 9de4b378ec
2018-03-19 09:07:23 -04:00
Alec Jacobson b5e6c1cf42 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: a67b163413
2018-02-23 09:38:41 -05:00
Alec Jacobson b000fd7bb7 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 9a805a9764
2018-01-30 10:06:43 -05:00
Alec Jacobson b179bd7891 Merge branch 'alecjacobson' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 243d786d80
2018-01-30 09:09:46 -05:00
Alec Jacobson b50053672f Merge branch 'alecjacobson' of github.com:libigl/libigl into alecjacobson
Former-commit-id: fec33c8385
2017-12-20 20:55:36 -05:00
Alec Jacobson 8504769360 Merge branch 'alecjacobson' of github.com:libigl/libigl into alecjacobson
Former-commit-id: e98881535a
2017-11-15 16:00:57 -05:00
Alec Jacobson 3b961894f7 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 87549a4b87
2017-10-10 19:21:39 -04:00
Alec Jacobson cacd75bfca Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 77ecfa6a7b
2017-08-21 00:32:18 -04:00
Alec Jacobson 35efa65078 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: a1c901cf85
2017-08-15 14:40:35 -04:00
Alec Jacobson 1e661face8 Merge branch 'alecjacobson' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 2c19a57cc6
2017-08-15 12:32:56 -04:00
Alec Jacobson 6a0a6797ee Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: e9e637f814
2017-07-26 17:55:37 -04:00
Alec Jacobson e47260e387 Merge branch 'alecjacobson' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 691cdbd898
2017-07-19 19:46:12 -04:00
Alec Jacobson 774cf0de32 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 536ee69aed
2017-07-15 12:10:55 -04:00
Alec Jacobson 26b4cee1e9 Merge branch 'alecjacobson' of https://github.com/libigl/libigl into alecjacobson
Former-commit-id: 3887cdd5ec
2017-05-16 14:01:14 -04:00
Alec Jacobson 387916248b Merge branch 'alecjacobson' of https://github.com/libigl/libigl into alecjacobson
Former-commit-id: fa36a49c23
2017-05-03 08:51:27 -04:00
Alec Jacobson d4e377a085 Merge branch 'alecjacobson' of https://github.com/libigl/libigl into alecjacobson
Former-commit-id: c6d246ba1e
2017-05-03 08:48:28 -04:00
Alec Jacobson 6092829931 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 3118555a12
2017-05-03 08:46:51 -04:00
Alec Jacobson 6590384e47 Merge branch 'master' of https://github.com/libigl/libigl into alecjacobson
Former-commit-id: 3945c725af
2017-04-17 08:11:21 -04:00
Alec Jacobson f067e97ad1 Merge branch 'alecjacobson' of github.com:libigl/libigl into alecjacobson
Former-commit-id: d8e8732e74
2017-04-15 11:13:10 -04:00
Alec Jacobson 412c2ee30a Merge branch 'alecjacobson' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 4e8f3540f6
2017-03-13 16:31:50 -04:00
Alec Jacobson 0e9cc700a1 Merge branch 'alecjacobson' of github.com:libigl/libigl into HEAD
Former-commit-id: 737149498a
2017-03-05 12:19:59 -05:00
Alec Jacobson 938629f1f1 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 8f4f7c2764
2017-01-24 08:34:48 -05:00
Alec Jacobson c7a4d25668 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: f3750c41ab
2017-01-18 22:19:38 -05:00
Alec Jacobson 8401426357 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: dec0796b0a
2017-01-11 11:51:51 -05:00
Alec Jacobson 39de9b16b2 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 1869c5d108
2016-12-15 19:09:46 -05:00
Alec Jacobson e452ad7419 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 5d8ab43e18
2016-12-02 09:16:01 -05:00
Alec Jacobson 3db11425f8 add alecjacobson (devel) branch to appveyor
Former-commit-id: 0f48960794
2016-11-24 14:16:15 -05:00
Alec Jacobson 5985920c44 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 31deefb44d
2016-11-22 10:56:30 -05:00
Alec Jacobson 84009f4d90 Merge branch 'rayform-master' into alecjacobson
Former-commit-id: dfd5e565b3
2016-11-10 08:49:24 -05:00
Alec Jacobson aabd0c90c4 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: a834eee6bd
2016-10-27 18:44:16 -04:00
Alec Jacobson f2df82ccd0 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 6d946ac67e
2016-10-25 09:50:28 -04:00
Alec Jacobson 8beb89fea9 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 6174a89c7a
2016-10-20 22:02:05 -04:00
Alec Jacobson 30fe397965 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: a398c39e39
2016-10-17 15:54:21 -04:00
Alec Jacobson 4611c75e65 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: f2d889b069
2016-09-30 15:31:08 -04:00
Alec Jacobson f5a30a2808 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: aeb61319ed
2016-09-14 13:39:26 -04:00
Alec Jacobson d1e9fd0c96 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 7be3e297d3
2016-09-03 10:40:08 -04:00
Alec Jacobson cd78d3408b Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: d9aa0d5fa6
2016-08-24 01:44:08 -04:00
Alec Jacobson 53a7cdc2aa Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 859ad326e6
2016-08-17 10:58:12 -04:00
Alec Jacobson cd9945dc0f Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 67b7df637e
2016-07-14 15:13:19 -05:00
Alec Jacobson b0cff644f3 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: c0316c0794
2016-07-13 15:51:11 -04:00
Alec Jacobson 1c611fef94 Merge branch 'alecjacobson' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 0143388a41
2016-07-13 13:19:34 -04:00
Alec Jacobson b8c3cbb674 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 1bd55d336a
2016-06-25 08:59:06 -04:00
Alec Jacobson aa2ca23eb3 Merge pull request #291 from libigl/alecjacobson
Trim meshes with solid using subroutines from boolean code

Former-commit-id: cb3ce78797
2016-06-22 14:45:11 +02:00
Alec Jacobson d419433d31 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 512a3330e9
2016-06-22 12:05:22 +02:00
Alec Jacobson 71b317ae74 Merge pull request #288 from libigl/alecjacobson
V F in code style (test command line pull request)

Former-commit-id: 31847bf6f3
2016-06-16 10:19:01 -04:00
Alec Jacobson 637eb7e8c1 examples/jacobson user
Former-commit-id: ee28cb03b9
2015-05-28 22:01:39 -04:00
Alec Jacobson 0a2dc4269e Merge https://github.com/alecjacobson/libigl
Conflicts:
	LICENSE
	README.md

Former-commit-id: 3259c1b56a
2014-02-25 17:47:57 +01:00