Olivier Prat
|
2d2722bfc5
|
Added async transition query on scene
|
2017-07-13 11:05:04 +02:00 |
|
Olivier Prat
|
0f60cca617
|
Merged cleaned up fader branch from Sam
|
2017-07-12 18:09:17 +02:00 |
|
Sam Gateau
|
5394ac8672
|
Cleaning up changes, removing comments and dead code etc...
|
2017-07-12 17:33:05 +02:00 |
|
Olivier Prat
|
2f9885870b
|
First merge with Sam's fader branch with custom pipeline support in shape plumber
|
2017-07-12 17:29:21 +02:00 |
|
Sam Gateau
|
49779754ff
|
Remove unecessary shaders and apply the custom shader pipeline to polyvox
|
2017-07-12 15:50:06 +02:00 |
|
Sam Gateau
|
258f1654f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
|
2017-07-12 14:14:27 +02:00 |
|
Sam Gateau
|
98cc8c0683
|
Refining the custom shader pipeline design and registration mechanism
|
2017-07-12 14:13:58 +02:00 |
|
Andrew Meadows
|
782155e9ea
|
Merge pull request #10876 from Atlante45/fix/ac-crash
Fix AC crash (buffer overflow)
|
2017-07-11 14:26:08 -07:00 |
|
Seth Alves
|
d05b353942
|
Merge pull request #10940 from druiz17/qt-mouse-events
Fix tablet scrolling for QT 5.9 and QT 5.6
|
2017-07-11 14:06:53 -07:00 |
|
Dante Ruiz
|
2f192fd48a
|
added scroll fix for qt 5.6
|
2017-07-11 21:19:06 +01:00 |
|
Dante Ruiz
|
01ca192613
|
fixed tablet scrolling
|
2017-07-11 21:16:13 +01:00 |
|
Olivier Prat
|
7552cca316
|
First alpha version of bubble collision fade events. Missing a lot of information.
|
2017-07-11 19:26:15 +02:00 |
|
Olivier Prat
|
381e0c64a8
|
Working avatar fade in / fade out except that it is also triggered on bubble collisions
|
2017-07-11 16:43:27 +02:00 |
|
Olivier Prat
|
aba8be595e
|
Separated fade categories from transition event types
|
2017-07-11 11:37:24 +02:00 |
|
Sam Gateau
|
1f2f539507
|
Merge branch 'orange' of https://github.com/samcake/hifi into hobbes
|
2017-07-11 10:26:26 +02:00 |
|
Atlante45
|
c32f4ab0d3
|
CR
|
2017-07-10 14:24:53 -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 |
|
Olivier Prat
|
9758a6ded0
|
Edition picking again (but without bounding box highlighting)
|
2017-07-10 17:57:02 +02:00 |
|
Sam Gateau
|
746812ff78
|
Merging with origin orange
|
2017-07-10 17:25:13 +02:00 |
|
Olivier Prat
|
cc4e168369
|
Working fade again
|
2017-07-10 16:45:13 +02:00 |
|
Olivier Prat
|
66d09a4c3c
|
Some objects fade and fixed crash due to invalid meta item id
|
2017-07-10 16:02:12 +02:00 |
|
Olivier Prat
|
267531cc1a
|
First working fade
|
2017-07-10 15:27:09 +02: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 |
|