mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity
844 Commits 99 Branches 46 Tags
11c4757073ca6a06d66b49b2bec5c9a572bc6adc
Commit Graph

844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Bock
11c4757073 Merge branch 'develop' into plutoViz 2015-02-19 14:45:11 +01:00
Alexander Bock
27c5bcaa93 Fix bug where a script execution would stop completely if a property was not found 
Added helper file to ease Lua script callback testing
Made errors in setPropertyValue and getPropertyValue functions not fatal
 2015-02-19 14:43:29 +01:00
Alexander Bock
d96b7146e3 Restore openspace.cfg 2015-02-19 11:16:02 +01:00
Joakim Kilby
b85c47a3f9 Fixed a bug where program crashed during on-screen prints due to argument missmatch 2015-02-19 10:30:34 +01:00
Joakim Kilby
f14f288f19 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 
Conflicts:
	src/rendering/planets/renderableplanet.cpp
	src/rendering/planets/renderableplanetprojection.cpp
	src/rendering/renderablefov.cpp
 2015-02-19 10:07:38 +01:00
Joakim Kilby
24d8f8c41e Bug fixes 2015-02-19 10:04:02 +01:00
Joakim Kilby
d913132852 Changes to pointer usage in these files. 2015-02-19 10:02:55 +01:00
Joakim Kilby
417f5c8f6c Fixed synchronization bug when master runs at a different FPS than slaves. 
Scripts are now queued when received and then executed,
 2015-02-19 10:02:07 +01:00
Michal Marcinkowski
88c976e16e progress indicator back. 2015-02-18 19:51:57 -05:00
Michal Marcinkowski
971381b150 fov lines, check. 2015-02-18 19:41:56 -05:00
Joakim Kilby
3d04af03a3 Merge branch 'develop' into plutoViz 
Conflicts:
	include/openspace/rendering/planets/simplespheregeometry.h
	include/openspace/util/powerscaledsphere.h
	openspace.cfg
	shaders/pscstandard_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
 2015-02-18 15:52:35 +01:00
Joakim Kilby
383fb1045e changed michals absolute path into a path my system can use 2015-02-18 11:17:31 +01:00
Joakim Kilby
ba53cf0e1f added <stdint> include to fix compilation issue with int32_t datatype 2015-02-18 10:49:54 +01:00
Joakim Kilby
86ab940b56 uncommented the advance time line 2015-02-18 09:27:18 +01:00
Alexander Bock
91195db6a0 Added reasonable size to the default single.xml 
Added path tokens for spice kernels
 2015-02-17 22:14:52 +01:00
Alexander Bock
f39575a051 Updated Openspace-Data 2015-02-17 21:38:44 +01:00
Alexander Bock
8a57db4d55 Changed behavior in LuaConsole autocomplete to only autocomplete until the next separator 2015-02-17 21:24:57 +01:00
Alexander Bock
e99148937d Bugfixing a crash due to wrong decoding 2015-02-17 21:01:55 +01:00
Alexander Bock
d439157d4f Linux compile fix with template specialization 2015-02-17 20:51:25 +01:00
Alexander Bock
08d4ca9f6b Correct alignment for the milkyway texture in the RenderableSphere 
Visual tweaks for RenderableStars
 2015-02-17 20:11:17 +01:00
Alexander Bock
a0fc77a893 Enable the ability to run setting scripts that are executed after the scene has been loaded 2015-02-17 20:10:50 +01:00
Alexander Bock
3651c64af4 Merge branch 'features/imgui' into develop 2015-02-17 19:04:43 +01:00
Alexander Bock
f829f72a4c Added Lua-based GUI for the rest of the implemented properties 2015-02-17 19:04:26 +01:00
Alexander Bock
49e327e985 Correctly read Lua script for VectorProperties 2015-02-17 19:01:57 +01:00
Joakim Kilby
eb7fefb3c9 fixed Alex' bug!! 
Added string specialization to template functions for syncbuffer class
 2015-02-17 17:51:53 +01:00
Alexander Bock
9f16d6f2ac Changing GUI property setting from direct calls to scripting 2015-02-17 15:54:24 +01:00
Alexander Bock
8e4cb00e5e Merge remote-tracking branch 'origin/develop' into features/imgui 2015-02-17 15:11:49 +01:00
Alexander Bock
97d97a8a16 Merge branch 'develop' into features/imgui 2015-02-17 15:11:25 +01:00
Joakim Kilby
5550b0391d Merge branch 'feature/dome' into develop 2015-02-17 14:42:53 +01:00
Joakim Kilby
7c7b4f1f97 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome 2015-02-17 14:41:02 +01:00
Alexander Bock
a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Joakim Kilby
7764553a35 fixing bugs caused by merge 2015-02-17 13:30:45 +01:00
Joakim Kilby
5b3742961e added function for getting un-synchronized position of the camera (only meant to be used on master for calculation of camera matrix and position) 2015-02-17 13:29:45 +01:00
Joakim Kilby
f096d9d9e3 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome 
Conflicts:
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/luaconsole.cpp
	src/rendering/renderengine.cpp
 2015-02-17 12:18:14 +01:00
Joakim Kilby
eafa4e2fe6 changed camera update (for object following) is now done in orbit function of interactionhandler 2015-02-17 12:00:58 +01:00
Joakim Kilby
525b8a4de3 LUA consola now queues scripts instead of runnings them 2015-02-17 12:00:19 +01:00
Joakim Kilby
0f9476519c changed into average delta time instaed of delta time, 
added calls to pre/pro sync and serialize/deserialize of scriptengine and time
 2015-02-17 11:59:52 +01:00
Joakim Kilby
aa66bdeaa4 added synced versions of shared variables and modified set/get methods to adress the right versions of variables 2015-02-17 11:58:57 +01:00
Joakim Kilby
8f924f7696 added serialize, deserialize, post sync and pre sync functions for script engine 2015-02-17 11:58:03 +01:00
Alexander Bock
234b46dbdc Apply newer Ghoul version 2015-02-17 11:19:51 +01:00
Alexander Bock
e30ca93f69 Enabled multicore compilation on default 
Added newest Ghoul version
 2015-02-17 11:13:06 +01:00
Alexander Bock
e712a1e781 Added missing include for Linux compile 2015-02-17 10:57:10 +01:00
Alexander Bock
a2e58f8f7c Added missing include for Linux compile 2015-02-17 10:45:27 +01:00
Alexander Bock
64db01420c Added missing include for Linux compile 2015-02-17 10:40:10 +01:00
Alexander Bock
862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01:00
Alexander Bock
26e69b2b2c Updated openspace-data version 2015-02-17 09:32:57 +01:00
Alexander Bock
d96dc3884c Added properties to change the appearance of stars 2015-02-17 09:31:58 +01:00
Alexander Bock
f87fd42075 Merge remote-tracking branch 'origin/feature/milkyway' into develop 2015-02-17 09:22:43 +01:00
Joakim Kilby
b2a94b2241 Merge branch 'develop' into feature/dome 2015-02-17 08:48:22 +01:00
Joakim Kilby
d1a4a3c2da Merge branch 'feature/updateSGCT' into develop 2015-02-17 08:28:09 +01:00