Ryan Huffman
3c9205d0b2
Remove invalid comment and unnecessary check from ScriptEngine
...
This removes an invalid comment - waitTillDoneRunning is not only called
from the main thread - and remove a check to make sure thread() is not
null because it should no longer be deleted before ScriptEngine.
2017-05-22 15:46:43 -07:00
samcake
e4f9f2935e
Solving the size evaluation for compressed format
2017-05-22 15:42:18 -07:00
Ryan Huffman
09c98b3ac3
Fix ScriptEngine thread being deleted too early
...
The thread appeared to be deleted before waitTillDoneRunning was
finished. This is a speculative fix. This ensures that the QThread isn't
deleted until after the ScriptEngine is deleted.
2017-05-22 15:31:11 -07:00
David Rowe
9cb990a3aa
Simplify head simulation methods
2017-05-23 09:53:42 +12:00
Brad Davis
a5112ce52a
Merge pull request #10520 from jherico/texture_ping_pong
...
Prevent ping-ponging of texture quality when oversubscribed
2017-05-22 14:52:52 -07:00
seefo
e77e900812
Added refreshing of Account Manager's access token
...
Changed indentention style to match guidelines
2017-05-22 14:46:44 -07:00
David Rowe
9f83ca518f
Merge branch 'master' into 21359
2017-05-23 09:18:10 +12:00
Seth Alves
3825830fac
if something is locked but in motion, make it kinematic rather than static
2017-05-22 14:07:53 -07:00
anshuman64
bfb44693a3
Merge pull request #10482 from ctrlaltdavid/21361
...
Fix AC playback script not logging
2017-05-22 12:58:20 -07:00
samcake
f8c291ee78
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-22 10:56:00 -07:00
Brad Davis
afee753570
Prevent ping-ponging of texture quality when oversubscribed
2017-05-22 09:52:18 -07:00
Sam Cake
1f090d8148
Debugging the size problem and fixing the compression size evaluation
2017-05-22 01:00:34 -07:00
Seth Alves
4142d8c686
actions shouldn't change locked entities
2017-05-21 11:05:18 -07:00
Seth Alves
381de7a1e2
tabs
2017-05-21 08:42:53 -07:00
Seth Alves
c68efc2ed0
treat locked like other properties that affect simulation
2017-05-21 08:29:35 -07:00
Sam Cake
321f74c305
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-20 18:12:58 -07:00
Seth Alves
2512b39848
don't dirty motion-type if lock value isn't actually changing
2017-05-20 14:14:33 -07:00
Seth Alves
8f38ea8c6a
force locked entities to be static in bullet
2017-05-20 11:54:42 -07:00
Seth Alves
a442181859
remove some redundancy
2017-05-20 08:51:44 -07:00
samcake
56e9b1bb37
Adding the populated counter
2017-05-19 18:46:19 -07:00
samcake
c5b5aa93b1
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-19 18:13:42 -07:00
David Rowe
a279d581ae
Fix code order
2017-05-20 12:56:23 +12:00
samcake
c449229850
Cleaned up the counters for memory
2017-05-19 17:52:56 -07:00
Sam Gateau
589bcc19ce
Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer
2017-05-19 17:50:19 -07:00
David Rowe
768415695d
Tidying
2017-05-20 12:43:47 +12:00
David Rowe
d9baa337d8
Fix call order
2017-05-20 12:41:50 +12:00
Seth Alves
a45b5599c9
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-19 17:37:03 -07:00
Clément Brisset
6e89f7d2f9
Merge pull request #10512 from Atlante45/fix/running-marker
...
Fix "Reset Settings" window poping up every time
2017-05-19 17:36:00 -07:00
Seth Alves
40c8261111
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-19 17:14:58 -07:00
Seth Alves
5c94147f40
children collision hulls appear to be in the right place, now
2017-05-19 17:09:42 -07:00
David Rowe
597312ff45
Reinstate missing guards
2017-05-20 12:08:01 +12:00
Clément Brisset
fa3ef25f3e
Merge pull request #10481 from marko8904/new_landing_in_welcome
...
changing the location in welcome to which a user is sent on the first run
2017-05-19 16:45:14 -07:00
Andrew Meadows
f80e7a3743
less obfuscation
2017-05-19 15:58:54 -07:00
Andrew Meadows
bb4d366c40
use SmartPointer for Zone _model
2017-05-19 15:33:23 -07:00
Seth Alves
67f222cb3f
be more careful about fixing up entities which arrived before their parents
2017-05-19 15:19:16 -07:00
David Rowe
0d6513c7dc
Merge branch 'master' into 21359
2017-05-20 10:11:25 +12:00
Ryan Huffman
26247e8653
Add check for valid mutableData in assignMipData
2017-05-19 15:00:53 -07:00
Seth Alves
386c76545c
be more careful about fixing up entities which arrived before their parents
2017-05-19 14:21:05 -07:00
Seth Alves
54dafa0f83
be more careful about fixing up entities which arrived before their parents
2017-05-19 14:14:00 -07:00
Seth Alves
5c93dbd20d
be more careful about fixing up entities which arrived before their parents
2017-05-19 13:48:29 -07:00
Sam Gateau
36ac623e66
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-19 13:25:36 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
Seth Alves
936d0e2d50
be more careful about fixing up entities which arrived before their parents
2017-05-19 12:13:43 -07:00
Ryan Huffman
64bf5784e6
Fix FileStorage to not close files after they are opened
...
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
2017-05-19 11:16:20 -07:00
Ryan Huffman
c36b85bb05
Add notes to KtxStorage::maybeOpenFile
2017-05-19 11:11:00 -07:00
Seth Alves
735e4b7d05
trying to get child collision hulls to be in the right place after import
2017-05-19 10:59:59 -07:00
Atlante45
c2e2682eff
Fix "Reset Settings" window poping up every time
2017-05-19 10:50:23 -07:00
Seth Alves
7220fe0ad8
set more physics flags dirty when an entity parent is found
2017-05-19 10:40:24 -07:00
Anthony J. Thibault
621d94eb91
removed temp comments
2017-05-19 10:38:16 -07:00
Marko Kudjerski
986d63cdbb
making sure that the first time landing in *welcome domain is updated for dev builds too
2017-05-19 10:17:02 -07:00
Marko Kudjerski
303bb05b3d
changing the location in welcome to which a user is sent on the first run
2017-05-19 10:17:02 -07:00
Seth Alves
77ce8a19cf
call entityChanged after settings flags
2017-05-19 10:11:02 -07:00
Seth Alves
0c12baa258
call entityChanged after settings flags
2017-05-19 09:57:42 -07:00
Seth Alves
99dfd9ded1
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-19 08:26:02 -07:00
Ken Cooke
746b41e509
Fix typo in comments
2017-05-18 17:30:07 -07:00
Ken Cooke
205b9d4aec
Fix compiler warnings
2017-05-18 16:49:02 -07:00
Anthony J. Thibault
e99001d86c
debug draw ik chains, bug fix for flex coef on tips
...
And opened up hip constraints.
2017-05-18 16:29:55 -07:00
Ryan Huffman
72af4219b8
Merge pull request #10499 from huffman/fix/ktx-progressive-image-size
...
Fix ktx image size in progrssively loaded cubemaps
2017-05-18 15:26:52 -07:00
Andrew Meadows
17b6cf29df
check for valid resource pointer before use
2017-05-18 15:12:59 -07:00
Seth Alves
4007133423
collision hulls are still not always in the right place
2017-05-18 14:59:26 -07:00
Seth Alves
1b0eeb9c2c
try harder to put things in place when their parent entities are discovered
2017-05-18 14:35:39 -07:00
Ken Cooke
18ed3dd6ed
Remove debug code
2017-05-18 14:30:25 -07:00
Ken Cooke
6f2a84a084
Add stand-alone DC blocking filter
2017-05-18 14:26:35 -07:00
Ken Cooke
c1cd26b473
New log-domain noise gate with adaptive threshold
2017-05-18 14:21:56 -07:00
Zach Pomerantz
c5a0a1af2f
Merge pull request #10429 from zzmp/audio/close-device
...
Close audio device when switching outputs
2017-05-18 17:18:53 -04:00
Ken Cooke
106dd6ce6a
Fast fixed-point log2 approximation
2017-05-18 14:15:10 -07:00
Seth Alves
ef556fae9b
when an entity's parent wasn't known and then becomes known, patch up the rigid-body and the render-item bounds
2017-05-18 14:13:33 -07:00
Ken Cooke
cad9eeb8ba
Refactor the peak limiter (output is bit-exact)
2017-05-18 14:13:24 -07:00
David Rowe
3aebe96afe
Merge branch 'master' into 21359
2017-05-19 09:03:11 +12:00
Dante Ruiz
984f9e1ba5
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-18 21:23:06 +01:00
Dante Ruiz
78f6d2e850
fix low velocity filter
2017-05-18 21:22:42 +01:00
Seth Alves
f35796259b
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-18 13:20:50 -07:00
Seth Alves
ec02887ae6
attempt to get imported entities into the correct octree-element
2017-05-18 13:20:44 -07:00
Atlante45
a8b1a29a4a
Add support for BC7 compression
2017-05-18 13:11:41 -07:00
Sam Gateau
a9fcdce95a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-18 13:08:35 -07:00
samcake
9c154122d3
Introdicing the format factor and merging with master becasue of protocol change...
2017-05-18 13:08:13 -07:00
samcake
396924b4a5
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-18 13:06:05 -07:00
Sam Gateau
b8a2b38fd5
Displaying the stack of zone components
2017-05-18 12:54:25 -07:00
Ryan Huffman
6d2d838510
Fix ktx image size in progrssively loaded cubemaps
...
The size being written was the full image size (size of all faces), when
it should have been the face size.
2017-05-18 11:46:14 -07:00
Anthony J. Thibault
87adeb0565
apply flexCoeff to tip of joint chain as well.
2017-05-18 11:26:49 -07:00
Anthony J. Thibault
abe19310da
WIP: checkpoint of ik changes
2017-05-18 11:26:48 -07:00
Andrew Meadows
8d3285f733
verify _rig is valid in Model::deleteGeometry()
2017-05-18 11:11:50 -07:00
David Kelly
c2b140cc03
Merge pull request #10489 from davidkelly/dk/sequenceNumberForAvatarIdentity
...
Switch from timestamp to sequence id for avatar identity
2017-05-18 10:09:42 -07:00
Sam Gateau
d9ad45bf4a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-18 09:37:04 -07:00
samcake
2c6e10fbe1
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-18 09:21:02 -07:00
Seth Alves
b8567e0550
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-18 09:10:58 -07:00
Dante Ruiz
90ddc16d09
add calibration data to filters
2017-05-18 17:07:28 +01:00
Brad Hefta-Gaub
fbc32e5ba1
Merge pull request #10485 from samcake/orange
...
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
2017-05-18 08:47:58 -07:00
Sam Cake
5edcc38eba
Polishing the scope shaders
2017-05-18 01:06:59 -07:00
David Rowe
f6c1fa4213
Merge branch 'master' into 21359
2017-05-18 16:40:20 +12:00
Brad Hefta-Gaub
014fd710de
Merge pull request #10490 from Atlante45/feat/settings-map
...
Enable Map/List storage in the settings
2017-05-17 21:24:04 -07:00
Seth Alves
b05cb4af3b
fix nan
2017-05-17 20:51:34 -07:00
David Rowe
26e390fa89
Tidy code setting head orientation
2017-05-18 13:55:06 +12:00
Zach Pomerantz
e8ab780899
include details in critical variantMap parsing error
2017-05-17 21:32:13 -04:00
samcake
80b6fd65ae
Cleaning up counters and naming schemes...
2017-05-17 18:31:28 -07:00
David Rowe
f00232ab6d
Fix avatar eyelids and blinking in recording playback
...
Reinstates conditions to not calculate eye movements if face / eye
trackers are connected; they're considered connected for recording
playback.
2017-05-18 13:30:29 +12:00
Sam Gateau
966afa1e4a
Adding the drawKeyLight shader
2017-05-17 18:26:49 -07:00
Sam Gateau
3e7795ec11
Adding the drawKeyLight shader
2017-05-17 18:23:47 -07:00
Sam Gateau
79f700e8ce
Adding the drawKeyLight shader
2017-05-17 18:12:48 -07:00
David Rowe
223b1a858b
Fix avatar eye look-at in recording playback
2017-05-18 12:27:31 +12:00
Howard Stearns
95111d24b2
Merge branch 'master' into dk/sequenceNumberForAvatarIdentity
2017-05-17 17:09:47 -07:00
Brad Hefta-Gaub
c07eb3e45e
Merge pull request #10471 from hyperlogic/feature/ik-flex-coeff
...
Flex and weight IK tuning parameters
2017-05-17 16:48:50 -07:00
Seth Alves
0dc355cf86
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-17 16:43:50 -07:00
Brad Hefta-Gaub
93f3b2df45
Merge pull request #10491 from birarda/bug/bearer-timeout
...
disable the bearer poll timeout
2017-05-17 16:24:17 -07:00
Anthony J. Thibault
0018224fef
moar warning fixes
2017-05-17 16:23:39 -07:00
Andrew Meadows
09433a93ba
Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
...
More correct avatar mass
2017-05-17 16:22:06 -07:00
Brad Hefta-Gaub
0d3f7058ec
Merge pull request #10483 from AndrewMeadows/cap-velocities
...
cap scripted linear and angular velocity inputs
2017-05-17 16:15:42 -07:00
Stephen Birarda
2ac5fbf91d
set wireless scan interval to -1
2017-05-17 15:33:52 -07:00
Anthony J. Thibault
78dd30f656
macosx warning fix
2017-05-17 15:22:39 -07:00
Zach Fox
c5a5cad76d
Merge pull request #10487 from zfox23/removeExtraneousSendIdentity
...
Remove extraneous calls to sendIdentityPacket()
2017-05-17 15:20:09 -07:00
David Kelly
057718bde3
remove clockSkew, reference new version for Avatar packets
2017-05-17 15:14:56 -07:00
David Kelly
689a0b5bad
Switch from timestamp to sequence id for avatar identity
2017-05-17 14:22:36 -07:00
Zach Fox
d4752926b8
First pass - checking performance
2017-05-17 13:51:27 -07:00
samcake
b19b0007c8
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-17 13:02:37 -07:00
samcake
ab3ea65d54
Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage
2017-05-17 12:36:12 -07:00
Atlante45
0d77977936
Enable Map/List storage in the settings
2017-05-17 12:11:15 -07:00
Seth Alves
9b1fe60b7c
suppress frequest log-spam from constraints.
2017-05-17 11:55:31 -07:00
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
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
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
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
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
Seth Alves
d90843428d
when importing entities, make a queryAACube that takes children into account
2017-05-16 16:54:16 -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
Ryan Huffman
e0212ac32b
Remove _fullImageSize from ktx header
2017-05-16 15:53:07 -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
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
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
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
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
e6accb61b0
more purging of legacy 'Spring' action
2017-05-16 08:09:20 -07:00
Sam Cake
4c3ddfbff9
Adding debuging of the ambient lighting
2017-05-16 01:01:19 -07:00
Andrew Meadows
9b3754c2ee
remove unused API from ObjectDynamic and friends
2017-05-15 22:13:03 -07:00
Andrew Meadows
9e08dadaf4
Remove ObjectActionSpring
2017-05-15 22:11:42 -07:00
Liv Erickson
32fd905918
style pass
2017-05-15 20:49:30 -07:00
Liv Erickson
ae458dcbcf
changing models to more generally reference entities in comment
2017-05-15 20:33:22 -07:00
Liv Erickson
a606f8a8d4
Fixing code style
2017-05-15 20:28:48 -07:00
Liv
08eb6442b5
Add function findEntitiesByType EntityScriptingInterface
...
Updated EntityScriptingInterface.cpp and .h to create a new function for
the Entities API that can be called to filter out entities found by a
specific entity type.
2017-05-15 18:36:36 -07:00
Zach Fox
bc1e97032a
Thanks to Andrew!
2017-05-15 17:39:19 -07:00
samcake
db4387e55d
Trying to mess with the defautl texture for skybox
2017-05-15 17:31:29 -07:00
samcake
8626e1f3d1
Keep fixing the cascading behavior to the zone render item
2017-05-15 17:19:46 -07:00
Dante Ruiz
724f849d88
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-16 00:15:18 +01:00
Dante Ruiz
975b1ab077
moved low velocity filter in the input system
2017-05-16 00:15:06 +01:00
Zach Fox
64ae5119ae
Merge pull request #10462 from zfox23/fixIdentityUpdatedAt
...
Force _identityUpdatedAt to stay above 0, fixing more identity packet bugs
2017-05-15 15:44:26 -07:00
Zach Fox
e492ca9364
Improve the test - thanks Dave!
2017-05-15 14:55:05 -07:00
Zach Fox
a2a24b22a8
Force _identityUpdatedAt to stay above 0
2017-05-15 14:25:47 -07:00
samcake
2df6d0df48
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-15 13:40:56 -07:00
Seth Alves
66a1dbfcfe
Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation
...
cleanup Head::simulate() code
2017-05-15 11:21:43 -07:00
Seth Alves
d7432048a0
Merge pull request #10456 from vladest/market-crash-fix
...
Market crash fix
2017-05-15 10:58:02 -07:00
Anthony J. Thibault
1e276d113c
Added support for weights per target
2017-05-15 09:26:24 -07:00
Anthony J. Thibault
67fbb15faa
WIP: initial implementation of flexCoefficients
2017-05-15 09:26:23 -07:00
Dante Ruiz
c689b9949c
fixed merge conflict
2017-05-15 16:11:28 +01:00
Chris Collins
263e4de951
Merge pull request #10454 from samcake/orange
...
Fixing potential crashes when loading invalid KTX cached textures
2017-05-14 17:41:06 -07:00
ZappoMan
149750fe21
make the octree sparse
2017-05-14 08:36:54 -07:00
ZappoMan
5065c7c5c4
more warning fixes
2017-05-13 10:17:59 -07:00
ZappoMan
da404ce2ce
fix warning
2017-05-13 09:29:32 -07:00
Vladyslav Stelmakhovskyi
49a45f0300
Merge branch 'master' into market-crash-fix
2017-05-13 14:23:26 +02:00
Vladyslav Stelmakhovskyi
20c27fc133
Fix crash on save Map data settings from scripts
2017-05-13 14:20:28 +02:00
Sam Cake
b38be7e561
warning -1
2017-05-12 20:20:03 -07:00
ZappoMan
dcb70aa504
more cleanup
2017-05-12 19:03:08 -07:00
ZappoMan
4af3c760e6
more cleanup
2017-05-12 18:57:33 -07:00
ZappoMan
f1bd06cfa0
cleanup some unneeded class
2017-05-12 18:33:28 -07:00
samcake
c4e8885842
not testing in storage for alignment
2017-05-12 18:27:58 -07:00
samcake
f35b0297fa
Replace the alignment test by a nice function
2017-05-12 18:25:07 -07:00
samcake
d734358290
Adding a comment for debug sake
2017-05-12 18:15:00 -07:00
samcake
5bc8e09865
Fixing the test...
2017-05-12 18:10:48 -07:00
samcake
bdb0414add
Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong
2017-05-12 18:04:22 -07:00
ZappoMan
89b6a79f68
make sure to exit early if box intersection is already larger than best triangle intersection
2017-05-12 17:56:45 -07:00
anshuman64
49d4cf4e68
Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config
...
More stable IK when hips, feet and chest are controlled via external input
2017-05-12 17:22:29 -07:00
ZappoMan
eb3b27849c
only keep one copy of Triangles
2017-05-12 17:07:47 -07:00
Dante Ruiz
655483182c
daving work
2017-05-12 23:38:20 +01:00
Seth Alves
9d4411e3f0
Merge pull request #10417 from sethalves/motor-action
...
misc action/constraint changes
2017-05-12 14:27:51 -07:00
Anthony Thibault
f4b772d747
Merge pull request #10452 from druiz17/bug-irecorder-crash
...
Fixed input recorder crash
2017-05-12 13:46:15 -07:00
Seth Alves
fcc5e12211
redelete these
2017-05-12 13:19:15 -07:00
Seth Alves
f40c7bde71
Merge pull request #9 from AndrewMeadows/motor-action
...
remove unused parameters from Hinge and ConeTwist constraints
2017-05-12 13:14:02 -07:00
Seth Alves
4af0a85aa0
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
2017-05-12 13:03:58 -07:00
Seth Alves
630d95a812
fix constraint import some more
2017-05-12 13:03:51 -07:00
ZappoMan
ea8330e4e3
Merge branch 'master' of https://github.com/highfidelity/hifi into TriangleSetOptimizations
2017-05-12 13:00:14 -07:00
Brad Hefta-Gaub
5fbe1fd647
Merge pull request #10407 from Atlante45/fix/move-avatar-on-restart
...
Don't send avatars to previous lookup on server restart
2017-05-12 12:30:20 -07:00
Brad Hefta-Gaub
a88f72024d
Merge pull request #10243 from birarda/bake-textures
...
Add an internal tool for domain/model/skybox KTX texture baking
2017-05-12 12:26:33 -07:00
Andrew Meadows
10d058af02
remove unused parameters from ObjectConstraintConeTwist
2017-05-12 12:07:34 -07:00
Andrew Meadows
18b1bb8b7f
remove unused parameters from ObjectConstraintHinge
2017-05-12 12:04:08 -07:00
Dante Ruiz
6155d31513
removed debug statment
2017-05-12 19:48:31 +01:00
