Philip Rosedale
e07f53d022
remove unused test audio filters
2014-11-20 19:57:24 -06:00
Philip Rosedale
6e89437bce
simplify audio scope menu(s)
2014-11-20 19:34:56 -06:00
Andrew Meadows
82bf0f6210
menu item for "idle animations shift hips" hack
2014-11-19 09:38:10 -08:00
Ryan Huffman
6b2a497810
Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes
2014-11-13 17:48:17 -08:00
Ryan Huffman
03f155bcd8
Add tool window
2014-11-13 17:47:02 -08:00
ZappoMan
63a8608ac6
handle per model transforms, default scene mode off
2014-11-12 20:20:36 -08:00
ZappoMan
13f08e65d1
Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering
...
Conflicts:
interface/src/renderer/Model.h
2014-11-12 19:31:27 -08:00
ZappoMan
4245da5157
add menu item to enable/disable rendering as scene
2014-11-12 12:07:27 -08:00
Philip Rosedale
6af2b7aadf
remove buckyballs and face shift lean driving (should be a script if desired)
2014-11-12 07:33:59 -08:00
Andrzej Kapolka
6445b3aa5d
Linux warnings fixes.
2014-11-07 15:59:16 -08:00
Sam Gateau
cecf79e580
Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state
2014-11-03 11:22:23 -08:00
ZappoMan
e78ac4c1d4
Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties
2014-10-30 16:36:19 -07:00
ZappoMan
81cc15495f
rename Models to Entities, and add menu option to disable Light entities
2014-10-30 14:43:43 -07:00
Brad Hefta-Gaub
1c4e71ebc1
Revert "Worklist #20074 "
2014-10-30 14:33:10 -07:00
Brad Hefta-Gaub
7b5d2ef9f8
Merge pull request #3706 from huffman/entity-tool-help
...
Add edit entities help window
2014-10-30 12:53:17 -07:00
Ryan Huffman
4f2fef0428
Add edit entities help window
2014-10-30 12:02:30 -07:00
Brad Hefta-Gaub
e314fa1fc3
Merge pull request #3652 from ctrlaltdavid/19976
...
CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice
2014-10-29 20:46:12 -07:00
Stephen Birarda
6ba0845767
fix warnings that were bugging Xcode
2014-10-28 15:39:28 -07:00
Stephen Birarda
2816e8f114
fix location DataWebDialog missing InterfaceLocation object
2014-10-28 15:32:23 -07:00
David Rowe
adf168b7ea
Remove ATL build dependency for Windows speech recognizer
2014-10-28 11:14:45 -07:00
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
David Rowe
5f91f583e8
Merge branch 'master' into 19976
...
Conflicts:
interface/CMakeLists.txt
2014-10-24 20:34:45 -07:00
David Rowe
f373719f02
Don't include speech recognition if building with Visual Studio Express
2014-10-24 20:12:23 -07:00
Sam Gateau
80a87b3b44
framerate is as fast as the display can go
2014-10-24 17:50:31 -07:00
David Rowe
38524b3349
Merge branch 'master' into 19976
2014-10-24 15:43:55 -07:00
Sam Gateau
5b0fd99115
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-10-24 09:28:13 -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
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
Andrzej Kapolka
45fb31cd08
Basic network simulation for metavoxels.
2014-10-20 18:43:41 -07:00
David Rowe
524c413681
Enable SpeechRecognizer menu item and JavaScript object for Windows
2014-10-20 13:52:37 -07:00
ZappoMan
fc507850be
Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles
2014-10-16 20:36:28 -07:00
samcake
a6b9fe34b5
Merge pull request #3606 from ZappoMan/groupMaterialsRendering
...
More Model::render() improvements
2014-10-16 14:42:37 -07:00
ZappoMan
d1f263ecc5
group materials together when rendering models
2014-10-16 14:05:35 -07:00
AndrewMeadows
e75d2a167a
Merge pull request #3602 from ZappoMan/frustumCullModelParts
...
More Model::render() improvements
2014-10-16 11:04:57 -07:00
ZappoMan
ffb7bcf9d3
wire up different culling options to debug menus
2014-10-16 09:32:24 -07:00
ZappoMan
d238d06df5
build a cached lookup table for the shouldRenderMesh() LOD method
2014-10-16 01:00:32 -07:00
ZappoMan
bf77adc4bc
add support for LOD occulsion for too small meshes in Model::render()
2014-10-16 00:30:24 -07:00
Stephen Birarda
fcd73858b8
remove Faceplus as a face tracker option
2014-10-15 15:13:52 -07:00
ZappoMan
8c37181635
add menu item for enable/disable culling of model parts
2014-10-15 09:23:27 -07:00
Andrzej Kapolka
ff368f9848
Merge pull request #3592 from samcake/temp0
...
Rendering resolution can be different than the native window resolution
2014-10-14 11:56:50 -07:00
AndrewMeadows
2a35c4af4d
Merge pull request #3593 from huffman/20024
...
CR for Job #20024 - UI edits to Running Scripts dialog
2014-10-14 09:52:13 -07:00
Sam Gateau
153d3b532b
merged with upstream, all clear
2014-10-14 00:19:19 -07:00
samcake
700ec5cf79
Rendering resolution can be different than the native window resolution
...
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
Get rid of the ui to change the mode
- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt
- In the paintGL, in the default rendering path:
the rendering Framebuffers are resized to the window.size * renderResolutionScale.
The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport
- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
2014-10-13 18:00:50 -07:00
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -07:00
David Rowe
edf8cb671d
Add "reset sensors" menu item corresponding to the apostrophe key
2014-10-10 13:24:48 -07:00
Andrzej Kapolka
37eff685bc
Remove the "render lower detail as points" option. It doesn't seem too
...
promising.
2014-10-08 15:11:55 -07:00
Andrzej Kapolka
b5b82ed387
Provide the option to display lower detail metavoxel data as points.
2014-10-08 14:05:14 -07:00
Andrzej Kapolka
049a00b85b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-08 11:51:10 -07:00
Andrzej Kapolka
04b628bede
Added option to display Hermite data
2014-10-07 16:44:55 -07:00