sam gateau
305ea80a18
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-10-01 08:37:19 -07:00
Sam Gateau
5842416ae6
Exploring the possible packing schemes and trying to debug the tangent
2018-09-30 23:11:36 -07:00
Seth Alves
90d9af35b5
minimize diff
2018-09-30 16:05:08 -07:00
Seth Alves
e30497595c
static_cast can be used here rather than dynamic
2018-09-30 15:49:42 -07:00
Seth Alves
f784b33eed
get asan to not complain about invalid downcast of EntityRenderer UpdateFunctor
2018-09-30 15:25:21 -07:00
Seth Alves
749b02cfb8
get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor
2018-09-30 15:12:49 -07:00
sam gateau
1ff4c54c1c
Packing normal and tangents
2018-09-28 17:49:52 -07:00
John Conklin II
1135228b3b
Merge pull request #14095 from kencooke/audio-hrtf-reset
...
Audio-mixer optimizations
2018-09-28 16:34:38 -07:00
John Conklin II
11492ce8ee
Merge pull request #14045 from sethalves/enterEntity-wait-for-script
...
don't call enterEntity before the entity's script is loaded
2018-09-28 16:07:08 -07:00
Seth Alves
bbe9b5c26f
code review, remove some unneeded automoc includes
2018-09-28 16:04:40 -07:00
Clement
585c278400
streamline mix operation
2018-09-28 15:45:56 -07:00
Ken Cooke
ac6dd57a30
HRTF starts in silent state
2018-09-28 15:00:52 -07:00
Ken Cooke
2dc89f81a5
Add HRTF reset()
2018-09-28 15:00:52 -07:00
Stephen Birarda
88fd42010d
make sure the audio stream stats size is right
2018-09-28 14:54:50 -07:00
Stephen Birarda
dacf343e9a
reduce codec mismatch and starve log spam
2018-09-28 14:54:50 -07:00
Stephen Birarda
7d8b15ed75
move valid position check to packet processing
2018-09-28 14:54:50 -07:00
Stephen Birarda
371de312cc
enumerate a vector of mixable streams for each listener
2018-09-28 14:54:50 -07:00
Stephen Birarda
aed79b3b17
use a vector for ignored node IDs
2018-09-28 14:54:49 -07:00
Seth Alves
cb04894e33
try another way of fixing _spare warning
2018-09-28 14:53:05 -07:00
Seth Alves
b69d0f3997
get interface building and working with clang-7 on ubuntu 18
2018-09-28 13:46:51 -07:00
John Conklin II
5d00aa0bdb
Merge pull request #14009 from sethalves/fix-worn-shape-double-scale
...
fix scaling of worn shape entities
2018-09-28 13:08:46 -07:00
Sam Gateau
faf489855c
Packing the offsets and catching up performances
2018-09-28 02:13:08 -07:00
David Rowe
1c4bde3e84
Fix build warnings
2018-09-28 18:38:38 +12:00
David Rowe
545c2591e3
Merge branch 'master' into M18586
2018-09-28 16:19:44 +12:00
Bradley Austin Davis
3dea4fd10a
Fix some Mac rendering issues
2018-09-27 19:21:50 -07:00
Sam Gateau
97de12fcbc
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
2018-09-27 19:01:55 -07:00
sabrina-shanman
bc861c1368
Make path pointers use scaleWithParent behind the scenes instead of scaleWithAvatar
2018-09-27 17:29:37 -07:00
sam gateau
eb97f0d193
Bringing back packed normal and tangents for static mesh!
2018-09-27 17:27:55 -07:00
sam gateau
215818e313
adjusting page size but still seeing a perf drop
2018-09-27 17:18:43 -07:00
Dante Ruiz
c1c853790b
update soft entities and fix deadlock
2018-09-27 14:53:28 -07:00
sabrina-shanman
74937a1979
Serialize PickRay according to its variables
2018-09-27 14:41:38 -07:00
sabrina-shanman
c3df710396
Use bracket default initialization for PickQuery::_jointState
2018-09-27 14:34:36 -07:00
David Rowe
2456fd0e99
Merge branch 'master' into M17428-f
2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-27 12:05:21 -07:00
sabrina-shanman
3ac9478101
Assign _mathPick in the Pick constructor
2018-09-27 11:30:57 -07:00
sam gateau
85b3b883f9
REmove cruft
2018-09-27 11:11:14 -07:00
Sam Gateau
8923055e91
Exploring the bad peroformances
2018-09-27 00:15:34 -07:00
Ken Cooke
9dc0aa5c8d
HRTF starts in silent state
2018-09-26 18:23:26 -07:00
Ken Cooke
a8f7ff7d8a
Add HRTF reset()
2018-09-26 18:18:20 -07:00
sam gateau
4078be3df5
Better naming and simpler template maybe
2018-09-26 17:58:06 -07:00
sam gateau
34203c67b0
Addressing the merge with master
2018-09-26 15:42:13 -07:00
John Conklin II
b02e2c8123
Merge pull request #14081 from SamGondelman/blendshapes
...
Improve ModelBlender queuing
2018-09-26 15:10:02 -07:00
Ryan Huffman
09b2565e76
Remove UndoStack API
...
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
2018-09-26 14:43:11 -07:00
sam gateau
1e112d3c84
bringing back a bug fix from samuel
2018-09-26 14:15:42 -07:00
sam gateau
b5a47b2e76
Finalizing the renaming from Skinned to Deformed
2018-09-26 14:11:22 -07:00
sam gateau
09dae5aee3
Addressing merge conflict in HighlightEffect.cpp
2018-09-26 13:24:21 -07:00
John Conklin II
c1dc0ff2ec
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only
...
Prevent thread issues with PickResults modified by Pointers
2018-09-26 12:12:58 -07:00
John Conklin II
6c47ba0dc7
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps
...
Use C++ chrono system_clock for timestamps
2018-09-26 11:22:49 -07:00
sabrina-shanman
4011660435
Merge branch 'master' into stt_parenting2
2018-09-26 10:17:45 -07:00
John Conklin II
0de433c7c7
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
...
fix for deadlock in other avatar entity removal from tree
2018-09-26 09:58:26 -07:00
Seth Alves
ff2a47e7e6
fix several uninitialized reads
2018-09-26 09:33:12 -07:00
David Rowe
b98bd741b8
Indent and reword jumping and flying checkbox
2018-09-26 18:14:02 +12:00
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect
...
Toggle going to 404 redirect domain
2018-09-25 20:44:57 -07:00
sam gateau
efa1dd0274
rename the files from skin to deformed
2018-09-25 17:32:04 -07:00
John Conklin II
3d71dfc467
Merge pull request #14072 from SamGondelman/highlight
...
Fix avatar highlighting
2018-09-25 16:13:14 -07:00
Seth Alves
87a67a3f0c
call saveRecordingToAsset callback on correct thread
2018-09-25 15:50:47 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test
...
Working on Vive shutdown issues
2018-09-25 15:41:32 -07:00
Roxanne Skelly
cbb4bff2db
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-25 14:16:43 -07:00
sam gateau
cc0019479a
fixing review comments
2018-09-25 14:07:07 -07:00
sam gateau
e41b8f06e1
Cleaning up the pipeline and checking that it is working for all cases
2018-09-25 13:57:50 -07:00
Thijs Wenker
80beb6c444
addressed CR feedback
2018-09-25 22:43:58 +02:00
Brad Davis
15de0590e8
Cleaning up commented out code
2018-09-25 13:18:49 -07:00
Brad Davis
5adc4c2290
Protect against null pointer usage in sound scripting wrapper
2018-09-25 13:17:49 -07:00
SamGondelman
21cd3948ae
improve blender queuing
2018-09-25 12:07:05 -07:00
sabrina-shanman
8dd36e465b
Merge branch 'master' into crash_ray-pick-dtor_pointer-only
2018-09-25 09:22:30 -07:00
sabrina-shanman
eca31e7a99
Fix instantiating abstract class when creating visual pick result for pointers
2018-09-25 09:20:57 -07:00
Ryan Huffman
af897bdef2
Fix models with 1^3 dimensions never being resized
2018-09-25 09:13:59 -07:00
sam gateau
9f16024616
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-25 08:27:38 -07:00
luiscuenca
80daf35e77
Animation and particles clean up
2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0
API to configure animation and particle effect
2018-09-25 06:03:29 -07:00
David Rowe
af1b4fef5d
Modify layout of rotation mode settings options
2018-09-25 18:03:57 +12:00
Sam Gateau
69734ce21b
Getting better'
2018-09-24 22:34:43 -07:00
sabrina-shanman
5dbebd4aae
Add comment explaining why visualPickResult is a copy
2018-09-24 17:36:24 -07:00
sam gateau
7cf7eaa7c8
Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape
2018-09-24 17:34:42 -07:00
John Conklin II
be23d07621
Merge pull request #14010 from sethalves/thread-safe-settings
...
make settings thread safe
2018-09-24 17:24:50 -07:00
sabrina-shanman
7f189e4d10
Make visualPickResult used by Pointers a private copy
2018-09-24 17:15:56 -07:00
David Rowe
90ef109476
Remove superseded Pointers API functions
2018-09-25 11:11:53 +12:00
Wayne Chen
69d5299362
patching fix for previous commits
2018-09-24 15:22:46 -07:00
Brad Davis
72fc686ec1
Fix timer managmement during shutdown
2018-09-24 14:52:13 -07:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity
...
fix bug that caused localAngularVelocity to get zeroed out
2018-09-24 14:32:57 -07:00
SamGondelman
ad73cb3996
fix avatar highlighting
2018-09-24 14:02:35 -07:00
Wayne Chen
ac5814a1f8
Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect
2018-09-24 13:57:23 -07:00
John Conklin II
a602bff217
Merge pull request #13981 from gcalero/android_settings
...
Android settings (AEC)
2018-09-24 13:55:30 -07:00
Roxanne Skelly
6f4c376d9f
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-24 13:45:24 -07:00
John Conklin II
45b206d748
Merge pull request #14065 from SamGondelman/blendshapeCrash
...
Fix blendshape crash on avatar removal
2018-09-24 12:39:52 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
...
Small Improvements to Anim Stats
2018-09-24 11:56:01 -07:00
luiscuenca
012cd207b3
No data sent during basic transit
2018-09-24 11:39:10 -07:00
Stephen Birarda
b31837168d
fix bad lock, optimize some operations, clarify comment
2018-09-24 11:27:20 -07:00
SamGondelman
d772cdb34a
please
2018-09-24 10:16:35 -07:00
Sam Gateau
4210ce46aa
bringing the tex corrd transform in the Material struct and shaving one ubo
2018-09-23 23:10:56 -07:00
David Rowe
e29b403abc
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/raypick/PointerScriptingInterface.cpp
# interface/src/raypick/PointerScriptingInterface.h
# interface/src/raypick/StylusPointer.h
# libraries/pointers/src/Pointer.h
# scripts/system/controllers/controllerModules/teleport.js
2018-09-24 11:44:28 +12:00
Sam Gateau
b3112f898a
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
2018-09-22 18:04:24 -07:00
luiscuenca
82b14b6e9b
Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport
2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645
lerp myavatar
2018-09-22 05:34:17 -07:00
sam gateau
d8984dafa0
ui allows to enable/disable the deformer componenets
2018-09-21 16:45:21 -07:00
Seth Alves
86e502637e
Make Settings thread safe
2018-09-21 15:46:35 -07:00
Roxanne Skelly
61cbee72af
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-21 12:31:36 -07:00
John Conklin II
428ace17e1
Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall
...
Fixing double loginFailed
2018-09-21 11:36:06 -07:00
Seth Alves
6eb3fa251d
guard against null deref
2018-09-21 10:39:41 -07:00
Seth Alves
f6e57f54b0
don't call enterEntity until script preload has finished
2018-09-21 10:26:55 -07:00
