Olivier Prat
17e992bd14
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-09-06 19:08:37 +02:00
Olivier Prat
25ff132fc7
Debugging scripts working again with correct occlusion management
2017-09-06 19:05:15 +02:00
Olivier Prat
10643feb78
Working with specific zpass rendering for outline. Debug script needs relinking to correct config
2017-09-06 18:40:38 +02:00
Olivier Prat
d6ea01c4f3
Created outline task but still need to create specific render job with z-pass shaders
2017-09-06 17:34:29 +02:00
Olivier Prat
75e06b691f
Simplified version that works directly with metas
2017-09-06 15:59:04 +02:00
Olivier Prat
700d4a4b43
First working version of outline working with selection interface.
2017-09-06 15:47:10 +02:00
anshuman64
3a44c6977e
Merge pull request #11300 from ElderOrb/case7196
...
7196 Mouse pointer no longer visible in HMD mode
2017-09-05 17:42:36 -07:00
Andrew Meadows
4b8840f307
Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1
...
fix a bug that caused dynamic children to wink in and out and then vanish
2017-09-05 10:02:47 -07:00
Olivier Prat
b619b2311d
Merged with master
2017-09-05 10:27:53 +02:00
beholder
c62f9007e9
7196 Mouse pointer no longer visible in HMD mode
...
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.
The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
2017-09-03 15:20:59 +03:00
Seth Alves
0855dfc1c6
PR-11290 didn't actually bump protocol version
2017-09-01 17:26:32 -07:00
Menithal
5506520226
Fixed missing semi colon
2017-09-01 08:20:54 +03:00
Brad Davis
65b49a958f
Merge branch 'master' into 21484
2017-08-31 14:59:30 -07:00
Menithal
0e3fc64f63
Fixed Inverse logic and Cleanup
2017-09-01 00:35:56 +03:00
Menithal
663e8514de
Found the culprit. Was overriding the value
2017-09-01 00:00:24 +03:00
Seth Alves
41b51804dc
fix comment
2017-08-30 17:53:55 -07:00
Seth Alves
3f0a95d8db
remove unneeded line
2017-08-30 17:53:20 -07:00
Seth Alves
ca86ce59c2
fix a bug that cuased dynamic children to wink in and out and then vanish
2017-08-30 17:44:42 -07:00
Zach Fox
913618ded5
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 16:13:50 -07:00
David Kelly
988ee8c8d1
fix image provider, couple other things
2017-08-30 15:23:54 -07:00
Zach Fox
3f0d44990a
Hook up bounding box rendering to Selection Scripting Interface
2017-08-30 14:54:23 -07:00
Zach Fox
fdcc149c34
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 13:27:18 -07:00
Zach Fox
271fcbf8b4
Merge pull request #11271 from davidkelly/dk/securityImageIssue
...
security image shows up in every qml engine now
2017-08-30 10:52:48 -07:00
Chris Collins
47a2e57e26
Merge pull request #10625 from humbletim/21180-C++
...
CR 21180-C++ Camera app -- core changes
2017-08-30 07:20:00 -07:00
David Kelly
72b15b4223
fix comment
2017-08-29 20:28:57 -07:00
druiz17
2a97257698
Merge pull request #11140 from ElderOrb/case6788
...
6788: You can deselect your current view mode
2017-08-29 17:15:51 -07:00
David Kelly
a2b1cfc7ac
security image shows up in every qml engine now
2017-08-29 17:06:57 -07:00
Menithal
ea79748ed3
Some adjustments
2017-08-29 23:59:36 +03:00
beholder
a0a43ebf26
show checkbox or radiobutton dependently on exclusiveGroup presence
2017-08-29 23:23:16 +03:00
Seth Alves
7220a6998a
remove unneeded bind-by-ref thing from lambdas
2017-08-28 17:08:59 -07:00
Seth Alves
b9c68f9156
give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup
2017-08-28 17:01:01 -07:00
Zach Fox
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -07:00
Chris Collins
d675ee9427
Merge pull request #11250 from jherico/thread_safety
...
Additional locking in model entities
2017-08-28 09:22:30 -07:00
Brad Davis
3ad32af975
Additional locking in model entities
2017-08-25 11:49:45 -07:00
Sam Gondelman
4e7818180b
Merge branch 'master' into tabletLayer2
2017-08-24 17:56:44 -07:00
Sam Gateau
c5fbd5a2a5
Merge pull request #11131 from jherico/threaded_render_entities
...
Threaded rendering of Entities
2017-08-24 17:34:49 -07:00
beholder
cbbe03cee7
6788: You can deselect your current view mode
2017-08-25 02:33:11 +03:00
Chris Collins
c0afda859f
Merge pull request #11240 from kencooke/audio-gate-threshold
...
More aggressive noise gate threshold
2017-08-24 14:49:18 -07:00
Zach Fox
3c7fadb1ce
Final touch
2017-08-24 14:30:42 -07:00
SamGondelman
4a49801217
web overlays and entities are always nonAA
2017-08-24 14:23:21 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
humbletim
9348048387
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-08-24 16:23:47 -04:00
Menithal
e47dfeaeab
Merge remote-tracking branch 'upstream/stable' into 21484
2017-08-24 21:37:20 +03:00
Ken Cooke
684b7fee5a
DC filter cutoff at 0.5Hz
2017-08-24 11:20:22 -07:00
Ken Cooke
4a253023ee
float constants
2017-08-24 10:15:54 -07:00
Ken Cooke
c3ff505b73
More aggressive noise gate threshold
2017-08-24 10:06:41 -07:00
Brad Hefta-Gaub
5c832eae9c
Merge pull request #11226 from SamGondelman/miceWithLasers
...
EntityTreeRender uses RayPick API with precision picking
2017-08-24 08:10:21 -07:00
Chris Collins
93457c0e42
Merge pull request #11237 from birarda/feat/ip-check
...
add sender sock addr check to DS packet filter operator
2017-08-24 07:51:23 -07:00
Chris Collins
751440388a
Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix
...
Bug fix for deadlock between EntitySimulation and EntityItem locks.
2017-08-23 20:50:41 -07:00
Stephen Birarda
133b7e66b7
adjust a comment and remove some debug
2017-08-23 16:38:23 -07:00
