Seth Alves
208c4686c4
merge from upstream
2017-01-12 15:44:27 -08:00
samcake
ca53235d54
Merge pull request #9358 from AndrewMeadows/model-cleanup
...
minor cleanup for Model rendering code
2017-01-12 14:30:16 -08:00
samcake
b9e8f7ee14
Merge pull request #9359 from jherico/cached_qml_surfaces
...
Eagerly cache QML surfaces for Web3D overlays
2017-01-12 14:28:35 -08:00
Seth Alves
b4870a14fa
Merge pull request #9372 from druiz17/removeHud
...
Completely removed HUD
2017-01-12 14:24:40 -08:00
Dante Ruiz
784548bb25
removed hud
2017-01-12 22:07:20 +00:00
Brad Davis
e8f6f3787b
Merge pull request #9364 from jherico/trace_cpu_usage
...
Add process and system CPU usage to traces
2017-01-12 13:50:29 -08:00
Seth Alves
9c148d2be0
Merge pull request #9370 from sethalves/tablet-ui-no-accidental-static-on-release
...
make sure dynamic things are moving at least a little upon release
2017-01-12 13:46:50 -08:00
Seth Alves
998cda6dd7
Merge pull request #9368 from hyperlogic/tablet-ui
...
Fixes for qt asserts in debug
2017-01-12 13:46:42 -08:00
Seth Alves
611a926894
if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet
2017-01-12 13:45:03 -08:00
Seth Alves
1a0a013edd
Merge pull request #9369 from hyperlogic/tablet-ui2
...
Tablet springboard can now be scrolled
2017-01-12 13:38:46 -08:00
Anthony J. Thibault
37804d1875
Fix for linux warning
2017-01-12 13:32:01 -08:00
Anthony J. Thibault
b251dc9ed6
Tablet springboard can now be scrolled
2017-01-12 13:11:27 -08:00
Dante Ruiz
71083645e9
branch update
2017-01-12 20:51:25 +00:00
Dante Ruiz
a16b229c65
begining to remove hud items
2017-01-12 10:49:45 -08:00
Anthony J. Thibault
cf138eb1fd
Fixes for qt asserts in debug
...
* The TabletScriptingInterface destructor is invoked on app shutdown after the logging system has been destroyed.
To avoid this I removed the destructor. The log was only for debug purposes anyway.
* Removed calls to setProperty() these calls are not thread safe and were causing asserts during debug.
Instead of getting and setting the property we maintain the TabletProxy state using an enum.
2017-01-12 10:49:41 -08:00
Seth Alves
6c2cae8749
Merge pull request #9365 from druiz17/tablet-update
...
close tablet when taking a snapshot
2017-01-12 10:36:15 -08:00
Howard Stearns
606e0c382d
Merge pull request #9337 from davidkelly/dk/letsHover
...
add hover effect to PAL
2017-01-12 10:14:28 -08:00
Seth Alves
0746d38cae
Merge pull request #9367 from sethalves/tablet-ui-avoid-hold-action-bootstrap
...
Tablet ui avoid hold action bootstrap
2017-01-12 10:14:01 -08:00
Seth Alves
a47aaea37a
don't bootstrap self with an avatar hold action
2017-01-12 10:12:45 -08:00
Brad Davis
01cdbb5721
Merge pull request #9334 from elmanytas/add_libssl_dev
...
Add dependency to Ubuntu documentation
2017-01-12 10:04:49 -08:00
Seth Alves
3805d22748
Merge pull request #9362 from hyperlogic/tablet-ui
...
Fix for rendering of tablet ModelEntity in desktop mode.
2017-01-12 10:01:59 -08:00
Dante Ruiz
7d84aae670
closing tablet when taking snapshot
2017-01-12 17:29:38 +00:00
Brad Davis
2de83d42bc
Add process and system CPU usage to traces
2017-01-12 09:19:08 -08:00
David Kelly
e36f6b6521
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-12 08:40:04 -07:00
Howard Stearns
48304a3cc2
Merge pull request #9361 from howard-stearns/fix-laser-vs-mouse-again
...
Fix laser vs mouse again
2017-01-11 19:38:54 -08:00
Anthony J. Thibault
26a5b5ed91
Fix for rendering of tablet ModelEntity in desktop mode.
...
The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable. This is late enough
in the update loop to have the most up-to-date camera transform used for rendering.
2017-01-11 18:37:57 -08:00
Andrew Meadows
c060fd6a68
restore updateClusterMatrices() in render()
2017-01-11 17:33:30 -08:00
howard-stearns
88c2c534ad
don't set bogus values
2017-01-11 17:01:46 -08:00
howard-stearns
9298bcf628
remove log spam
2017-01-11 16:32:15 -08:00
howard-stearns
5c06841732
use update signal instead of timer
2017-01-11 16:24:05 -08:00
Andrew Meadows
e2130d33d9
speedup cauterizedClusterMatrices math
2017-01-11 15:10:44 -08:00
Andrew Meadows
b3e336de3d
remove cruft: unused function arguments
2017-01-11 15:02:18 -08:00
Brad Davis
27293c342c
Change present rate to be an average over 1/10th of a second
2017-01-11 14:27:46 -08:00
Brad Davis
e256f7cccc
Remove sendqueue spam in traces
2017-01-11 14:27:27 -08:00
howard-stearns
357b4db1db
fix mouse vs lasers, again
2017-01-11 14:24:24 -08:00
howard-stearns
a808a8c749
revert "fix competition between seek mouse and lasers"
2017-01-11 14:23:18 -08:00
Brad Davis
f235a52a6d
Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet
2017-01-11 14:21:29 -08:00
David Kelly
1e3a00d1fb
Enable the LT and RT signals, use them
...
A bit cleaner. Still have to keep track of which hand is the mouse, but
this removes some of the hacky code.
2017-01-11 14:43:37 -07:00
Andrew Meadows
87bdaae05a
remove scale from ModelMeshPartPayload's transform
2017-01-11 12:38:47 -08:00
Seth Alves
bf304a815a
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 10:48:03 -08:00
Seth Alves
c76987c179
Merge pull request #9351 from sethalves/tablet-ui-show-lasers-when-scrolling
...
update lasers when distance-scrolling a web entity/overlay
2017-01-11 10:45:25 -08:00
Brad Hefta-Gaub
db5e4db79f
Merge pull request #9355 from kencooke/audio-hrtf-gainadj
...
Add a local HRTF gain adjustment
2017-01-11 10:21:07 -08:00
Ken Cooke
083c7bc523
Add a local HRTF gain adjustment. Gain adjustments are persistent and properly interpolated.
2017-01-11 10:05:39 -08:00
Seth Alves
bf1bd1d859
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 09:56:08 -08:00
Seth Alves
9be2f26407
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 09:55:58 -08:00
Seth Alves
493985ac2a
Merge pull request #9354 from sethalves/update-tablet-ui-again
...
Update tablet ui again
2017-01-11 09:55:46 -08:00
Seth Alves
bacc796730
Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again
2017-01-11 09:54:26 -08:00
Seth Alves
2886d7f7a4
Merge pull request #9353 from druiz17/tabletPositionUpdate
...
updated tablet position
2017-01-11 09:52:57 -08:00
Dante Ruiz
2d8d5401dc
updated tablet position
2017-01-11 08:41:07 -08:00
Andrew Meadows
bd16824d55
remove cruft: Model::_pupilDilation
2017-01-11 06:57:05 -08:00
