Atlante45
e6b9d3604d
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-12-01 09:45:50 -08:00
Brad Hefta-Gaub
e0bcbb08ff
Merge pull request #9134 from samcake/blue
...
Fix a bug when using the gpu::Batch::_glUniform*() calls with a bad location
2016-12-01 09:03:56 -08:00
sam
3d29187156
FIx a potential bug when using _glUniform calls with an invalid location
2016-12-01 02:44:04 -08:00
sam
6342762fde
FIx a potential bug when using _glUniform calls with an invalid location
2016-12-01 02:39:52 -08:00
Brad Hefta-Gaub
c9545ca920
Merge pull request #9129 from Atlante45/audio-dll
...
Select Audio DLL at runtime
2016-11-30 15:42:21 -08:00
samcake
c3db2704ed
Merge pull request #9126 from jherico/gl_debugging
...
Working on OpenGL debuggability
2016-11-30 10:51:58 -08:00
Atlante45
1d8c97b337
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-30 10:22:16 -08:00
Chris Collins
c2863f3413
Merge pull request #9120 from Polyrhythm/ryan/bind-polyfill
...
add bind polyfill and basic .editorconfig for indentation
2016-11-30 09:52:56 -08:00
Atlante45
db263df03e
Select Audio DLL at runtime
2016-11-29 19:42:59 -08:00
Brad Davis
63b3b7250d
Restore correct pipeline shader slot setup
2016-11-29 14:02:58 -08:00
Brad Davis
a98e49c892
Fix build errors
2016-11-29 14:02:15 -08:00
Brad Davis
3b07e31eab
Working on OpenGL debuggability
2016-11-29 13:15:56 -08:00
Ryan Jones
01ae2b9452
add errant semicolon
2016-11-29 11:56:11 -08:00
Ryan Jones
251b070db3
add unit test
2016-11-29 11:50:11 -08:00
Brad Hefta-Gaub
881e0cba11
Merge pull request #9117 from samcake/red
...
Potentially address the crash when no vertex format is specified
2016-11-29 09:23:43 -08:00
Ryan Jones
a59df5b04d
one last indentation fix
2016-11-28 17:19:43 -08:00
Ryan Jones
3961dbcf55
revert changes to dev utils, apply changes to system utils
2016-11-28 17:18:31 -08:00
Ryan Jones
68e86da023
adjust indentation and implement editorconfig at root of repo
2016-11-28 17:10:59 -08:00
Ryan Jones
4be1922df5
add bind polyfill
2016-11-28 14:47:15 -08:00
Howard Stearns
030f0d7103
Merge pull request #9114 from howard-stearns/bubble-state
...
bubble state
2016-11-28 12:16:39 -08:00
samcake
803a399bb6
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-11-28 11:58:17 -08:00
Brad Hefta-Gaub
6f0377eda0
Merge pull request #9113 from hyperlogic/feature/neuron-prefs
...
Added preferences for the Perception Neuron plugin.
2016-11-28 08:58:00 -08:00
David Kelly
1b26d51292
Merge pull request #9110 from howard-stearns/capture-original-location-in-snapshots
...
Capture original location in snapshots
2016-11-28 08:55:47 -08:00
samcake
54543935be
Merge pull request #8560 from samcake/hdr
...
Introducing Clustered Lighting and improve Lighting performances
2016-11-23 17:34:40 -08:00
samcake
1974ded050
Potentially address the crash when no vertex format is specified
2016-11-23 16:37:06 -08:00
Brad Hefta-Gaub
9f689b1b69
Merge pull request #9116 from highfidelity/stable
...
Merge Hotfix back into master.
2016-11-23 15:30:29 -08:00
howard-stearns
bf0f56c138
null guard
2016-11-23 15:27:24 -08:00
howard-stearns
9e45b0ca28
Merge branch 'master' of https://github.com/highfidelity/hifi into capture-original-location-in-snapshots
2016-11-23 15:12:45 -08:00
samcake
d806b088a9
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-23 15:05:52 -08:00
Brad Davis
6e3ad7a983
Merge pull request #9115 from jherico/fix_camera
...
Fix camera in render perf test
2016-11-23 14:44:57 -08:00
howard-stearns
b37feb20de
signal from ignoreNodesInRadius
2016-11-23 11:23:06 -08:00
howard-stearns
00b94860cf
Merge branch 'master' of https://github.com/highfidelity/hifi into bubble-state
2016-11-23 11:02:12 -08:00
howard-stearns
4e0c6e5d0f
handle empty snapshot text data more broadly (and at the same time, don't
...
lie from parseSnapshotData).
2016-11-23 11:00:31 -08:00
samcake
9478f242d8
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-23 10:35:32 -08:00
howard-stearns
95b5211c00
Merge branch 'master' of https://github.com/highfidelity/hifi into capture-original-location-in-snapshots
2016-11-23 10:31:50 -08:00
Brad Davis
f2118614da
Fix camera in render perf test
2016-11-23 10:30:52 -08:00
howard-stearns
8b9efb461e
bubble state
2016-11-23 10:22:24 -08:00
Chris Collins
5359468b91
Merge pull request #9112 from highfidelity/RC-28-HOTFIX
...
Beta Release 28 Hotfix - Windows 7 audio fix
2016-11-23 10:15:03 -08:00
Anthony J. Thibault
cbf514a738
PreferenceDialogs now preserve the sort order of their showCategories.
...
Specifically, this was to fix the issue with the Neuron plugin preferences being
the top section in the General Preferences dialog, now it is the last.
2016-11-23 10:11:28 -08:00
Anthony J. Thibault
9b0ce556e7
Added preferences for the Perception Neuron plugin.
...
By default this plugin is disabled.
The server address and port number are also configurable.
2016-11-23 10:10:00 -08:00
Brad Hefta-Gaub
8b9c6a45e1
Merge pull request #9111 from highfidelity/stable
...
Stable to master
2016-11-22 22:00:32 -08:00
Ken Cooke
b24c81e334
Refactor the audio device format detection. Only use the native format when Qt can correctly determine it.
2016-11-22 20:56:17 -08:00
Chris Collins
8246e3be4b
Merge pull request #9109 from samcake/red
...
Fix the bad binding for polyline
2016-11-22 17:32:04 -08:00
howard-stearns
414371d1fc
record starting href/domainId, not ending
2016-11-22 16:13:08 -08:00
howard-stearns
2c9046742e
allow movement during .gif recording
2016-11-22 16:02:01 -08:00
samcake
3d0b557af6
Fix the bad binding for polyline
2016-11-22 13:01:02 -08:00
samcake
d764eebc79
removing dead code
2016-11-22 12:10:56 -08:00
Brad Hefta-Gaub
1970deab92
Merge pull request #9107 from kencooke/audio-win7-fix
...
Audio fix for Windows 7
2016-11-22 11:31:34 -08:00
howard-stearns
5188de924f
allow for SnapshotReview dialog to be up during a change of href for all
...
media capture
2016-11-22 11:09:43 -08:00
samcake
c494479290
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-22 10:16:08 -08:00
