Seth Alves
4a3b59ea61
Merge pull request #11560 from druiz17/far-grab-nondynamic
...
Far grab non-dynamic entities
2017-10-10 12:29:38 -07:00
Sam Gateau
c44efda978
Merge pull request #11349 from Zvork/hdrcube
...
Under the hood support for HDR cube maps
2017-10-10 11:43:41 -07:00
Ryan Huffman
568a7ba439
Merge pull request #11557 from cain-kilgore/21562
...
WL 21562 - Fix the error in the Asset Browser
2017-10-10 11:12:33 -07:00
Clément Brisset
3b48833cc0
Merge pull request #11451 from huffman/feat/upload-user-event
...
Add uploading to asset server event
2017-10-10 11:03:33 -07:00
druiz17
013e15c9a2
made requested changes
2017-10-10 10:54:56 -07:00
Melissa Brown
662bb6c103
Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7
...
[Case 6491] Remainder of entitySelectionTool clean up (details below).
2017-10-10 10:36:14 -07:00
druiz17
a179df29fb
mouse grab non-dynamic entities
2017-10-10 10:31:40 -07:00
druiz17
d0eb6a3ad0
remove comments
2017-10-10 09:45:41 -07:00
Ryan Huffman
9c120f1194
Update AssetMappingsScriptingInterface to not open file for activity event
2017-10-10 09:44:13 -07:00
druiz17
003395b256
removing whitespace
2017-10-10 09:43:02 -07:00
druiz17
9ff1b2c815
Merge branch 'master' of github.com:highfidelity/hifi into far-grab-nondynamic
2017-10-10 09:17:16 -07:00
druiz17
fc41155ce1
saving work
2017-10-10 09:17:01 -07:00
Olivier Prat
db9a9e723c
Merged with master
2017-10-10 12:11:23 +02:00
Cain Kilgore
583b0c521e
Open
2017-10-10 03:40:48 +01:00
Cain Kilgore
e9f4dee56d
WL 21562 - Fix the error in the Asset Browser
2017-10-10 03:39:13 +01:00
Seth Alves
559f229bd1
Merge pull request #11552 from SamGondelman/animationMaster
...
Cherry-pick "Model asks for renderUpdate if animating" into master
2017-10-09 17:57:19 -07:00
Seth Alves
8ac1875a91
Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login
...
Find nearby entities at login
2017-10-09 17:54:44 -07:00
Seth Alves
58534a5a6d
Merge pull request #11550 from druiz17/fix-test-audio
...
fixed looping sample sound bug
2017-10-09 15:21:24 -07:00
SamGondelman
ee02fa9a91
model asks for renderUpdate if animating
...
(cherry picked from commit 873ae9b9d6
2017-10-09 13:55:48 -07:00
Anthony Thibault
13919907de
Merge pull request #11539 from Nex-Pro/patch-1
...
Fixed typo in qWarning message.
2017-10-09 12:10:27 -07:00
druiz17
cd97ab0fdf
fixed looping sample sound bug
2017-10-09 11:39:57 -07:00
Andrew Meadows
bbde1bcd63
move stuff out of writelock when possible
2017-10-09 10:42:42 -07:00
Andrew Meadows
0bcecdbe66
be picky when finding nearby entities at login
2017-10-09 10:27:46 -07:00
Andrew Meadows
0f4e7fb532
workaround for bad physics polling on login
2017-10-09 10:27:46 -07:00
Thijs Wenker
895f79fd80
Merge pull request #11548 from ctrlaltdavid/move-shapes
...
Move Shapes app files from scripts directory to marketplace directory
2017-10-09 02:37:15 +02:00
Thijs Wenker
bd74386997
Merge pull request #11543 from ctrlaltdavid/21496
...
Add script that tests setting your listening position and orientation
2017-10-09 01:15:22 +02:00
David Rowe
765f3fc381
Move Shapes app files from scripts directory to marketplace directory
2017-10-09 10:38:40 +13:00
Bradley Austin Davis
c92588685b
Merge pull request #11533 from SamGondelman/modelMaster
...
Fix model loading for real this time
2017-10-08 10:23:13 -07:00
Bradley Austin Davis
b960c81a85
Merge pull request #11536 from FlameSoulis/patch-1
...
Fix DQT_CMAKE_PREFIX_PATH being overwritten
2017-10-08 10:22:30 -07:00
Seth Alves
66191a5419
Merge pull request #11291 from ElderOrb/optional-build-tools
...
make building tools (besides 'scribe') optional
2017-10-08 10:02:28 -07:00
Seth Alves
e6d0ab5343
Merge pull request #11545 from jherico/fix/text3d_overlay
...
Fix rendering transform for text3d overlays
2017-10-08 06:33:12 -07:00
Brad Davis
7aeeaeb4e7
Fix rendering transform for text3d overlays
2017-10-07 19:41:43 -07:00
Brad Hefta-Gaub
06743a1cd9
Merge pull request #11544 from highfidelity/revert-11532-import-av-entities
...
Revert "fix importing of avatar entities"
2017-10-07 16:58:22 -07:00
Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07:00
David Rowe
596ce8e9c1
Add script that tests setting your listening position and orientation
2017-10-07 21:46:56 +13:00
Brad Hefta-Gaub
62fc193bff
Merge pull request #11532 from sethalves/import-av-entities
...
fix importing of avatar entities
2017-10-06 17:59:54 -07:00
Brad Hefta-Gaub
80f0bd3b79
Merge pull request #11494 from humbletim/add-console-output-basenames
...
[experiment/feedback] Include script name with all JS/QML debug output
2017-10-06 17:58:19 -07:00
Thijs Wenker
77a36bf788
Merge pull request #10892 from ctrlaltdavid/vr-edit-a
...
VR edit app
2017-10-07 02:19:00 +02:00
David Rowe
3fbaf250a4
Increase delay in kicking off physics
2017-10-07 11:50:31 +13:00
Seth Alves
f6ff7b3888
Merge pull request #11540 from sethalves/fix-hasCompoundShapeURL
...
fix mistaken logic-flip in recent PR
2017-10-06 13:03:18 -07:00
Seth Alves
9064114ce5
fix mistaken logic-flip in recent PR
2017-10-06 11:03:48 -07:00
Seth Alves
195d96bd43
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 11:02:35 -07:00
Seth Alves
f4dedf05bb
move variables into block that needs them
2017-10-06 11:02:26 -07:00
Nex-Pro
24974fdae3
Fixed typo in qWarning message.
2017-10-06 18:42:02 +01:00
Zach Fox
051b63503c
Merge pull request #11534 from zfox23/commerce_daveIntegration1
...
Commerce backend changes sync, October 5 2017
2017-10-06 09:45:45 -07:00
Ryan Huffman
9c06afc4c8
Merge pull request #11326 from cain-kilgore/21537
...
WL 21537 - Improve log naming
2017-10-06 08:51:42 -07:00
Seth Alves
8d00731620
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 07:20:34 -07:00
LaShonda Hopper
2f082d9e86
[Case 6491] Fixes issue in normalizeDegrees from last commit (details below).
...
The range of the function is targeting (-180, 180] such that
the statement:
if (degrees < -180)
should be:
if (degrees <= -180)
to account for degrees being -180.
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-06 10:11:26 -04:00
LaShonda Hopper
707569b230
[Case 6491] More efficient version of normalizeDegrees function (details below).
...
Refactoring the original normalizeDegrees function to be
more efficient as suggested via:
https://github.com/highfidelity/hifi/pull/11338#pullrequestreview-67520585
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-06 09:50:24 -04:00
Flame Soulis
0c33f46ab1
Update SetupQt.cmake
...
This change allows -DQT_CMAKE_PREFIX_PATH to function again. Previously, set(QT_CMAKE_PREFIX_PATH "$ENV{QT_CMAKE_PREFIX_PATH}") always ran, which overrode QT_CMAKE_PREFIX_PATH every time on cmake. This proposed change now only uses the environment variable if DQT_CMAKE_PREFIX_PATH is not specified.
2017-10-05 21:42:16 -04:00
