2152c3ee88
Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere
...
# Conflicts:
# modules/imgui/src/renderproperties.cpp
2017-12-11 09:12:13 -05:00
c9aedb084b
Add Lua functions to query keyboard bindings and remove individual keybinds
...
Add core script file that defines possibility of rebinding keyboard commands to a different key
Enable the execution of global customization scripts
Make `scene_helper.lua` a script automatically included in the ScriptScheduler
2017-12-08 14:58:18 -05:00
b031245a19
Changed behaviou of max billboard sizes.
2017-12-08 13:03:36 -05:00
28fc1d08a7
Disabled OpenGL logging.
2017-12-05 11:02:12 -05:00
a797c2b6db
Merged master into NewAtmosphere
2017-12-01 17:13:04 -05:00
8e0fde947d
Cleanup ScreenSpaceFramebuffer (fix orientation issue)
...
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
cd1c695944
Improved RendedrablePlanesCloud rendering times.
2017-11-22 11:55:37 -05:00
0264a3026c
Merged master into NewAtmosphere.
2017-11-15 18:12:58 -05:00
67033c4583
Tentative fix for billbords alingment problems.
2017-11-15 17:35:00 -05:00
9885c00beb
Performance improved atmosphere.
2017-11-07 15:57:25 -05:00
bc4e0e4af0
Refactor item overlap and add standoff distance
2017-11-06 11:02:58 -06:00
dc9831b6a6
Add progress bar to the loading screen
...
Add configuration options to customize the loading screen
2017-11-05 14:49:46 -05:00
089cfe727f
Improved ATM perfomance (still working on it). Debugging billboards alingment (in progress).
2017-11-03 17:10:03 -04:00
735d6378d9
More work on loading screen
...
Multithreaded SceneGraphNode initialization
2017-11-03 14:06:51 -04:00
50fd9309ba
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
eaca6c7487
Add SceneLicense information to the Scene
...
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
637e74a9dc
Merged master into NewAtmosphere.
2017-10-19 14:23:06 -04:00
7377d63794
Clean up digitaluniverse data folder
...
Add mod files
Add Moon WAC wms file
2017-10-17 21:36:54 -04:00
d36e32e560
Merged master into NewAtmosphere.
2017-10-17 20:14:41 -04:00
d628c1a667
Merge branch 'master' into feature/DU
...
# Conflicts:
# data/scene/grids/grids.mod
# ext/sgct
2017-10-17 17:09:37 -04:00
a303bf3aa8
Fix for mission visualization
...
Change default monospaced font
2017-10-16 16:27:32 -04:00
0ed72d6652
Merge branch 'master' into feature/DU
2017-10-04 09:36:37 -04:00
600536e7f8
Added colormap range defined. Added VectorListVerifier. Added Text rendering. Added other datavar types for Tully. Added transformantion matrix.
2017-10-04 09:23:49 -04:00
74f0da9033
Added new data, new RenderableBillboardsCloud renderable, added and fixed multiple shaders.
2017-09-22 08:12:45 -04:00
ea5382c028
Volume conversion and rendering ( #350 )
...
Add volume rendering features
- Improve task runner
- Improve reading from CDF files
- Basic time varying volume rendering
- Fix scaling bug in RenderableToyVolume
2017-09-22 12:03:23 +02:00
2d0da72a50
Merged master into atm.
2017-08-16 12:00:28 -04:00
f95411b1cc
Removed atmosphereerath scene, mod and data files.
2017-08-16 09:39:29 -04:00
5ca44d4aa1
Allow RenderableGlobe to have a single radius
...
Make GlobeBrowsing scene the new default scene
2017-07-27 17:24:22 -04:00
20003d5b32
Merged master into NewAtmosphere.
2017-07-21 15:02:24 -04:00
e661324002
Remove style guide errors
...
Add missing newline errors
2017-07-21 11:52:25 -04:00
b0c65d416b
Merged master into NewAtmosphere.
2017-07-17 16:22:33 -04:00
0e9edaeb12
Fix byte order mark commits
...
Update Ghoul
2017-07-17 15:54:00 -04:00
4ecb98f06f
Feature/globe shading ( #363 )
...
* Perform Oren Nayar diffuse shading on globes.
* Remove unused propertyowner
* Enable accurate normals for globes
* Use property for accurate normals.
* Correctly calculate height when scale is changed.
* Auto update line endings to LF in main.cpp and openspaceengine.cpp
* Clean up and comment
* Convert shader indentation to spaces (Wooooops..).
* Line endings
* Line endings and small fixes
* Line endings
* Clean up
2017-07-14 16:33:03 +02:00
fd7971c1ed
Merge branch 'master' into feature/multitouch
2017-07-13 21:02:43 -06:00
d9fa55581f
changes from PR comments
2017-07-13 20:10:35 -06:00
135b1af324
Fix config file. Merge.
2017-07-13 18:24:49 -06:00
b4c128306f
Merge branch 'master' into feature/statlogs
...
* master:
Add the ability to add OpenGL error checking and function call logging though the openspace.cfg file
Automatically set SGCT_SPOUT_SUPPORT when OPENSPACE_SPOUT_SUPPORT is set
2017-07-13 18:16:23 -06:00
c3929f5d6d
Add the ability to add OpenGL error checking and function call logging though the openspace.cfg file
2017-07-13 14:52:13 -04:00
78c301ec8d
Merge branch 'master' into feature/multitouch
2017-07-13 11:07:39 -06:00
2484234651
Reset cfg for ${LOGS} after merge
2017-07-13 11:07:04 -06:00
98534bc1ec
Normalize ALL the line endings ( #361 )
...
* Normalize ALL the line endings
* Add Ghoul respository and openspace.cfg
2017-07-13 12:08:47 -04:00
6f4df093a6
no powerwall by default
2017-07-12 12:22:36 -06:00
76e0e6c59c
last merge with master
2017-07-10 18:41:06 -06:00
c26fe4b279
Move SGCT config files into main config folder and remove unused transferfunctions
2017-07-08 16:06:45 -04:00
e237b6f8e6
Adding eclipse shadows to GlobeBrowsing and ATM.
2017-07-05 14:54:45 -04:00
a37b0388bb
Merged master into atmosphere's branch.
2017-06-21 14:46:10 -04:00
7f39ebb49c
cleanup and commented all code
2017-06-20 15:06:38 -06:00
dd95757460
Ooops
2017-06-09 11:46:36 -04:00
ec8fc7855f
Add OpenGL Debug supression for Intel card GL_LINE_WIDTH warnings
2017-06-09 11:43:43 -04:00
f487107eaa
Added missing semicolon to vertex shader.
2017-06-08 13:21:04 -04:00
Alexander Bock