Commit graph

77835 commits

Author SHA1 Message Date
Roxanne Skelly
9888f5feda Copy Pasta 2019-04-05 16:02:09 -07:00
Anthony Thibault
b8b7798ad9
Merge pull request #15296 from luiscuenca/kdopsRotOffsetFix
Add joint rotation offset to the avatar multi-sphere shapes
2019-04-05 15:55:34 -07:00
Anthony Thibault
0e2c5ea3c2
Merge pull request #15291 from luiscuenca/multiSpheresMixFix
Fix avatar multi-sphere bad scaling on some avatars
2019-04-05 15:55:13 -07:00
NissimHadar
53ea50d1f3 Use set_from_env macro. 2019-04-05 15:45:11 -07:00
r3tk0n
e3fdbc3b3c Set bounds of image. 2019-04-05 15:44:34 -07:00
Ryan Huffman
a4919320b3
Merge pull request #15277 from dback2/editHandleContinualTranslateFix
Case 20896: Fix continual edit handle translation when moving
2019-04-05 15:40:57 -07:00
unknown
f2aa155e1e tweak style, add scrolling 2019-04-05 15:35:37 -07:00
unknown
4f4ec064e4 add dynamic multiselect for material targets 2019-04-05 15:35:37 -07:00
Roxanne Skelly
057ee2b01c Case 21890 - Marketplace search doesn't refresh when enter is pressed 2019-04-05 15:20:23 -07:00
danteruiz
475cf4d6f7 fix another fading avatar 2019-04-05 15:10:30 -07:00
Ryan Huffman
9c4b3f017f
Remove min/max on web entity maxFPS
Instead, let the C++ side enforce any limits. If we enforce a hard limit later on, we can get them via `Entities.getPropertyInfo`.
2019-04-05 15:08:48 -07:00
r3tk0n
e03e78cc8c Add href element to image. 2019-04-05 15:04:35 -07:00
NissimHadar
75e1437274 Use optional environment variable for timestamp server URL 2019-04-05 14:55:23 -07:00
Roxanne Skelly
a63171fb94 Case22025 - Show 'create temporary place' button when no places are present
The metaverse urls were hard-coded to be production.  Fix is to pull them
from the domain server, which will pull them from the environment variable.
2019-04-05 14:54:02 -07:00
r3tk0n
84a67641a8 Update images. 2019-04-05 14:39:02 -07:00
NissimHadar
6f5786e017 Added 'metaverse' to dev-build URL. 2019-04-05 12:25:25 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
raveenajain
d1d999dd72 init node order fix 2019-04-05 19:58:26 +01:00
Shannon Romano
fd245b61ab
Merge pull request #15263 from ctrlaltdavid/M21460
AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc
2019-04-05 11:39:58 -07:00
Olivier Prat
1322fef568 Taking into account samuel's remarks 2019-04-05 20:15:58 +02:00
Olivier Prat
08aa133472 Fixed other compilation errors / warnings 2019-04-05 11:32:00 +02:00
Olivier Prat
b66aa4a742 Fixed compilation errors on Mac & Ubuntu 2019-04-05 11:03:41 +02:00
Olivier Prat
89ca7ac415 Fixed compilation errors 2019-04-05 10:22:57 +02:00
Olivier Prat
a45b91c4be Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-05 09:01:03 +02:00
Olivier Prat
361371b2a9 Added flag to enable / disable ambient fresnel LUT 2019-04-05 08:58:06 +02:00
David Rowe
ca2c8caddb Reinstate TextureCache.TextureType JSDoc 2019-04-05 17:53:19 +13:00
David Rowe
28dfac64ba Merge branch 'master' into M21460
# Conflicts:
#	libraries/image/src/image/Image.h
2019-04-05 17:50:46 +13:00
David Rowe
68f76851fd Updates per doc review 2019-04-05 17:10:52 +13:00
Seth Alves
cbc51b75f9 fix asan reported error when returning QString reference to refreshGroupsCache 2019-04-04 19:55:13 -07:00
Clement
5102702910 Warn mixer about stopped injectors 2019-04-04 18:55:35 -07:00
Shannon Romano
8d6a7c1824
Merge pull request #15318 from roxanneskelly/Case22025
Case 22025 - Create temporary placename doesn't appear when no places are listed
2019-04-04 18:40:13 -07:00
Roxanne Skelly
7f5a595ba7
Merge pull request #15326 from roxanneskelly/Case22059
Lambda capture was referencing something on the local stack
2019-04-04 17:21:53 -07:00
Shannon Romano
82a8a79172
Merge pull request #15229 from ingerjm0/api-docs
JSDoc template and branding changes
2019-04-04 16:51:33 -07:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco
Case 21777: Locomotion Project
2019-04-04 16:18:32 -07:00
Roxanne Skelly
029eab73cb Lambda capture was referencing something on the local stack
which may go out of scope when lambda was called.
2019-04-04 16:00:15 -07:00
ingerjm0
3dbb2b1812 Fix build error for template changes 2019-04-04 15:08:39 -07:00
Ryan Huffman
b9c81a3899
Merge pull request #15322 from huffman/fix/interactive-window-shutdown-crash
Case 18299: Fix ScriptEngine not being destroyed on its own thread
2019-04-04 15:00:50 -07:00
Sam Gateau
bda54c71ea
Merge pull request #15324 from AndrewMeadows/avoid-nan-model-scale
Case 22054: flat models can introduce nan into geometry
2019-04-04 14:51:19 -07:00
Wayne Chen
3f85e064b8
initialize transform outside of switch statement 2019-04-04 14:46:06 -07:00
Wayne Chen
a2084259fa
Merge pull request #27 from wayne-chen/locomotionCRFeedback
adding precheck procedure
2019-04-04 13:56:20 -07:00
Wayne Chen
c18b00ebec adding precheck procedure 2019-04-04 13:55:35 -07:00
Wayne Chen
56f0ef80ee
Merge pull request #26 from wayne-chen/locomotionCRFeedback
fixing typo
2019-04-04 13:47:59 -07:00
Wayne Chen
819bf9212c fixing typo 2019-04-04 13:47:13 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil
Case 20060: Grab correct stencil masks from display plugins
2019-04-04 13:36:25 -07:00
Wayne Chen
bcbff6ace4
Merge pull request #25 from wayne-chen/locomotionCRFeedback
more code feedback
2019-04-04 13:30:13 -07:00
Ryan Huffman
cf3a9b1d48 Fix ScriptEngine not being destroyed on its own thread 2019-04-04 13:28:13 -07:00
Wayne Chen
ec4ad02192 more code feedback 2019-04-04 13:26:34 -07:00
NissimHadar
8eb428bc77
Merge pull request #15313 from NissimHadar/22021-specificThresholdsPerGPUVendor-v3.2.0
Case 22021: specific thresholds per GPU vendor v3.2.0
2019-04-04 12:42:26 -07:00
Wayne Chen
2a11738ef6
Merge pull request #24 from wayne-chen/locomotionCRFeedback
code review feedback/formatting issues
2019-04-04 12:05:36 -07:00
Wayne Chen
4f738a5b42 code review feedback/formatting issues 2019-04-04 12:03:48 -07:00