Commits · 21e86c78d2f0ad4308905d2aeec81e84077e5fa6 · Thomas Pitiot / CGoGN

27 Jan, 2015 2 commits
- Merge branch 'develop' into 'master' · 21e86c78
  Lionel Untereiner authored Jan 27, 2015
```
Develop

See merge request !1
```
  21e86c78
- old fashioned IHM3 are back · a0a2dc32
  Lionel Untereiner authored Jan 27, 2015
  
  a0a2dc32
22 Jan, 2015 1 commit
- Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop · 652fa86d
  Lionel Untereiner authored Jan 22, 2015
  
  652fa86d
12 Jan, 2015 4 commits
- Merge branch 'develop' into 'develop' · 6471d0c6
  Sylvain Thery authored Jan 12, 2015
```
Develop

See merge request !27
```
  6471d0c6
- bug install tinyXml2 · 57766e9f
  Sylvain Thery authored Jan 12, 2015
  
  57766e9f
- Merge branch 'develop' into 'develop' · aac63fd5
  Sylvain Thery authored Jan 12, 2015
```
Develop

See merge request !26
```
  aac63fd5
- TinyXml2 with superbuild git add CMakeLists.txt SCHNApps/CMakeLists.txt ThirdParty/CMakeLists.txt · f0d34ac4
  Sylvain Thery authored Jan 12, 2015
  
  f0d34ac4
22 Dec, 2014 1 commit
- Merge branch 'develop' into 'develop' · ffaa09d7
  Sylvain Thery authored Dec 22, 2014
```
Christmas merge

See merge request !24
```
  ffaa09d7
16 Dec, 2014 2 commits
- cmake find module for tinyXml2 · 8767ff30
  Sylvain Thery authored Dec 16, 2014
  
  8767ff30
- resolve bug of deleted marked darts · 549f0bff
  Sylvain Thery authored Dec 16, 2014
  
  549f0bff
03 Dec, 2014 1 commit
- resolve bug of leaving markers after removing darts · 09aaaf4e
  Sylvain Thery authored Dec 03, 2014
  
  09aaaf4e
28 Nov, 2014 1 commit
- replace libXml2 by tinyxml2 · 51206dcd
  Sylvain Thery authored Nov 28, 2014
  
  51206dcd
22 Nov, 2014 2 commits
- Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop · e38ed6af
  Lionel Untereiner authored Nov 22, 2014
```
Conflicts:
	Apps/Tuto/Modelling/tuto_oper2.cpp
	apps_cmake.txt
	src/Utils/clippingShader.cpp
```
  e38ed6af
- some changes · c8558691
  Lionel Untereiner authored Nov 22, 2014
  
  c8558691
18 Nov, 2014 1 commit
- add picking in qtQGLV · f2a4af2f
  Sylvain Thery authored Nov 18, 2014
  
  f2a4af2f
17 Nov, 2014 5 commits
- Merge branch 'develop' of /home/git/repositories/thery/cgogn into develop · 65df6922
  Sylvain Thery authored Nov 17, 2014
  
  65df6922
- copy/cut stupid bug! · d71634ef
  Sylvain Thery authored Nov 17, 2014
  
  d71634ef
- Merge branch 'develop' of /home/git/repositories/thery/cgogn into develop · c19302bb
  Sylvain Thery authored Nov 17, 2014
  
  c19302bb
- GLbug on intel HD4400 · 8cb0d143
  sylvain thery authored Nov 17, 2014
  
  8cb0d143
- full GL 3.3 coreprofile support · 329e575f
  Sylvain Thery authored Nov 17, 2014
  
  329e575f
06 Nov, 2014 3 commits
- Merge branch 'develop' of /home/git/repositories/thery/cgogn into develop · 2b08f627
  Sylvain Thery authored Nov 06, 2014
  
  2b08f627
- remove some warnings on mac · 34bee0a6
  Thery Sylvain authored Nov 06, 2014
  
  34bee0a6
- bug compil mac · e55a08ee
  Sylvain Thery authored Nov 06, 2014
  
  e55a08ee
05 Nov, 2014 3 commits
- remove warnings on mac · de0258e4
  Sylvain Thery authored Nov 05, 2014
  
  de0258e4
- update glm of ThirdParty · aac662e8
  Sylvain Thery authored Nov 05, 2014
  
  aac662e8
- solve pb of compil with gcc 4.9 · f608c3d9
  Sylvain Thery authored Nov 05, 2014
  
  f608c3d9
04 Nov, 2014 1 commit
- schnapps interface modifs · 3cae3e11
  Sylvain Thery authored Nov 04, 2014
  
  3cae3e11
23 Oct, 2014 2 commits
- bug compil schnapp under mac · c12a2401
  Sylvain Thery authored Oct 23, 2014
  
  c12a2401
- add addAttribute with type in string · e069adeb
  Sylvain Thery authored Oct 23, 2014
  
  e069adeb
17 Oct, 2014 2 commits
- Merge branch 'develop' of /home/git/repositories/thery/cgogn into develop · 90c9261b
  Sylvain Thery authored Oct 17, 2014
  
  90c9261b
- resolve bug of removeMap in schnapps · f80538a5
  Sylvain Thery authored Oct 17, 2014
  
  f80538a5
15 Oct, 2014 1 commit
- topoRender + schnappsTopoRender · 2e3d2fa2
  Sylvain Thery authored Oct 15, 2014
  
  2e3d2fa2
29 Sep, 2014 3 commits
- Fix thread parameter in ihm3.h/.hpp · 38233cd7
  Lionel Untereiner authored Sep 29, 2014
  
  38233cd7
- Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop · 997d253d
  Lionel Untereiner authored Sep 29, 2014
```
Conflicts:
	apps_cmake.txt
	include/Algo/ImplicitHierarchicalMesh/ihm3.hppxx
	include/Algo/ImplicitHierarchicalMesh/ihm3.hxx
	include/Algo/Modelisation/subdivision3.h
	include/Algo/Modelisation/subdivision3.hpp
	include/Algo/Modelisation/tetrahedralization.hpp
```
  997d253d
- modifs sur les IHM3 + correction attributs · 781c9c5a
  Lionel Untereiner authored Sep 29, 2014
  
  781c9c5a
25 Sep, 2014 3 commits
- add slot for selecting map from python console · 99686812
  Sylvain Thery authored Sep 25, 2014
  
  99686812
- Merge branch 'develop' of /home/git/repositories/cgogn/cgogn · c9128d9f
  Sylvain Thery authored Sep 25, 2014
  
  c9128d9f
- Merge branch 'develop' of /home/git/repositories/thery/cgogn into develop · c2fbbbce
  Sylvain Thery authored Sep 25, 2014
  
  c2fbbbce
24 Sep, 2014 1 commit
- normal vbo creation at computing (if checked) · 9a03f38e
  Sylvain Thery authored Sep 24, 2014
  
  9a03f38e
23 Sep, 2014 1 commit
- color interface for schnapps render plugin · 3194ec6e
  Sylvain Thery authored Sep 23, 2014
  
  3194ec6e