Philip Rosedale
eaa2102d3f
Code review fixes
2017-04-24 21:03:17 -07:00
Philip Rosedale
92368d981b
Half Duplex script
2017-04-21 18:22:53 -07:00
Andrew Meadows
3f9f16cc98
Merge pull request #10223 from kunalgosar/blendshapesbug
...
Make setBlendshape changes persist
2017-04-21 16:11:13 -07:00
Brad Davis
a62a44ff6a
Merge pull request #10252 from jherico/organize_resources
...
Organize the files in the JS and QML projects to appear in a folder hierarchy
2017-04-21 09:38:59 -07:00
Ken Cooke
a5ed3007b3
Merge pull request #10248 from vladest/notify-sound-inject
...
Notify sound inject
2017-04-21 09:26:36 -07:00
Sam Gateau
a668ed0409
Merge pull request #10244 from samcake/ambient
...
Cleaning the Engine/Task/Job interface
2017-04-20 15:48:21 -07:00
Brad Davis
a8de6eab8c
Organize the files in the JS and QML projects to appear in a folder hierarchy
2017-04-20 14:39:06 -07:00
Vladyslav Stelmakhovskyi
2665ede06f
Audio injector cleanup
2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi
b2533b6106
Code nitpick. Pointer cleanup on exit
2017-04-20 21:12:57 +02:00
Zach Pomerantz
b77917b8d1
Merge pull request #10241 from zzmp/fix/display-fail
...
Update Display menu on unsuccesful selection
2017-04-20 12:04:51 -04:00
Vladyslav Stelmakhovskyi
06406ef7de
Merge branch 'master' into notify-sound-inject
2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi
023d03d9f8
Implemented snap sound using sound injector
2017-04-20 17:43:16 +02:00
Zach Fox
50456f71ed
Merge pull request #10142 from Triplelexx/21258
...
21258 - Don't render (or heavily use GPU) when window in minimized
2017-04-19 16:26:49 -07:00
Brad Hefta-Gaub
a555846d5d
Merge pull request #10235 from volansystech/21206
...
21206 Far grab improvement to draw held entity toward yourself
2017-04-19 14:33:09 -07:00
samcake
7f72efa714
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-04-19 11:51:25 -07:00
Sam Gateau
788849e19a
Merge pull request #10208 from jherico/gl41_variable
...
Adding support for variable allocated textures to the GL 4.1 backend
2017-04-19 11:42:23 -07:00
Brad Davis
472835d65c
Port fix from master
2017-04-19 11:22:20 -07:00
Brad Davis
bccc06d2fe
Fix resource texture memory usage tracking
2017-04-19 10:35:19 -07:00
Chris Collins
889b054085
Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations
...
Fix Entities.setLocalJointTranslations
2017-04-19 09:32:28 -07:00
druiz17
57f6529ce6
Merge pull request #10239 from druiz17/edit-model
...
Fix issue of tablet proxy not choose the correct root
2017-04-19 09:19:46 -07:00
volansystech
b194ddeb66
Resolve Comments of @sethalves
2017-04-19 16:39:23 +05:30
samcake
2c16b2bf3a
Expose the runtime from the engine in Stats
2017-04-18 18:12:42 -07:00
samcake
5af171f69f
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-04-18 17:08:02 -07:00
samcake
63fe579022
simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'
2017-04-18 17:05:40 -07:00
Sam Gateau
4df41ff7d3
Merge pull request #10206 from AndrewMeadows/avatar-renderer-001
...
Cleanup dependencies in Avatar class in preparation for migration to new lib
2017-04-18 16:45:51 -07:00
Zach Pomerantz
c7a7fa90ec
update Display menu on unsuccesful selection
2017-04-18 18:47:57 -04:00
Brad Davis
2a2102c7fe
Recompute memory pressure state after each promote / demote call
2017-04-18 15:12:34 -07:00
Dante Ruiz
ce8dba21a0
fix tablet proxy choosing wrong root
2017-04-18 22:49:43 +01:00
Howard Stearns
89fa6601b9
Merge pull request #10238 from howard-stearns/callback-on-profile-failure
...
Be sure to callback even on profile failure.
2017-04-18 13:40:03 -07:00
kunalgosar
ffdbc12968
copy into new vector
2017-04-18 12:20:03 -07:00
howard-stearns
3113dced7b
Be sure to callback even on profile failure.
2017-04-18 12:06:44 -07:00
Andrew Meadows
da55c96c4c
protect against crash on invalid scene on shutdown
2017-04-18 11:52:22 -07:00
Andrew Meadows
014d7b8d8d
use viewFrustum position for laser pointer render filtering
2017-04-18 11:52:22 -07:00
Andrew Meadows
71c5644c23
more shared_ptr by const reference
2017-04-18 11:52:22 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
Andrew Meadows
0cc6763617
fix build by including EntityItem.h
2017-04-18 11:52:22 -07:00
Andrew Meadows
e60a28620d
cleanup FancyCamera implementation
2017-04-18 11:52:22 -07:00
Andrew Meadows
a3682a1a0e
cleanup includes in Avatar.cpp and remove cruft
2017-04-18 11:52:21 -07:00
Andrew Meadows
5a458c9923
remove last qApp usage from Avatar class
2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c
remove Camera argument from Avatar::render()
2017-04-18 11:52:21 -07:00
Andrew Meadows
fbacbd74f7
pass shared pointers by ref in Avatar::render()
2017-04-18 11:52:21 -07:00
Andrew Meadows
9cddbbc42a
more interface-only spaghetti out of Avatar
2017-04-18 11:52:21 -07:00
Andrew Meadows
272cf07c31
removed cruft: unused Camera::toViewFrustum()
2017-04-18 11:52:21 -07:00
Andrew Meadows
1137bd1436
pull qApp spaghetti out of Avatar class
...
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
2017-04-18 11:52:21 -07:00
kunalgosar
06c5fa0585
correctly resizing blendshapes vector
2017-04-18 11:44:59 -07:00
kunalgosar
d215856b23
cleanup to blendshapes
2017-04-18 11:44:59 -07:00
kunalgosar
0a295fc258
setBlendshapes will presist
2017-04-18 11:44:59 -07:00
Zach Fox
7505b82189
Merge pull request #10046 from Triplelexx/21224
...
21224 - Allow people to save avatar bookmarks
2017-04-18 11:10:50 -07:00
samcake
c008a6dd14
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-04-18 11:05:04 -07:00
Seth Alves
d84dd4ce67
Merge pull request #10234 from druiz17/webview-redesign
...
tablet webview navigation bar redesigned
2017-04-18 10:23:39 -07:00
