Commit graph

3143 commits

Author SHA1 Message Date
Ryan Huffman
b20fcbfcdb Add a way to write data to a storage object 2017-04-26 10:45:50 -07:00
Ryan Huffman
00cbfa0f70 Add start of progressive ktx-loading 2017-04-26 10:45:50 -07:00
Andrew Meadows
5a458c9923 remove last qApp usage from Avatar class 2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c remove Camera argument from Avatar::render() 2017-04-18 11:52:21 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Andrew Meadows
e64e2614e3 Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter
Kinect hand filter
2017-04-12 14:27:05 -07:00
Al Bernstein
c628b23895 removed whitespace 2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd used thread safe moving average for the quaternions 2017-04-06 16:56:03 -07:00
Al Bernstein
de1fdfacca made requested changes in PR10147 2017-04-06 16:18:40 -07:00
samcake
5629cf425e Cleaning up the files updated 2017-04-05 13:49:07 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Stephen Birarda
c7a28a527a cleanup Agent recording handling, make loadRecording async 2017-04-04 10:56:25 -07:00
David Rowe
405e8cfc9e Fix typo noticed in passing 2017-04-02 12:58:24 +12:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui
Tablet ui
2017-03-28 14:48:02 -07:00
Seth Alves
1cf6945bf2 pass radials argument to AABox::touchesAAEllipsoid as const reference 2017-03-28 11:12:00 -07:00
Seth Alves
9789476a73 handle case where AAEllipsoid is entirely inside the AABox 2017-03-28 10:57:03 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Seth Alves
59da607d07 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-24 15:08:23 -07:00
Seth Alves
8f7f5efade new javascript call: Model.newMesh() 2017-03-24 12:51:00 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay.
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00
Seth Alves
f5680def55 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-23 09:55:41 -07:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Seth Alves
df875ab504 make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches 2017-03-22 16:21:45 -07:00
Triplelexx
b7980569cc change all references of IDENTITY_FRONT to IDENTITY_FORWARD 2017-03-21 22:13:33 +00:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Brad Davis
14c8c3f4db Return existing textures when matching hash for a previously found live texture 2017-03-20 09:39:29 -07:00
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3
CR 21114 -- Implement modules/require support into hifi
2017-03-20 06:22:35 -07:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
humbletim
366c90ef6a add Q_ASSERT to IS_THREADSAFE_INVOCATION 2017-03-16 01:28:50 -04:00
samcake
0399249a03 Expeand the wireframe to the primitive entities and the polyvox 2017-03-15 16:58:31 -07:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
Brad Davis
eab91d061d Merge pull request #9868 from zzmp/ktx/local-not-roaming
Use Local for WIN32 FileCache
2017-03-13 15:52:11 -07:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
Andrew Meadows
546f32431d Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
Various noise gate, scope, and audio stats improvements
2017-03-13 11:52:16 -07:00
Brad Hefta-Gaub
a38965d628 add more audio stats 2017-03-11 09:50:30 -08:00
Brad Davis
399270d243 Still trying to fix OSX build 2017-03-08 09:03:59 -08:00
Bradley Austin Davis
62fcd238ae Fix shared pointer usage in storage abstraction 2017-03-08 09:03:58 -08:00
Brad Davis
e94f803b84 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
Seth Alves
509ce3f2d2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 18:41:36 -08:00
Brad Hefta-Gaub
8ae6f2727d add support for double click messages to overlays and entities 2017-03-07 17:52:55 -08:00
Seth Alves
71c2b4215d Merge pull request #9811 from ZappoMan/triangleSet
Cleanup how Models do ray-picking and determination of point inside of convex hull
2017-03-07 14:12:56 -08:00
humbletim
40ba8185a0 * Update per 21114-part2 changes.
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
2017-03-07 16:36:07 -05:00
humbletim
9b09651337 Move BaseScriptEngine from script-engine to shared. 2017-03-07 16:34:24 -05:00
Ryan Huffman
a744e0d11c Merge pull request #9685 from humbletim/21114-part2
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
2017-03-07 13:25:25 -08:00
Brad Hefta-Gaub
f7e824e47c Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-07 12:18:36 -08:00