Dante Ruiz
cc34cb96e4
making ui for input recorder
2017-04-21 18:15:47 +01:00
Dante Ruiz
641a7390ba
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-21 16:46:55 +01: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
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
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
Dante Ruiz
d4c8d06575
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-19 20:42:11 +01:00
Dante Ruiz
07f674eabe
exprting compressed file
2017-04-19 20:41:56 +01: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
Dante Ruiz
1cf9485143
fixed compile issue
2017-04-19 00:23:05 +01: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
Dante Ruiz
f8ec49eb96
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-18 21:53:37 +01:00
Dante Ruiz
5cd4007aaa
got input recording working
2017-04-18 21:53:23 +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
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
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
Seth Alves
b2de5ebdaf
Merge pull request #10136 from mittens/21217
...
Added quadratic ease-in-and-out smoothing to remote avatars
2017-04-18 10:05:48 -07:00
Brad Hefta-Gaub
8c1ca1dc33
Merge pull request #10236 from highfidelity/stable
...
Stable back to master...
2017-04-18 09:01:16 -07:00
Chris Collins
a8e43c99ca
Merge pull request #10197 from highfidelity/RC-37
...
Beta Release 37
2017-04-18 07:58:04 -07:00
volansystech
e5c7587ad8
Improve far grabbing based on timescale.
2017-04-18 20:01:02 +05:30
Dante Ruiz
cd095915ef
removed emacs junk file from my repo
2017-04-18 00:32:30 +01:00
Dante Ruiz
31b61c3225
removed white space
2017-04-18 00:24:34 +01:00
Dante Ruiz
e46d9da98f
fixed merge conflict
2017-04-18 00:22:35 +01:00
