16fedc73de
Merge commit '64524e8f44763b4601895e0bb896f628f877782b' into feature/websocketnavigation
...
* commit '64524e8f44763b4601895e0bb896f628f877782b':
Renamed "RenderOptionInfo" to "RenderOption" (closes #692 )
Add Lua functions to print cluster id (closes #704 )
Show current and total file size for each download (closes #705 )
Fix subscription bug introduced in code cleanup
Update Ghoul and sgct repository
Add strange units to the distance conversion (closes #703 )
Render text informing of ongoing shutdown (#696 )
Fix bug preventing specification of easing function for property setting (closes #695 )
Make it possible to not load an asset on default and later load it at runtime (closes #694 )
Remove extra opacity value from renderablebillboardscloud and make text labels listen to the opacity (closes #693 )
Conflicts:
ext/ghoul
2018-08-29 11:32:41 -06:00
0c444f09c1
Disengaged Autopilot on disconnect
2018-08-29 11:11:11 -06:00
64524e8f44
Renamed "RenderOptionInfo" to "RenderOption" ( closes #692 )
2018-08-29 12:20:14 -04:00
1f7b482efa
Add Lua functions to print cluster id ( closes #704 )
2018-08-28 13:58:32 -04:00
8acddf74a9
Show current and total file size for each download ( closes #705 )
2018-08-28 13:45:42 -04:00
54d243e86f
Merge branch 'master' of github.com:OpenSpace/OpenSpace
2018-08-28 13:43:32 +02:00
c014d8b84d
Fix subscription bug introduced in code cleanup
2018-08-28 13:42:31 +02:00
179a6d16ae
Autopilot by disabling friction
2018-08-25 12:00:52 -06:00
e43b813670
Initialializing for AutoPilot
2018-08-24 18:00:05 -06:00
ef91e7328f
Update Ghoul for mutex test
2018-08-24 15:18:26 -06:00
46c26b9b00
Update Ghoul and sgct repository
2018-08-24 13:37:54 -04:00
5c9e65c7f2
Add strange units to the distance conversion ( closes #703 )
2018-08-24 03:37:22 -06:00
67dd887e52
Render text informing of ongoing shutdown ( #696 )
2018-08-24 03:15:55 -06:00
63561d685f
Fix bug preventing specification of easing function for property setting ( closes #695 )
2018-08-24 02:48:42 -06:00
4d901b688b
Make it possible to not load an asset on default and later load it at runtime ( closes #694 )
2018-08-24 02:34:55 -06:00
5ad69b841b
Remove extra opacity value from renderablebillboardscloud and make text labels listen to the opacity ( closes #693 )
2018-08-24 02:09:01 -06:00
01fb8bc8d8
Merge commit 'a90023979c2ae719e782eb7821fdc6a3af40f342' into feature/websocketnavigation
...
* commit 'a90023979c2ae719e782eb7821fdc6a3af40f342':
Prevent out-of-bounds error when connecting to parallel peer
Enable Spout on default on windows (closes #691 )
2018-08-22 10:09:10 -06:00
a90023979c
Prevent out-of-bounds error when connecting to parallel peer
2018-08-21 16:50:28 -06:00
ca6a5e03f6
Enable Spout on default on windows ( closes #691 )
2018-08-21 15:24:38 -06:00
894acd88e6
Merge commit 'f4323db011ee8b70831367efa67fc842e74e9212' into feature/websocketnavigation
2018-08-20 11:46:57 -04:00
eb4362751c
FIXME: Dumb fix for clearing the WebsocketInputStates on the inputStates handler
2018-08-15 18:25:13 -04:00
f4323db011
Fix bug causing incorrect apect ratio for manually specified window sizes
2018-08-10 13:28:48 +02:00
3f6f1cc395
Fix for issue #684/GHOUL issue #26 .
...
GHOUL master does not run yet.
2018-08-09 00:11:51 -04:00
492c544a81
Change focus
2018-08-08 18:21:19 -04:00
338d333b04
Send disconnect and connect packets
2018-08-06 16:37:57 -06:00
71ddc1c8b5
Update structure of input values
2018-08-06 13:26:22 -06:00
86d23474f6
Merge commit 'ac76151941f9170ef87cab9f13a487088281e75c' into feature/websocketnavigation
...
* commit 'ac76151941f9170ef87cab9f13a487088281e75c':
Let's stop copying objs.
2018-08-06 09:12:18 -06:00
ac76151941
Let's stop copying objs.
2018-08-06 11:03:22 -04:00
1bda0ae415
Merge branch 'master' into feature/websocketnavigation
...
* master:
Changes from code review.
Fixed issue 675.
Removed commented code.
2018-08-06 08:55:43 -06:00
3a14340fbb
Merge pull request #681 from OpenSpace/issue/675
...
Issue/675
2018-08-06 10:50:04 -04:00
8eb2692abe
IP: Init Focus Nodes
2018-08-04 08:09:19 -06:00
06119d0830
Merge branch 'master' into issue/675
2018-08-01 10:42:27 -04:00
65658e9b46
Changes from code review.
2018-08-01 10:34:59 -04:00
c23053aede
Update new ghoul string conversions
2018-07-31 15:37:09 -06:00
aa6854a829
Merge commit '74fd38c260f852cf224877425c3a5027f12604d3' into feature/websocketnavigation
...
* commit '74fd38c260f852cf224877425c3a5027f12604d3':
Adapt to Ghoul change (use ghoul::to_string instead of std::to_string)
2018-07-31 15:16:24 -06:00
7635b68652
Merge commit 'edc75c562c54e597108c0bb2aaa54abc2ca439a2' into feature/websocketnavigation
...
* commit 'edc75c562c54e597108c0bb2aaa54abc2ca439a2':
Use correct uniform name
Jenkins (#676 )
2018-07-31 15:16:00 -06:00
4e30d9c3b8
Fixed issue 675.
2018-07-31 14:50:10 -04:00
74fd38c260
Adapt to Ghoul change (use ghoul::to_string instead of std::to_string)
2018-07-20 13:56:15 -04:00
edc75c562c
Use correct uniform name
2018-07-20 11:11:30 -04:00
6c0264a0d9
Jenkins ( #676 )
...
Jenkins fix
2018-07-20 10:37:20 -04:00
08711e7c2e
Merge commit 'f55828198f0ba93da0c1258bb73fcca8adf66e00' into feature/websocketnavigation
...
* commit 'f55828198f0ba93da0c1258bb73fcca8adf66e00':
Adapt to UniformCache changes when updating uniform locations (closes #648 )
General cleanup Adapt to changes in Ghoul Make use of TextureManager Jenkins compile fix
Fix setting of FixedRotation values through assets (closes #647 )
Enable OrVerifier and AndVerifier to have an arbritrary (>=2) number of verifiers Make specifying the line number in TLETranslation optional
Add warning when targets are not registered in the convert-table for image projections
2018-07-19 17:36:53 -06:00
f55828198f
Adapt to UniformCache changes when updating uniform locations ( closes #648 )
2018-07-19 17:46:21 -04:00
0774348fc2
General cleanup
...
Adapt to changes in Ghoul
Make use of TextureManager
Jenkins compile fix
2018-07-19 14:43:53 -04:00
335beb8dd3
Removed commented code.
2018-07-19 11:51:28 -04:00
dbdc5dfd28
Fix setting of FixedRotation values through assets ( closes #647 )
2018-07-18 19:20:49 -04:00
9a928231be
Enable OrVerifier and AndVerifier to have an arbritrary (>=2) number of verifiers
...
Make specifying the line number in TLETranslation optional
2018-07-18 18:22:18 -04:00
2fa14e4c26
Merge commit '54d1a506c319f6f1540334681b2ac7629aff555b' into feature/websocketnavigation
...
* commit '54d1a506c319f6f1540334681b2ac7629aff555b':
Add rotation class that provides a constant rotation based on in-game time (closes #662 ) Refactor functions for rotation, scaling, and translation to take UpdateData rather than current time
Add option to disable the console key (closes 655)
Display current delta time when interpolation is happening
Add button to invert delta time (closes #666 , the number of the beast)
2018-07-18 15:56:53 -06:00
982d586501
Bad payload handling
2018-07-18 15:56:36 -06:00
5dff0e1b36
Add warning when targets are not registered in the convert-table for image projections
2018-07-18 17:01:46 -04:00
54d1a506c3
Add rotation class that provides a constant rotation based on in-game time ( closes #662 )
...
Refactor functions for rotation, scaling, and translation to take UpdateData rather than current time
2018-07-18 15:28:24 -04:00
Matthew Territo