Commit graph

49452 commits

Author SHA1 Message Date
jmferrer
32a0225f48 Fix:
$ cmake .. -DQT_CMAKE_PREFIX_PATH=/usr/local/Qt5.6.1/5.6/gcc_64/lib/cmake
-- Performing Test COMPILER_SUPPORTS_CXX11
-- Performing Test COMPILER_SUPPORTS_CXX11 - Success
-- Performing Test COMPILER_SUPPORTS_CXX0X
-- Performing Test COMPILER_SUPPORTS_CXX0X - Success
-- The BUILD_BRANCH variable is:
-- The BRANCH environment variable is:
-- The RELEASE_TYPE variable is:
-- The BUILD_GLOBAL_SERVICES variable is: DEVELOPMENT
-- The USE_STABLE_GLOBAL_SERVICES variable is: 0
-- Found GLM: /home/jmferrerm/trabajo/SL/hifi/build/ext/makefiles/glm/project/include
-- Found ZLIB: /usr/lib/x86_64-linux-gnu/libz.so (found version "1.2.8")
CMake Error at /usr/share/cmake-3.5/Modules/FindPackageHandleStandardArgs.cmake:148 (message):
  Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the
  system variable OPENSSL_ROOT_DIR (missing: OPENSSL_LIBRARIES
  OPENSSL_INCLUDE_DIR)
Call Stack (most recent call first):
  /usr/share/cmake-3.5/Modules/FindPackageHandleStandardArgs.cmake:388 (_FPHSA_FAILURE_MESSAGE)
  cmake/modules/FindOpenSSL.cmake:217 (find_package_handle_standard_args)
  libraries/networking/CMakeLists.txt:15 (find_package)

