Zach Pomerantz
d0f3ad75b8
Nest Persistent in Config to compile on nix
2016-02-11 10:27:32 -08:00
Zach Pomerantz
a7778daed2
Change graphics dialog to persisted dropdowns
2016-02-11 10:15:13 -08:00
Zach Pomerantz
84197e5eb2
Add persistent render engine configuration file
2016-02-11 10:00:44 -08:00
Zach Pomerantz
66e1d9668c
Add ComboBox preference
2016-02-11 10:00:44 -08:00
Zach Pomerantz
5eeaa9a33e
Move graphics settings to dedicated dialog
2016-02-11 10:00:44 -08:00
samcake
99e9b3ecdd
Merge pull request #7043 from zzmp/fix/render-ui
...
Revamp the render engine ui
2016-02-11 09:57:51 -08:00
Clément Brisset
911591c0ea
Merge pull request #7082 from birarda/hrtf-map-crash
...
fix for HRTF map crash
2016-02-11 09:57:20 -08:00
Stephen Birarda
52cd4ae1a5
make sure the AudioMixerClientData exists before using it
2016-02-11 09:34:21 -08:00
Clément Brisset
c3218a3af9
Merge pull request #7069 from AndrewMeadows/another-crash-fix
...
Fix crash when propagating simulation ownership on deleted objects
2016-02-11 09:29:08 -08:00
Zach Pomerantz
3bace3cdbb
Rework the qml for brevity
2016-02-11 08:48:01 -08:00
Zach Pomerantz
9c5881345a
Disable the AO gpuTimer pending cpp fix
2016-02-11 08:48:00 -08:00
Zach Pomerantz
86412c1890
Fix default debug buffer size
2016-02-11 08:47:59 -08:00
Zach Pomerantz
dbc59ccc2b
Revamp render engine debug JS script
2016-02-11 08:47:59 -08:00
Zach Pomerantz
991d6328ef
Fix JSON integration for JobConfig
2016-02-11 08:47:58 -08:00
Zach Pomerantz
5f395654f0
Integrate JobConfig with JSON/qml
2016-02-11 08:47:51 -08:00
Brad Hefta-Gaub
118b95af14
Merge pull request #7079 from sethalves/remove-assert
...
remove incorrect assert
2016-02-10 22:28:59 -08:00
Seth Alves
3a2b082a7f
remove incorrect assert
2016-02-10 20:47:22 -08:00
Brad Davis
ff3c934c6c
Merge pull request #7067 from hyperlogic/tony/vive-support
...
Re-enable OpenVR support
2016-02-10 19:04:35 -08:00
Andrew Meadows
ac60917b54
sigh... protect againt null MotionStates
2016-02-10 17:58:38 -08:00
Andrew Meadows
fed03edde3
manually removing contact manifolds was a bad idea
2016-02-10 17:58:38 -08:00
Andrew Meadows
532f0683e8
remove all contact info before removing objects
2016-02-10 17:58:38 -08:00
Clément Brisset
618712538a
Merge pull request #7074 from birarda/integrate-new-hrtf
...
use the existing counter in AudioMixer to send client stats, remove some now dead code
2016-02-10 17:55:53 -08:00
Stephen Birarda
edfb65acf6
more stats printing removal from audio-mixer
2016-02-10 17:38:56 -08:00
Stephen Birarda
6707535ced
remove unused and incorrect stats from DS stats
2016-02-10 17:33:56 -08:00
Stephen Birarda
49a8b88e24
Merge pull request #7072 from huffman/fix-ac-script-store-in-memory
...
Update domain server to store temporary AC scripts in memory
2016-02-10 16:30:55 -08:00
Anthony J. Thibault
c8e6aee3e7
OpenVr: fix for conflict between openvr and oculus display plugins
...
* Call vr::VR_Shutdown() when ref-count goes to zero. The ref-count
is ncessary because the vr::IVRSystem poitner is shared between the
the openvr input and display plugins.
* OpenVR plugins options will display in the menu if vr::VR_IsHmdPresent() is true.
This is faster then initializing all of openvr and less likely to conflict with the
oculus display plugin.
2016-02-10 16:28:03 -08:00
Ryan Huffman
811859e46f
Update domain server to store temporary AC scripts in memory
2016-02-10 15:26:01 -08:00
Stephen Birarda
97cd65cf80
don't use usecTimestampNow for per second actions
2016-02-10 15:07:58 -08:00
Chris Collins
b1c6d1d256
Merge pull request #7070 from sethalves/no-sink-upon-server-restart
...
don't sink through floor when server restarts
2016-02-10 14:42:28 -08:00
Seth Alves
5dd044dc29
Merge pull request #7041 from imgntn/cellscience
...
Change the way cellscience entities intitialize & audio plays
2016-02-10 14:22:30 -08:00
Seth Alves
66584c8e13
Merge pull request #7064 from birarda/integrate-new-hrtf
...
cleanup new AM percentage stats in DS
2016-02-10 14:21:42 -08:00
Andrew Meadows
d121dab937
Merge pull request #7057 from sethalves/grab-then-equip
...
Grab then equip
2016-02-10 14:16:31 -08:00
Seth Alves
11d296a477
if we are told to clear the octree, disable physics until we have (re)loaded entities
2016-02-10 14:08:35 -08:00
Seth Alves
3b1db7a522
Merge pull request #7061 from AndrewMeadows/crash-fix
...
Fix crash when deleting many moving dynamic objects.
2016-02-10 13:58:03 -08:00
Seth Alves
49f2724608
don't return void
2016-02-10 13:49:03 -08:00
Brad Hefta-Gaub
d7db08d150
Merge pull request #7042 from howard-stearns/virtualBaton
...
Virtual baton
2016-02-10 13:48:34 -08:00
Andrew Meadows
8ddbce1ee2
Merge pull request #7059 from sethalves/clamp-ik-dt
...
avoid crazy ik-induced shaking / orbits
2016-02-10 13:32:53 -08:00
James B. Pollack
b07c32e116
Merge pull request #7062 from jherico/webentitiies
...
Ensure the QML content gets destroyed on deletion of a QML surface
2016-02-10 13:27:59 -08:00
Howard Stearns
989192e9fd
Make randomize clearer.
2016-02-10 12:53:05 -08:00
James B. Pollack
9a34b68bff
add ownership hack to own and handoff movement
2016-02-10 12:50:11 -08:00
Howard Stearns
31d72ffb8d
2 is magic.
2016-02-10 12:17:58 -08:00
Seth Alves
af6bb50f74
fix warning
2016-02-10 12:09:28 -08:00
Howard Stearns
4241f4b305
Convert all simple one-liners containing ') { ' to instead take up three lines.
2016-02-10 12:03:07 -08:00
Stephen Birarda
8598360f2e
allow string values to be graphable in DS stats
2016-02-10 11:50:23 -08:00
Brad Hefta-Gaub
5120076add
Merge pull request #7060 from jherico/qml
...
Small QML fixes
2016-02-10 11:39:45 -08:00
Seth Alves
9d21c3d549
Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip
2016-02-10 11:35:25 -08:00
Chris Collins
db06674f7e
Merge pull request #7058 from hyperlogic/tony/moving-platform-bugfixes
...
SpatiallyNestable: bug fixes for kinematic entities
2016-02-10 11:34:32 -08:00
Brad Davis
a4f2fc58fd
Ensure the QML content gets destroyed on deletion of a QML surface
2016-02-10 11:27:18 -08:00
Seth Alves
6fea0b9396
also make sure tau is >= 1.0
2016-02-10 11:20:56 -08:00
Anthony J. Thibault
90f0821c2b
OpenVR: reduce thread contention, fix sensor reset
2016-02-10 11:14:26 -08:00
