Commit graph

57026 commits

Author SHA1 Message Date
Andrew Meadows
076ae28bed one less strand of spaghetti when counting packets 2017-07-11 09:52:39 -07:00
Andrew Meadows
b74aad32ed minor cleanup in OctreeSendThread::packetDistributor() 2017-07-10 18:27:40 -07:00
Seth Alves
4a35ad105b Merge pull request #10615 from amvmoody/21358
WL 21358 Create a Laser Pointer app
2017-07-10 14:21:54 -07:00
Chris Collins
24edbc5c43 Merge pull request #10934 from Atlante45/new-master
Stable => Master
2017-07-10 13:46:36 -07:00
Atlante45
d28fc5603d Merge branch 'stable' 2017-07-10 13:28:25 -07:00
Stephen Birarda
f6d0122550 Merge pull request #10791 from birarda/bug/adding-dead-upstream-agent
don't add missing replicated node from kill packet
2017-07-10 12:53:21 -07:00
Chris Collins
a1a0e411ce Merge pull request #10923 from highfidelity/RC-47
Beta Release 47 - Includes up to Developer Release 6825
2017-07-10 12:53:20 -07:00
druiz17
78ba2102f4 Merge pull request #10931 from druiz17/fix-goto-hmd-keyboard
Fixed goto hmd keyboard not entering text
2017-07-10 12:50:01 -07:00
Seth Alves
d957b970dd Merge pull request #10918 from misslivirose/feat-add-skeleton-changed-signal
Add signal for avatar skeleton changing
2017-07-10 11:35:24 -07:00
Seth Alves
9b5dfc8d3a Merge pull request #10929 from druiz17/luanch-crash-fix
Fixed crash when launching interface from fresh install
2017-07-10 11:31:59 -07:00
Stephen Birarda
98ccfa80a2 don't add node missing from a replicated kill packet 2017-07-10 11:14:13 -07:00
Dante Ruiz
89a072cfee fixed hmd keyboard for goto 2017-07-10 19:05:07 +01:00
Brad Hefta-Gaub
121cf76ee3 Merge pull request #10914 from sethalves/dont-think-during-mouse-move
Dont think during mouse move
2017-07-10 10:36:03 -07:00
Andrew Meadows
ab6f615f96 Merge pull request #10910 from Atlante45/fix/audio-mixer-crash
Fix Audio Mixer crash
2017-07-10 09:55:44 -07:00
Dante Ruiz
cc86cda737 Merge branch 'master' of github.com:highfidelity/hifi into luanch-crash-fix 2017-07-10 17:49:20 +01:00
Dante Ruiz
75e1b265d5 comment out code that causes a crash on launch from fresh install 2017-07-10 17:48:53 +01:00
Andrew Meadows
96b88dccd7 Merge pull request #10913 from samcake/orange
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
2017-07-10 09:46:09 -07:00
Sam Gateau
0c3755483b adding assert or checks whenever getting a scene stage 2017-07-10 12:37:26 +02:00
Sam Gateau
4edea433ce Rename the _pipeline into _shapePipeline in the render::Args 2017-07-10 12:16:53 +02:00
Brad Davis
ee1f6dfa42 More tweaks for improved script performance 2017-07-09 21:36:46 -07:00
Brad Davis
9afe0bc124 Tweak frame timing to avoid overloading the main thread 2017-07-09 21:36:39 -07:00
Brad Davis
e52c7f4395 Add more efficient overlay getters, don't use blocking calls 2017-07-09 21:36:31 -07:00
Mike Moody
4b593d1ab4 Added fallback method using controllers if joints do not exist. 2017-07-08 15:18:27 -07:00
Seth Alves
39db7b0329 Merge pull request #10905 from sethalves/faster-getters-on-avatar-for-scripts
Faster getters on avatar for scripts
2017-07-08 15:01:23 -07:00
Brad Davis
8043caa9e9 Merge pull request #10925 from jherico/overlay_performance
Fix terrible script performance when rendering load is too high
2017-07-08 14:19:14 -07:00
Brad Davis
cd11f5cfa6 More tweaks for improved script performance 2017-07-07 22:02:56 -07:00
Brad Davis
148eece065 Tweak frame timing to avoid overloading the main thread 2017-07-07 21:00:33 -07:00
Brad Davis
7e9ea596a0 Add more efficient overlay getters, don't use blocking calls 2017-07-07 21:00:31 -07:00
Chris Collins
8a00efde72 Merge pull request #10922 from highfidelity/revert-10835-bug/invisible-avatars
Revert "fix for invisible avatars after radius ignore"
2017-07-07 16:51:06 -07:00
Stephen Birarda
420e9233b6 Revert "fix for invisible avatars after radius ignore" 2017-07-07 16:50:28 -07:00
druiz17
6e44c95d53 Merge pull request #10906 from druiz17/audio-qml-fix
Made the output audio listview dynamically change height base on content size
2017-07-07 16:48:15 -07:00
Stephen Birarda
f07ce6d294 Merge pull request #10835 from birarda/bug/invisible-avatars
fix for invisible avatars after radius ignore
2017-07-07 16:06:44 -07:00
Andrew Meadows
665aa92da2 Merge pull request #10877 from sethalves/atp-client
Atp client
2017-07-07 14:04:50 -07:00
Zach Fox
3d14d3755e Merge pull request #10898 from 1P-Cusack/21425
Add View->Enter First Person Mode in HMD checkbox.
2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5 Merge pull request #10878 from mnafees/21355
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab Default 'Enter First Person Mode in HMD' to true. 2017-07-07 15:35:32 -04:00
Liv
060e3a9c5a Add signal for avatar skeleton changing 2017-07-07 11:48:12 -07:00
Ryan Huffman
84345e6db1 Merge pull request #10915 from birarda/bug/bake-with-ext-textures
fix for FBX baking with external textures
2017-07-07 10:57:35 -07:00
Seth Alves
01b612fd14 Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-07 10:42:12 -07:00
Seth Alves
6782a891d0 rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different 2017-07-07 10:35:45 -07:00
Brad Davis
e22a3c6af9 Fixing overlay crashes, for real 2017-07-07 10:28:36 -07:00
Zach Fox
e222753aac Merge pull request #10911 from zfox23/PAL_adminFix2
Set admin status even if QML can't find user in PAL
2017-07-07 10:24:53 -07:00
Andrew Meadows
2349057306 Merge pull request #10879 from AndrewMeadows/avoid-null-shape
fix crash in ObjectMotionState::handleEasyChanges()
2017-07-07 10:22:05 -07:00
Stephen Birarda
bff54d260e fix for baking FBX with external textures 2017-07-07 10:11:13 -07:00
Seth Alves
88c39f3237 off-by-one 2017-07-07 09:15:42 -07:00
Seth Alves
29baca20e3 Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-07 09:10:47 -07:00
Seth Alves
e4aa4823f9 Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move 2017-07-07 08:51:38 -07:00
Zach Fox
ea77557e38 Correctly close PAL when switching domains 2017-07-07 08:09:19 -07:00
Seth Alves
fc8b7c7cc5 Merge pull request #10904 from druiz17/window-root-spam
fixed log spamming from windowRoot.qml in toolbar mode
2017-07-07 07:17:08 -07:00
Seth Alves
81cc46beb4 Merge pull request #10909 from jherico/overlay_crashes
Fixing overlay crashes, for real
2017-07-07 07:11:52 -07:00