-- Configuring incomplete, errors occurred!
See also "/home/jmferrerm/trabajo/SL/hifi/build/CMakeFiles/CMakeOutput.log".
2017-01-08 08:51:56 +01:00
Brad Hefta-Gaub
1a7b5ab520 Merge pull request #9326 from jherico/oculus_budget_stats
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 18:18:16 -08:00
Howard Stearns
b432ffa78d Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction
Fix the PAL & Space Bubble interaction
2017-01-06 16:47:43 -08:00
Zach Fox
afa6d54ac4 Actually fix the behavior... 2017-01-06 14:20:25 -08:00
Zach Fox
dec41f67cc Fix bugs and generally fix behavior 2017-01-06 13:58:23 -08:00
Howard Stearns
36c99a604b Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal
Edit button to select in pal
2017-01-06 13:17:29 -08:00
Clément Brisset
48459be13c Merge pull request #9312 from ZappoMan/fixMouseLasers
fix competition between seek mouse and lasers
2017-01-06 13:11:01 -08:00
Brad Davis
15b9e750f9 Adding tracking of Oculus renders, submits, and frames that are over budget 2017-01-06 10:51:26 -08:00
Clément Brisset
0a08563b1f Merge pull request #9325 from Atlante45/log-dialog
Log dialog doesn't float on top
2017-01-06 10:40:09 -08:00
howard-stearns
2f5f53c8e4 cr 2017-01-06 10:28:09 -08:00
howard-stearns
b149fa3d79 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-06 10:21:22 -08:00
Howard Stearns
220880d6f8 Merge pull request #9311 from davidkelly/dk/prettierPAL
Somewhat prettier node overlays for PAL
2017-01-06 09:54:38 -08:00
Brad Hefta-Gaub
349f0763e5 Merge pull request #9310 from PhilipRosedale/chair
Simple chair script
2017-01-06 08:18:31 -08:00
David Kelly
a107b2f06e lost my - sign 2017-01-06 08:44:22 -07:00
Zach Fox
b7d64804c1 Remove errant //FIXME 2017-01-05 21:55:09 -08:00
Atlante45
428a7f3bf8 Log Dialog doesn't float on top 2017-01-05 17:49:39 -08:00
David Kelly
88ed96918a Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL 2017-01-05 18:30:28 -07:00
David Kelly
4504b31c1d Bugfix, plus minor cr stuff
Seems to solve the 'due north' issue - we now have the main overlay as
the sphere, and it is the only thing clickable.  The model is no longer
clickable, so you cannot click clouds to select things.  Prevents some
confusion when opaque objects have ignoreRayIntersection, allowing you
to select a cloud you cannot see (i.e clicking near but not on the
sphere you can see).
2017-01-05 18:20:40 -07:00
Zach Fox
495925a017 This behavior was harder to change than expected... 2017-01-05 16:58:32 -08:00
howard-stearns
83685740c4 change wording for common case 2017-01-05 16:37:40 -08:00
howard-stearns
f5c4535115 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 16:29:34 -08:00
Howard Stearns
3f54428744 Merge pull request #9313 from howard-stearns/pal
People Action List
2017-01-05 15:49:56 -08:00
David Kelly
1f3c2bb271 Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL 2017-01-05 16:35:47 -07:00
howard-stearns
ef02c84759 further simplification of letterbox, and use for selection failures 2017-01-05 14:46:32 -08:00
howard-stearns
0cdeac8736 abstract out letterbox message 2017-01-05 14:32:31 -08:00
David Kelly
ef92a091b2 node overlay model now an asset 2017-01-05 15:19:09 -07:00
David Kelly
c95e880677 scale offsets to avatar height 2017-01-05 15:04:40 -07:00
Brad Hefta-Gaub
86c0d76955 Merge pull request #9314 from jherico/present_priority
Use a higher thread priority for Oculus present
2017-01-05 14:02:50 -08:00
howard-stearns
c4c1ea9578 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 14:02:44 -08:00
Howard Stearns
64a706f9e2 Merge pull request #9315 from zfox23/FixModJSAfterPAL
Allow for compatibility with old mod.js script after PAL changes
2017-01-05 14:00:41 -08:00
howard-stearns
0670a4689f Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 13:57:44 -08:00
Philip Rosedale
9bd858c1ab no log spam 2017-01-05 13:49:38 -08:00
Philip Rosedale
07ecf60485 remove sit when close 2017-01-05 13:48:31 -08:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -08:00
Howard Stearns
28326ff47a Merge pull request #9306 from zfox23/PALVisualUpdates
Fix PAL scrollbar; add helper popup to ADMIN tab
2017-01-05 13:29:21 -08:00
Zach Fox
2f503d0bcc Allow for compatibility with old mod.js script 2017-01-05 13:25:27 -08:00
David Kelly
2949560e90 Corrected lame math error
so we are centered now, and put the overlay up a bit higher.  Still need
to make that scale properly with avatar size.
2017-01-05 14:22:35 -07:00
Philip Rosedale
65b9aaed1b one more try 2017-01-05 13:13:50 -08:00
Philip Rosedale
a689d52004 wrap far trigger too with seated check 2017-01-05 13:08:50 -08:00
Philip Rosedale
0ad9a8625b Added far trigger 2017-01-05 12:58:26 -08:00
howard-stearns
47aa1e4f8e add pal to defaultScripts 2017-01-05 12:23:17 -08:00
Brad Hefta-Gaub
cb69e70781 fix competition between seek mouse and lasers 2017-01-05 11:31:50 -08:00
Brad Davis
9bf4804d3d Use a higher thread priority for Oculus present 2017-01-05 11:04:50 -08:00
David Kelly
75aa32ac6a remove some debugging crap 2017-01-05 12:01:55 -07:00
David Kelly
d5e6afa15a slightly further forward, a little bigger 2017-01-05 11:54:50 -07:00
Zach Fox
b5713656be Minor language changes on Admin help text 2017-01-05 09:27:12 -08:00
David Kelly
f1d6335a24 First stab at making PAL avatar highlighting a bit prettier
Working around rendering issues with model-based overlays and the
drawInFront, we use 2 overlays.  One is the model, another is
a sphere with drawInFront on.  Still need to dial in colors and sizes
but this should be close enough for iteration.
2017-01-05 10:18:58 -07:00
Brad Hefta-Gaub
825fc1cfa1 Merge pull request #9309 from kencooke/audio-hdr-volume
High Dynamic Range Audio injectors
2017-01-05 08:10:54 -08:00
Brad Hefta-Gaub
e78582ebae Merge pull request #9285 from PhilipRosedale/springAway
script to push things with your hands
2017-01-05 08:02:10 -08:00
Philip Rosedale
88429c4033 wrong file 2017-01-04 23:51:05 -08:00