Seth Alves
8a88b30da7
Merge pull request #10468 from AndrewMeadows/cleanup-actions
...
cleanup Actions and Constraints part-1
2017-05-17 11:33:53 -07:00
Andrew Meadows
82c7188376
Merge pull request #10470 from huffman/fix/ktx-cubemaps
...
Fix progressive loading of KTX cubemaps
2017-05-17 11:23:24 -07:00
Andrew Meadows
97ed719506
cap scripted linear and angular velocity inputs
2017-05-17 10:40:45 -07:00
Sam Gateau
0f250e693d
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-17 09:49:20 -07:00
Seth Alves
8ab676e627
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-17 09:09:04 -07:00
Dante Ruiz
a18940142e
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-17 16:23:50 +01:00
Thijs Wenker
2d6c6af37f
Merge pull request #10381 from Triplelexx/21297
...
DNM 21297 - Edit.js: Make the default particle system attractive
2017-05-17 15:55:40 +02:00
Triplelexx
c678fd67ed
change default particle texture to production
2017-05-17 14:52:11 +01:00
Thijs Wenker
278bc610d4
Merge pull request #10466 from misslivirose/feat-find-entities-by-type
...
Add function findEntitiesByType EntityScriptingInterface
2017-05-17 15:06:04 +02:00
Brad Hefta-Gaub
764bfe94f5
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
...
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
Brad Hefta-Gaub
ee6bed5c1c
Merge pull request #10189 from Atlante45/fix/memory-leak
...
Set max packet per second on the agent
2017-05-16 21:03:05 -07:00
Brad Hefta-Gaub
b0d2de7bc0
Merge pull request #10427 from ctrlaltdavid/21334
...
Fix erroneous "did not start playing recording" messages
2017-05-16 20:54:27 -07:00
Brad Hefta-Gaub
12aa354ddd
Merge pull request #10474 from ctrlaltdavid/21346
...
Fix recording playback not clearing attachments and nametags
2017-05-16 20:53:17 -07:00
Brad Hefta-Gaub
254c6e9292
Merge pull request #10441 from Atlante45/feat/launch-sandbox
...
Launch the Sandbox as early as possible
2017-05-16 20:52:23 -07:00
Seth Alves
10f1143278
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-16 20:49:53 -07:00
Brad Hefta-Gaub
b759a148f3
Merge pull request #10480 from ctrlaltdavid/21360
...
Add domain to record script user activity logging
2017-05-16 20:48:27 -07:00
Brad Hefta-Gaub
36c7821e1e
Merge pull request #10455 from ZappoMan/TriangleSetOptimizations
...
TriangleSet optimizations - ~80% improvement in Ray picking against models
2017-05-16 20:47:50 -07:00
Seth Alves
36f8d08b32
Merge pull request #10450 from hiflex/patch-1
...
Fix the Face Camera checkbox on the text entity properties tab.
2017-05-16 20:31:56 -07:00
David Rowe
e69c322fd3
Get UserActivityLogger working in AC scripts
2017-05-17 14:30:32 +12:00
samcake
b466964817
REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior
2017-05-16 18:21:24 -07:00
Brad Hefta-Gaub
f623a9dc82
Merge pull request #10478 from sethalves/delete-localtree-children
...
clean up children of deleted avatar-entity
2017-05-16 18:14:45 -07:00
David Rowe
04fcdfc4a2
Add domain to record script user activity logging
2017-05-17 12:23:53 +12:00
Seth Alves
d90843428d
when importing entities, make a queryAACube that takes children into account
2017-05-16 16:54:16 -07:00
Zach Fox
b9ddc3b19f
Improve robustness of display name focus in PAL
2017-05-16 16:25:22 -07:00
Seth Alves
1e4e2cc1b4
when a parent entity is deleted, delete its children in the local tree, rather than waiting for the server to tell us about it
2017-05-16 16:22:40 -07:00
samcake
2cd2c95940
Adding more debugging tool
2017-05-16 16:12:31 -07:00
Andrew Meadows
d065b569d3
support for variable avatar mass by size
2017-05-16 16:03:51 -07:00
Andrew Meadows
805d23567d
fix simple typo
2017-05-16 16:03:50 -07:00
Ryan Huffman
e0212ac32b
Remove _fullImageSize from ktx header
2017-05-16 15:53:07 -07:00
Triplelexx
5a742002e2
change default particle values
2017-05-16 23:39:38 +01:00
Dante Ruiz
25b1bb0633
adjusted values
2017-05-16 23:34:46 +01:00
Andrew Meadows
e446d0f8c9
Merge pull request #10473 from huffman/fix/model-mesh-parts-assert
...
Remove unnecessary assert in Model.cpp
2017-05-16 15:29:22 -07:00
Ryan Huffman
7225326bfc
Fix failed mip insertions not being handled by TextureCache
2017-05-16 15:12:47 -07:00
Ryan Huffman
bfd1274ed3
Fix progressive loading of cubemaps
...
In various places we were using the KTX _imageSize as the size of the
entire mip level, when it is actually the size of the face for cubemaps.
2017-05-16 15:12:47 -07:00
Atlante45
c799ddc927
CR
2017-05-16 14:53:54 -07:00
Atlante45
201f81f20a
Don't wait on the sandbox
2017-05-16 14:41:57 -07:00
Seth Alves
b9005a9e76
fix up queryAACubes before sending imported entities to server
2017-05-16 14:32:55 -07:00
anshuman64
b36fb81524
Merge pull request #10475 from highfidelity/viveChange
...
Change Puck Calibration Time from 2 sec to 1 sec
2017-05-16 13:58:18 -07:00
Anshuman Dewangan
e3cd85bd22
Changed calibration time from 2 to 1 sec
2017-05-16 13:55:04 -07:00
David Rowe
7897bf8aa8
Fix display name not getting cleared
2017-05-17 08:17:55 +12:00
David Rowe
733b0feabd
Fix attachment data not getting cleared
2017-05-17 08:17:33 +12:00
Zach Fox
e0dd047263
Merge pull request #10472 from zfox23/snapshot_fixSnapshotDeletion
...
Snapshots: Fix case when user story would be incorrectly deleted
2017-05-16 12:54:10 -07:00
Zach Fox
aa0394c2ef
Fix case when user stories would be incorrectly deleted
2017-05-16 11:07:03 -07:00
Anthony J. Thibault
be7a9a2383
warning fixes
2017-05-16 11:00:25 -07:00
Ryan Huffman
8eacf0ad4b
Remove unnecessary assert in Model.cpp
...
This clause inside was not longer valid - it is a valid state for
part->_meshIndex < _modelMeshRenderItems.size(). A better check might be
to compare it to the size of _meshStates which we use below, but we use
_meshStates.at(...) which will do the bounds checking, which makes the
assert unnecessary.
2017-05-16 10:56:33 -07:00
Andrew Meadows
e9c703b147
add deprecation log for DYNAMIC_TYPE_SPRING
2017-05-16 10:34:39 -07:00
Dante Ruiz
add45df496
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-16 16:38:31 +01:00
Dante Ruiz
b0fa26e390
fix wierd calibration effect due to low velocity filter
2017-05-16 16:38:01 +01:00
Andrew Meadows
d705f529a0
use 'tractor' instead of 'spring' in JS files
2017-05-16 08:35:54 -07:00
Andrew Meadows
e6accb61b0
more purging of legacy 'Spring' action
2017-05-16 08:09:20 -07:00
