Pete
8d97a20bd9
Worklist #20074
...
- Add new Preferences item for Oculus Max FPS, defaults to 75, range is
[30, 95]
- Load and save this value appropriately
- When VR mode is enabled/disabled, set the Render Target Framerate to
this value/unlimited
2014-10-26 21:14:20 -07:00
Philip Rosedale
87f688a299
Merge pull request #3666 from samcake/temp1
...
Unlock the framerate limitation by default and more settings
2014-10-24 18:36:21 -07:00
Sam Gateau
334e032c17
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-10-24 17:58:54 -07:00
Sam Gateau
80a87b3b44
framerate is as fast as the display can go
2014-10-24 17:50:31 -07:00
Stephen Birarda
57e7fa233f
Merge pull request #3664 from PhilipRosedale/master
...
Tour Guide script to let you follow people, better hair
2014-10-24 17:10:57 -07:00
Philip Rosedale
54197b2c23
fix for spacing
2014-10-24 17:10:46 -07:00
Philip Rosedale
33204b0d27
Merge pull request #3660 from birarda/xbox-controller
...
add a guard in case SDL misreports number of axes
2014-10-24 17:06:51 -07:00
Philip Rosedale
05e9d614e1
Merge pull request #3663 from ey6es/metavoxels
...
Disconnect metavoxel LOD from avatar LOD.
2014-10-24 17:06:20 -07:00
Philip Rosedale
7e17290281
Merge pull request #3662 from birarda/autorepeat
...
bubble up auto repeat key event state to scripts
2014-10-24 16:43:40 -07:00
Andrzej Kapolka
8684384316
Disconnect metavoxel LOD from avatar LOD.
2014-10-24 16:38:57 -07:00
Philip Rosedale
1e832e7bbb
Tour guide script
2014-10-24 16:38:24 -07:00
Stephen Birarda
8ae1f980f5
don't make headMove changes if key is auto repeating
2014-10-24 16:13:01 -07:00
Stephen Birarda
f8b423ced6
bubble up isAutoRepeat state for KeyEvent
2014-10-24 16:12:15 -07:00
Philip Rosedale
d5d0fbd9d8
Hair gravity always the same
2014-10-24 16:08:01 -07:00
Stephen Birarda
c57fc314f0
just resize axis vector is sdl decides to lie about the number of axes
2014-10-24 15:13:54 -07:00
Stephen Birarda
9289249df5
add a guard in case SDL somehow forgets about axes
2014-10-24 15:06:18 -07:00
Andrzej Kapolka
eabc08784a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-24 15:01:36 -07:00
Philip Rosedale
da531ac25e
Merge pull request #3659 from PhilipRosedale/master
...
fix uninitialized mouth blending variables
2014-10-24 14:00:56 -07:00
Philip Rosedale
ab557447f2
fix uninitialized mouth blending variables
2014-10-24 12:51:54 -07:00
Andrzej Kapolka
1c50a49b55
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-24 11:41:44 -07:00
Leonardo Murillo
b81461bb0e
Merge pull request #3658 from birarda/find-atl
...
bubble up ATL_INCLUDE_DIRS from FindATL module
2014-10-24 12:24:30 -06:00
Stephen Birarda
c172f628fc
repairs to FindATL indenting
2014-10-24 11:12:55 -07:00
Stephen Birarda
30aa23e5cd
message include dir for ATL when found
2014-10-24 10:45:06 -07:00
Stephen Birarda
fd23fb66ab
bubble up ATL_INCLUDE_DIRS from FindATL module
2014-10-24 10:42:29 -07:00
Sam Gateau
5b0fd99115
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-10-24 09:28:13 -07:00
AndrewMeadows
64892a6b27
Merge pull request #3655 from Atlante45/fix_playback_loop
...
Fix player loop
2014-10-24 08:47:57 -07:00
AndrewMeadows
31a1b8bb06
Merge pull request #3651 from PhilipRosedale/master
...
Better animation for audio-only mouth movement
2014-10-24 08:46:32 -07:00
Philip Rosedale
e5d64a0d5d
Merge pull request #3644 from birarda/data-web-page
...
fix for DataWeb hifi link handling
2014-10-23 21:11:32 -07:00
Philip Rosedale
3f7df5962d
Merge pull request #3657 from ey6es/metavoxels
...
Further incremental improvements to heightfield voxelization.
2014-10-23 21:10:21 -07:00
Andrzej Kapolka
aaa79958c4
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-23 17:54:58 -07:00
Andrzej Kapolka
3d6d418548
Merge pull request #3642 from samcake/temp0
...
Bring back the GL batching for model rendering and fixed the bug on MAC
2014-10-23 17:54:45 -07:00
Andrzej Kapolka
003d2f031a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-23 16:15:11 -07:00
Andrzej Kapolka
27d9de0cba
More gradual improvements to heightfield voxelization.
2014-10-23 16:01:51 -07:00
Sam Gateau
9f6454f570
Merge branch 'temp0' of https://github.com/samcake/hifi into temp1
2014-10-23 15:20:20 -07:00
Sam Gateau
d92c03364a
Improve comment regarding the replacement of the QGLProgram->bind()
2014-10-23 14:53:43 -07:00
Sam Gateau
d7fca1fd27
FIxing the merge
2014-10-23 14:39:22 -07:00
Atlante45
20c862d199
Fix player loop
2014-10-23 14:35:24 -07:00
Andrzej Kapolka
ef0a400dcb
Fix for clearing empty nodes.
2014-10-23 13:37:11 -07:00
Stephen Birarda
829774dae4
Merge pull request #3653 from murillodigital/master
...
No need for https when downloading assets
2014-10-23 13:25:34 -07:00
Sam Gateau
ac269e16c0
start working on the target framerate control
2014-10-23 13:19:34 -07:00
Andrzej Kapolka
34cba5c031
Added options to selectively toggle heightfield/dual contour surface
...
rendering.
2014-10-23 13:16:43 -07:00
AndrewMeadows
38c1132725
Merge pull request #3649 from Atlante45/reverb_fixed
...
bump audio version number
2014-10-23 13:08:05 -07:00
Leonardo Murillo
a4965e7f60
No need for https when downloading assets
2014-10-23 13:59:08 -06:00
Stephen Birarda
397bda586e
Merge pull request #3650 from birarda/domain-tunnel
...
fix for delete of last row in array table
2014-10-23 11:55:07 -07:00
Philip Rosedale
9394f72b18
clarify fake blendshape array size
2014-10-23 11:55:06 -07:00
Stephen Birarda
9364c3b342
fix for delete of last row in array table
2014-10-23 11:54:30 -07:00
Andrzej Kapolka
9c43748d35
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-23 11:50:46 -07:00
Philip Rosedale
1d68413b66
Audio-only mouth uses multiple blend shapes
2014-10-23 11:43:13 -07:00
Atlante45
06d528fce5
bump audio version number
2014-10-23 09:28:48 -07:00
Philip Rosedale
da75073357
Merge pull request #3648 from RyanDowne/master
...
changed gravity setting on hair
2014-10-23 08:43:40 -07:00
