Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07: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
Seth Alves
195d96bd43
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 11:02:35 -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
53a49272dc
fix importing of avatar-entities
2017-10-05 11:43:19 -07:00
Cain Kilgore
b3c3b2d34f
Switched Time & Session ID Over
2017-10-05 19:42:31 +01:00
Andrew Meadows
8d2153d2f3
cleanup debug stats, use more correct names
2017-10-02 13:08:17 -07:00
Andrew Meadows
7df8816a81
faster rate counting
2017-10-02 13:08:17 -07:00
humbletim
fd917917c4
include the source basename in Script.print() && QML/Script console.*() debug output
2017-09-29 14:48:01 -04:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
SamGondelman
c39ac93fc8
fix isVerySimilar
2017-09-29 11:34:35 -07:00
Andrew Meadows
d55d45f6aa
check radius in ViewFrustum::isVerySimilar()
2017-09-29 11:34:35 -07:00
Andrew Meadows
a55661e1ff
remove ViewFrustum::calculateProjection()
2017-09-29 11:34:35 -07:00
Andrew Meadows
0597970bb4
faster, more correct ViewFrustum::isVerySimilar()
...
remove OVERSEND hack
add ViewFrustum::calculateProjection() method used by OctreeQueryNode
2017-09-29 11:34:34 -07:00
SamGondelman
defed80be7
edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes
2017-09-29 11:34:34 -07:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Seth Alves
913d3c4d12
Merge pull request #11422 from hyperlogic/feature/ant-man2
...
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
Andrew Meadows
ec80846281
Merge pull request #11443 from SamGondelman/sharks
...
Laser Pointer fixes and updates
2017-09-26 10:22:55 -07:00
SamGondelman
a73fdf4397
fix pointer event properties
2017-09-25 10:19:42 -07:00
SamGondelman
cbe621f2b7
add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate
2017-09-22 15:15:15 -07:00
Anthony J. Thibault
54e627e2c5
Merge branch 'master' into feature/ant-man2
2017-09-21 13:59:47 -07:00
Andrew Meadows
b803344f0c
Merge pull request #11421 from jherico/fix/transform_log_spam
...
Don't add items to the scene graph until they have a valid parent chain
2017-09-21 08:42:56 -07:00
Ryan Huffman
a56303a3fe
Merge pull request #11379 from highfidelity/feat/auto-bake
...
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
Brad Davis
27350bd7de
Don't add items to the scene graph until they have a valid parent chain
2017-09-20 16:52:23 -07:00
Anthony J. Thibault
09c61deda8
Fixes for Vive puck calibration
2017-09-20 15:41:49 -07:00
Bradley Austin Davis
bc4193f276
Merge branch 'master' into android_new
2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Atlante45
b9e5957c9f
Remove unused Algorithms.h
2017-09-18 16:14:06 -07:00
Anthony J. Thibault
0757f513af
Merge branch 'master' into feature/ant-man
2017-09-18 11:36:39 -07:00
Seth Alves
8a49edbecb
code review
2017-09-15 10:08:35 -07:00
Atlante45
ae14f1f88e
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-09-14 15:34:20 -07:00
Anthony J. Thibault
8fb69a9867
Merge branch 'master' into feature/ant-man
2017-09-13 18:23:11 -07:00
Cain Kilgore
2427008ff3
Static
2017-09-13 17:40:04 +01:00
Cain Kilgore
1c05311056
Some code cleanup
2017-09-13 16:48:18 +01:00
beholder
deee6aab1a
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-09-12 04:24:18 +03:00
Anthony J. Thibault
b81f85e1ae
Merge branch 'master' into feature/ant-man
2017-09-11 15:14:03 -07:00
Cain Kilgore
f6e22b0733
Changes
...
The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.
2017-09-09 17:21:42 +01:00
David Rowe
6ba6c6ee35
Reduce entity fade-in time
2017-09-09 18:00:21 +12:00
Cain Kilgore
7b39cb7791
Should work now
2017-09-08 21:44:38 +01:00
Cain Kilgore
dfbd25fd77
Now pls
2017-09-08 20:51:41 +01:00
Cain Kilgore
7f4cc0ed2a
Should fix the Mac Build
2017-09-08 20:21:17 +01:00
Cain Kilgore
b953c49461
Commit for Better Logger - WL 21537
2017-09-08 03:20:55 +01:00
Stephen Birarda
5e1decb02b
Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake
2017-09-07 12:06:53 -07:00
Dante Ruiz
fec8482b69
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-05 16:26:51 -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
Brad Davis
65b49a958f
Merge branch 'master' into 21484
2017-08-31 14:59:30 -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
Anthony J. Thibault
c9cdaadeb5
Better scale support in SpatiallyNestable class.
...
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.
Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field. a new _dimensions member variable is used instead. The SpatiallyNestable scale
field for entities should always be one.
Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.
Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.
Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
Anthony J. Thibault
573985c7c9
Merge branch 'master' into feature/ant-man
2017-08-28 09:27:04 -07:00
