Clément Brisset
d76039387a
Merge pull request #10992 from Atlante45/fix/heap-use-after-free
...
Fix potential data corruption in the FileCache
2017-07-19 10:44:02 -07:00
Atlante45
497fd7f714
Pin File pointer during eject
2017-07-18 13:45:46 -07:00
Atlante45
2d246d2563
Implement shutdown with parent for Mac and Linux
2017-07-14 11:39:32 -07:00
SamGondelman
3a35cd128f
fix dirOffset, expose intersection type to JS
2017-07-13 16:09:21 -07:00
Cain Kilgore
f91a8c0f53
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler
2017-07-13 21:25:39 +01:00
Cain Kilgore
521babb6bd
Avatar Scaler - should be PR Ready.
2017-07-13 19:18:51 +01:00
SamGondelman
916a99c670
added JS/C++ RayPickResult, working on RayPickManager::update
2017-07-12 17:12:25 -07:00
SamGondelman
ea65a04f28
expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing)
2017-07-12 14:20:39 -07:00
SamGondelman
3ac369d782
framework for LaserPointers and abstracted RayPicking on C++ side, including JS API
2017-07-12 14:20:39 -07:00
Cain Kilgore
43782a29c7
Avatar Scaler - WIP
2017-07-12 22:04:58 +01:00
Andrew Meadows
2349057306
Merge pull request #10879 from AndrewMeadows/avoid-null-shape
...
fix crash in ObjectMotionState::handleEasyChanges()
2017-07-07 10:22:05 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
Stephen Birarda
bdcdff3dbc
force _isSet to be set before isSet() called
2017-07-06 12:01:08 -07:00
Andrew Meadows
2299bb7718
supply minimum shape rather than null
2017-07-06 10:37:44 -07:00
David Kelly
1ccf0da7d8
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
...
redo cache switch
2017-07-06 09:53:01 -07:00
David Kelly
4a22fbca1b
redo cache switch
2017-07-05 17:01:31 -07:00
Brad Davis
2409c83d5d
Fix ACClient on Linux
2017-07-05 16:53:42 -07:00
Seth Alves
70a7b302fc
Merge pull request #10860 from jherico/deadlock_guards
...
Don't use blocking connections on the main thread
2017-07-03 09:05:56 -07:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Atlante45
5c731636b1
Sandbox restarts crashed processes
2017-06-29 12:13:52 -07:00
Andrew Meadows
e9edf01a34
Merge pull request #10831 from kencooke/audio-hrtf-optimize
...
More HRTF optimizations
2017-06-28 14:17:00 -07:00
Seth Alves
2f3109e4be
move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it
2017-06-28 11:00:05 -07:00
Ken Cooke
0acbdc7755
CR fix: use predefined PI
2017-06-28 10:18:54 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Howard Stearns
20f713a241
Merge pull request #10803 from davidkelly/dk/cacheSwitch
...
new --cache switch for interface
2017-06-27 12:23:23 -07:00
Ken Cooke
dcdf07191b
Fast acosf() using polynomial approximation
2017-06-27 11:29:44 -07:00
David Kelly
01155ba4e3
this handles redirecting ktx_cache, data8, prepared
2017-06-27 08:47:54 -07:00
samcake
c0e8b6c8bc
clean up
2017-06-23 14:18:56 -07:00
David Kelly
bda50af780
this uses qt's test location for AppData/Local, but leaves Roaming alone
2017-06-23 11:06:48 -07:00
David Kelly
04160f2ca1
switch to change ktx_cache directory (only)
2017-06-23 09:19:41 -07:00
David Kelly
7ef50042ba
remove turd
2017-06-23 08:00:18 -07:00
David Kelly
06d1ac8bf7
Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch
2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785
new --scripts switch overrides default scripts location
2017-06-22 14:09:05 -07:00
Brad Hefta-Gaub
197006e3d3
Merge pull request #10780 from kencooke/audio-hrtf-avx512
...
HRTF optimizations
2017-06-22 13:34:05 -07:00
Ken Cooke
b27b09ebc6
Detect support for AVX512 instructions
2017-06-20 16:09:52 -07:00
Ken Cooke
bbfdb0f7eb
Refactor CPU detection to use common subfunctions
2017-06-20 16:06:05 -07:00
Brad Davis
e3fb42eefd
Fix crash when cache File lifetime exceeds cache lifetime
2017-06-20 14:38:51 -07:00
Brad Davis
ed6620fc51
Merge pull request #10718 from jherico/frame_thread
...
Cleanup and refactoring
2017-06-19 13:31:44 -07:00
Brad Davis
1d4b443113
Prevent cache ejection of textures in use
2017-06-19 09:51:11 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Atlante45
61eb93af35
Fix SharedNodePointer leak
2017-06-14 11:42:25 -07:00
Anthony Thibault
e3c342aa77
Merge pull request #10595 from hyperlogic/feature/spine-spline
...
Spline IK target support
2017-06-08 18:09:55 -07:00
Seth Alves
485df396ef
Merge pull request #10628 from jherico/qt59
...
Fixes for Qt 5.9 compatibility
2017-06-08 16:51:08 -07:00
howard-stearns
fa74daf875
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-06-07 16:43:25 -07:00
Anthony J. Thibault
606c6415ae
Merge branch 'master' into feature/spine-spline
2017-06-07 10:53:46 -07:00
Bradley Austin Davis
b4bbf98fe3
Suppress TBB warnings
2017-06-06 15:02:16 -07:00
Bradley Austin Davis
fc6a278217
Fixing dangling thread issues, consolidating thread management
2017-06-06 15:02:16 -07:00
Clément Brisset
67970182aa
Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors
...
Fix generateBasisVectors() helper
2017-06-05 14:47:18 -07:00
Brad Hefta-Gaub
51e00b9de9
Merge pull request #10614 from samcake/brown
...
Introduce a stencil mask pass in the rendering to optimize HMD
2017-06-05 14:14:11 -07:00
Andrew Meadows
6970576bb8
use helper constants in helper code
2017-06-05 08:54:05 -07:00
Andrew Meadows
205e5d7309
add unit tests and fix final bugs
2017-06-05 08:54:05 -07:00
Andrew Meadows
81764f0f71
fix GLMHelpers::generateBasisVectors()
2017-06-05 08:54:05 -07:00
Howard Stearns
a0ea306aed
cleanup, and include missing allowBackface parameter
2017-06-04 07:55:23 -07:00
Howard Stearns
3d62900daf
When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works.
2017-06-03 16:49:16 -07:00
Anthony J. Thibault
1a8f6b8de0
Readability improvement
2017-06-02 18:16:14 -07:00
Clément Brisset
c636922a5d
Merge pull request #10590 from huffman/fix/running-marker
...
Update server-console to watch interface via pid rather than marker
2017-06-02 15:57:44 -07:00
Anthony J. Thibault
2422c7e1bb
code review feedback
2017-06-02 15:47:51 -07:00
Clément Brisset
5f91d2dcb7
Merge pull request #10569 from ctrlaltdavid/21312
...
Improve positioning of assets when added / imported
2017-06-02 15:45:18 -07:00
Sam Cake
f9aa400b95
Refining the stencil configuration and triggering only in hmd mode
2017-06-02 00:22:38 -07:00
Ryan Huffman
86da91ac8d
Remove the runningMarker timer
2017-06-01 18:19:13 -07:00
Anthony J. Thibault
3710637254
warning fix
2017-06-01 15:17:02 -07:00
Anthony J. Thibault
b9bf6f4c05
whitespace
2017-06-01 13:30:35 -07:00
Anthony J. Thibault
226855b2b9
Bug fixes and cleanup
...
* Bug fix for problem when chest target is enabled but hips target is not.
* centralized the two computeSplineFromTipAndBase functions into one.
* Removed dead code
2017-06-01 13:20:50 -07:00
Brad Davis
a77491ccb1
FileCache refactoring and tests
2017-05-31 13:45:59 -07:00
Anthony J. Thibault
39c23bfe2f
revision of spine spline rotation calculation
2017-05-30 14:25:30 -07:00
Anthony J. Thibault
fc12d7547a
Addition of CubicHermiteSpline helper classes.
2017-05-30 14:25:29 -07:00
David Rowe
8de93d9651
Fix typo noticed in passing
2017-05-30 15:53:58 +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
5c93dbd20d
be more careful about fixing up entities which arrived before their parents
2017-05-19 13:48:29 -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
Atlante45
c2e2682eff
Fix "Reset Settings" window poping up every time
2017-05-19 10:50:23 -07:00
Seth Alves
ec02887ae6
attempt to get imported entities into the correct octree-element
2017-05-18 13:20:44 -07: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
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
Zach Pomerantz
e8ab780899
include details in critical variantMap parsing error
2017-05-17 21:32:13 -04:00
Stephen Birarda
2ac5fbf91d
set wireless scan interval to -1
2017-05-17 15:33:52 -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
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
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
Atlante45
201f81f20a
Don't wait on the sandbox
2017-05-16 14:41:57 -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
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
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
ZappoMan
eb3b27849c
only keep one copy of Triangles
2017-05-12 17:07:47 -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
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
Clément Brisset
1658ced671
Merge pull request #10437 from Atlante45/feat/faster-startup
...
Use baked default skybox
2017-05-12 11:35:51 -07:00
Seth Alves
4aa683363c
back out previous changes, do compressionOptions.setPitchAlignment(4) instead
2017-05-11 16:22:12 -07:00
Atlante45
6378b96b4c
CR
2017-05-11 14:41:02 -07:00
Seth Alves
ac2bc39a27
try, try again
2017-05-11 14:10:03 -07:00
Seth Alves
a26f9c7887
make _size const
2017-05-11 13:36:05 -07:00
Atlante45
e0863aa50f
Only open files for write if necessary
2017-05-11 11:54:52 -07:00
Seth Alves
dfb9fecf17
pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts
2017-05-11 07:11:40 -07:00
Seth Alves
c9868640c1
force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D
2017-05-10 18:14:50 -07:00
ZappoMan
a15c5999b5
first cut at octree storage of Triangle Set
2017-05-10 16:58:51 -07:00
trent
a3545661dc
Merged hifi/master into this PR and resolved merge conflicts.
2017-05-09 15:09:53 -04:00
Andrew Meadows
2835a73c6b
Merge pull request #10071 from AndrewMeadows/walk-up-steps
...
avatar can walk up steps
2017-05-08 18:17:16 -07:00
Andrew Meadows
a31a861e19
fix typo: physcis --> physics
2017-05-05 09:33:50 -07:00
Seth Alves
92966377fb
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:05:57 -07:00
Seth Alves
51cb579773
function to turn nestable-type into a string
2017-05-04 19:05:01 -07:00
Seth Alves
960bab6e4e
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 16:42:57 -07:00
Brad Davis
2d0bbf70ae
Migrate core avatar rendering functionality to library
2017-05-04 14:08:59 -07:00
Seth Alves
69944cc76d
add a way to get a SpatiallyNestable's name without knowing what its type is
2017-05-03 21:32:49 -07:00
trent
557a8fffd7
Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D
2017-05-02 19:56:47 -04:00
Brad Davis
425405f72d
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
...
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Anthony J. Thibault
2120e63e3a
Merge branch 'master' into feature/head-standard-action
2017-04-27 17:51:13 -07:00
Andrew Meadows
75b563d598
restore rendering of avatar receive stats
2017-04-27 13:16:50 -07:00
Andrew Meadows
442080dec7
remove unused RenderArgs::_cameraMode hack
2017-04-27 13:16:50 -07:00
Stephen Birarda
49e7ae6dbc
call image library for texture baking
2017-04-26 18:37:35 -07:00
Stephen Birarda
425385d982
leverage settings to remember paths used before
2017-04-26 18:37:35 -07:00
Ryan Huffman
60ba874e2e
Fix implementation of mutableData in non-File Storage classes
2017-04-26 18:02:23 -07:00
Ryan Huffman
8d03d50d35
Cleanup progressive ktx debugging
2017-04-26 10:48:57 -07:00
Ryan Huffman
20f4d14e07
Add compressed KTX size evaluation
2017-04-26 10:48:23 -07:00
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
Anthony J. Thibault
dc19f37726
input/controller routing thru skeleton model and rig.
2017-04-25 15:04:47 -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
