mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-09 06:48:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
678 Commits 85 Branches 46 Tags
a2a12735f9ada8309dcf6b67a43698f172eee056
Commit Graph

678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Marcinkowski
a2a12735f9 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-01-21 12:03:33 -05:00
Michal Marcinkowski
83976a7c8d intermediate commit (ghoul) 2015-01-21 12:03:18 -05:00
Alexander Bock
9350172c5a Updated Openspace-data 2015-01-21 15:43:07 +01:00
Alexander Bock
8ebd2e4d71 More code cleanup of RenderableFieldlines 2015-01-21 15:13:16 +01:00
Alexander Bock
f752221772 Added Vec4Property to imgui 2015-01-21 15:12:54 +01:00
Alexander Bock
d6a02140ea More RenderableFieldlines code cleanup 2015-01-21 01:44:56 +01:00
Alexander Bock
1a66df3336 More RenderableFieldlines code cleanup 2015-01-21 00:54:02 +01:00
Alexander Bock
f72d151c6c Initial changes to RenderableFieldlines 2015-01-21 00:42:33 +01:00
Alexander Bock
4a44905f48 Add additional check for GUI shader compilation 2015-01-21 00:41:18 +01:00
Alexander Bock
8b26d6abf6 Add include to please Jenkins 2015-01-20 22:05:16 +01:00
Alexander Bock
32b2c4942f Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-01-20 21:54:34 +01:00
Alexander Bock
ec8c5b7132 Revert automatic gui compilation 2015-01-20 21:54:08 +01:00
Alexander Bock
16518dbc96 Allow renderablefieldlines to load a passed file instead of requiring loading through Lua 2015-01-20 21:32:46 +01:00
Joakim Kilby
4b40e88843 Activated imgui compilation on default 2015-01-14 14:39:55 +01:00
jonasstrandstedt
6b164f0b36 Added camera offset support 2015-01-06 12:43:16 +01:00
Alexander Bock
6adb5f8994 Merge branch 'git-ghoul' into develop 2014-12-20 00:24:49 +01:00
Alexander Bock
b2c216c2b6 New module file 2014-12-20 00:15:02 +01:00
Alexander Bock
55a3c43db4 Move imgui file to its own folder 2014-12-18 17:21:20 +01:00
Alexander Bock
e45813dd91 Add stepping value into Property description 2014-12-18 13:46:18 +01:00
Alexander Bock
7cd1374cdb Added description for OptionProperty 2014-12-17 18:52:01 +01:00
Alexander Bock
6336ee998a Added description for SelectionProperty 2014-12-17 18:47:30 +01:00
Alexander Bock
7181a8f9da Remove test code 2014-12-17 18:19:06 +01:00
Alexander Bock
618f3ab930 Add description for numerical properties 2014-12-17 18:18:34 +01:00
Alexander Bock
72adb770f7 Set the correct default values for MatrixProperties 2014-12-17 18:18:12 +01:00
Alexander Bock
5a7a518bad Remove cppcheck warnings 2014-12-16 21:54:53 +01:00
Alexander Bock
c9a3080c48 Updated ghoul repository 2014-12-16 20:09:00 +01:00
Jonas Strandstedt
00338cce67 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-16 19:10:00 +01:00
Jonas Strandstedt
b81133e381 Removes most of Visual Studio warnings 2014-12-16 19:09:32 +01:00
Jonas Strandstedt
6ad4d0743e Updated to most recent ghoul 2014-12-16 18:28:55 +01:00
Alexander Bock
f7c2398b3d Update to newest ghoul version 2014-12-16 16:35:08 +01:00
Jonas Strandstedt
0d519f6789 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-16 11:38:15 +01:00
Jonas Strandstedt
73c123dc69 Updated to latest Ghoul. 2014-12-16 11:37:46 +01:00
Alexander Bock
734ce03d72 Changed the deinitialization of renderable from the destructorto the scenegraphnode 2014-12-15 20:51:00 +01:00
Michal Marcinkowski
edf709cf1b local changes update databranch 2014-12-15 13:21:07 -05:00
Jonas Strandstedt
81574ff905 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-15 17:11:58 +01:00
Jonas Strandstedt
bf0a8291d6 Updated to the most recent Ghoul 
- Using new VertexBufferObject in PowerScaledSphere as a test case.
 2014-12-15 17:10:43 +01:00
Alexander Bock
5dac3926a1 Apply Ghoul changes 2014-12-14 02:33:50 +01:00
Alexander Bock
9dea69d675 Empty commit to get a new HEAD 2014-12-12 23:16:55 +01:00
Alexander Bock
38aacc05a7 removing spice source files in preparation for the big purge 2014-12-12 23:01:20 +01:00
Jonas Strandstedt
eb7488318a Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-12 14:55:48 +01:00
Jonas Strandstedt
56e3851b8f Renamed CPUCapabilitiesComponent to GeneralCapabilitiesComponent 2014-12-12 14:55:16 +01:00
Alexander Bock
6360a5f66a Add methods for generating Property descriptions 2014-12-12 14:47:08 +01:00
Alexander Bock
efab84b4ba Add default description for Properties 
Remove accidental commit
 2014-12-12 14:23:33 +01:00
Alexander Bock
ef30925a5b Make the default window completely show on default 2014-12-12 14:22:05 +01:00
Jonas Strandstedt
5c666a0175 Further work on removing assertions from constructors 2014-12-12 11:46:10 +01:00
Jonas Strandstedt
93a34fa985 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-12 11:00:26 +01:00
Jonas Strandstedt
37a59f3f09 Removed assertions from renderable constructors 
- Removed assertions from RenderableFieldlines constructor
- Removed assertions from RenderableFov constructor, the variables wasn't
  even used.
- Removed assertions from RenderablePath constructor
- Fixed missing delete[] is RenderableSphericalGrid
- Removed assertions from RenderableTrail constructor, added glDelete*
  functions
- Removed assertions from RenderablevolumeGL constructor
 2014-12-12 10:59:28 +01:00
Alexander Bock
119b1eb335 Started work to produce descriptive output for Properties in preparation for GUI generation 2014-12-11 23:41:31 +01:00
Alexander Bock
e70b663dc3 Add log.html to the list of ignored files 
Enable capability to disable on-screen info text
 2014-12-11 18:09:19 +01:00
Jonas Strandstedt
9e61d3ac94 Fixes for RenderableFov 2014-12-11 17:16:41 +01:00