Related Objects
- Mentioned In
- T27033: Clean up stale remote branches
Event Timeline
[b5c5e4]: Merge branch 'bug-16235-RedesignSOFAIntegration'
Merged commits:
2013-10-07 15:48:48 Stefan Kislinskiy [2516e0]
Rewrote Simulation module and plugins.
2013-10-07 13:33:03 Stefan Kislinskiy [d37eaa]
Added freeglut to external projects and made SOFA using MITK superbuild versions of freeglut and GLEW.
[253054]: Merge branch 'bug-16235-LinkToMitkThirdpartyDownloads'
Merged commits:
2013-10-08 12:21:51 Stefan Kislinskiy [fee89c]
Changed link to freeglut tarball to official MITK thirdparty download.
[2e582a]: Merge branch 'bug-16235-DisableSOFAOnApple'
Merged commits:
2013-10-08 12:47:24 Stefan Kislinskiy [278abb]
COMP: Disabled SOFA on Apple systems until we found a way of compiling freeglut on these platforms.
[9b7b96]: Merge branch 'bug-16235-TempDisableMSVC2008Support'
Merged commits:
2013-10-08 15:51:03 Stefan Kislinskiy [2e1357]
COMP: Disabled MSVC 2008 support until we figured out how to solve redefinition bugs.
[80a70f]: Merge branch 'bug-16235-UnixFix1'
Merged commits:
2013-10-09 11:28:03 Stefan Kislinskiy [aa1d23]
COMP: Temporary fix for unix.
[eecb7e]: Merge branch 'bug-16235-MITK_USE_GLUT'
Merged commits:
2013-10-09 13:28:45 Stefan Kislinskiy [84b49d]
COMP: Added missing condition that checks for MITK_USE_GLUT.
[2989a6]: Merge branch 'bug-16235-FreeglutConfigH'
Merged commits:
2013-10-10 09:43:36 Stefan Kislinskiy [f5d6d2]
COMP: Enhanced CMake script of freeglut.
[f8ad1b]: Merge branch 'bug-16235-SpecularColorIsFloatProperty'
Merged commits:
2013-10-10 14:32:57 Stefan Kislinskiy [217190]
Adapted material.specularPower to changed type.
[c91553]: Merge branch 'bug-16235-AppleFix1'
Merged commits:
2013-10-10 16:13:55 Stefan Kislinskiy [9b5e22]
Let SOFA find GLUT on Mac.
[4a59a9]: Merge branch 'bug-16235-NoGLUTIfAPPLE'
Merged commits:
2013-10-11 12:57:15 Stefan Kislinskiy [e249e3]
MITK_USE_GLUT is only activated when MITK_USE_SOFA is set but not APPLE.
[04a79b]: Merge branch 'bug-16235-GLUTApple2'
Merged commits:
2013-10-12 13:28:04 Stefan Kislinskiy [66c5a7]
COMP: Use external GLUT instead of freeglut on Mac.
[7d21d5]: Merge branch 'bug-16235-CaseSensitiveFileRenaming'
Merged commits:
2013-10-12 13:40:25 Stefan Kislinskiy [fd5470]
COMP: Rename files (2/2).
2013-10-12 13:39:49 Stefan Kislinskiy [ce6cc3]
COMP: Rename files (1/2).
[d11844]: Merge branch 'bug-16235-UseSofaGLUTIncludes'
Merged commits:
2013-10-13 13:10:14 Stefan Kislinskiy [46e092]
COMP: Use GLUT includes of SOFA instead of original ones to be compatible with Mac.
[6636df]: Merge branch 'bug-16235-SimulationPluginAppleCompilerFix'
Merged commits:
2013-10-13 15:24:04 Stefan Kislinskiy [8af3f6]
COMP: Case sensitive file renaming (2/2).
2013-10-13 15:23:38 Stefan Kislinskiy [189f55]
COMP: Case sensitive file renaming (1/2).
2013-10-13 15:22:04 Stefan Kislinskiy [b3efc0]
COMP: Added typename keyword.