SamGondelman
5018edcfe0
reduce calls to getVisible
2017-12-22 12:59:06 -08:00
Stephen Birarda
d299b9a56c
Merge pull request #12024 from birarda/bug/entity-sequence-skip
...
handle sequence number from reliably sent adds in OctreeEditPacketSender
2017-12-22 12:30:27 -08:00
Howard Stearns
5767f5937e
Merge pull request #12046 from zfox23/commerce_fixEcdsaError1
...
Commerce: Fix some rezzing errors; Fix ECDSA errors
2017-12-22 09:56:22 -08:00
Seth Alves
533aa3d918
code review
2017-12-22 09:07:16 -08:00
Nissim Hadar
e102b8c087
Fixed Ubuntu warning.
2017-12-22 08:35:09 -08:00
Nissim Hadar
2eb74647f0
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2017-12-22 08:05:46 -08:00
Nissim Hadar
502cac2ac7
Keylight inherit/off/on working
2017-12-22 08:05:12 -08:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
Olivier Prat
1d5f65b082
Updated Mesh to support map and forEach operations on colors in RGBA8 format and normals in XYZ10W2 format
2017-12-22 15:16:39 +01:00
Olivier Prat
29485b65e5
Fixed potential crash when getting mesh from voxel item
2017-12-22 14:35:19 +01:00
Olivier Prat
752952507d
Fixed memory leak in ModelScriptingInterface::appendMeshes and wrong normal transformation in ModelScriptingInterface
2017-12-22 14:18:02 +01:00
Nissim Hadar
e974cac177
Keylight inheritance mode works.
2017-12-21 19:19:55 -08:00
Stephen Birarda
95c7f876bf
manually force OwnershipChallengeFix to avoid StaticCertJsonVersionOne
2017-12-21 18:52:01 -08:00
John Conklin II
5a839ebd93
Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1
...
RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors
2017-12-21 17:46:32 -08:00
David Back
f800a6d6fc
scale change
2017-12-21 17:00:27 -08:00
Zach Fox
07a1cf434a
IT'S WORKING!!!
2017-12-21 16:33:47 -08:00
Zach Fox
373ef6c6ce
Progress?
2017-12-21 16:32:20 -08:00
Zach Fox
a2f2c23337
Change three lines of code. Fix one thing. Break another.
2017-12-21 16:32:15 -08:00
Zach Fox
618e5c9032
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-21 15:46:01 -08:00
Stephen Birarda
05b45f2e7e
adjust example and add clarifying comments to PrioritySortUtil
2017-12-21 15:40:08 -08:00
Stephen Birarda
7bf0cc2f63
cleanup other ref returns of shared pointers from sortables
2017-12-21 15:39:14 -08:00
Zach Fox
73eb258e79
IT'S WORKING!!!
2017-12-21 15:17:52 -08:00
SamGondelman
69c1c65eb8
get rid of _model completely
2017-12-21 14:08:21 -08:00
Zach Fox
e963673409
Progress?
2017-12-21 14:08:18 -08:00
Stephen Birarda
31e9f26772
fix use after free of pending message
2017-12-21 11:35:11 -08:00
luiscuenca
d93828f2f0
Fix an improve currentAPI.js
2017-12-21 11:50:02 -07:00
David Back
fd297f1c03
convert negative relative indices to absolute indices
2017-12-21 10:36:41 -08:00
vladest
2bca0939b3
Preliminary proxy model
2017-12-21 19:32:13 +01:00
Brad Davis
26291e0a75
PR feedback
2017-12-21 07:29:29 -08:00
Olivier Prat
72ef716b13
Fixed warnings on Mac and Ubuntu
2017-12-21 09:52:06 +01:00
vladest
d6e1a3ea41
Merge conflicts solved
2017-12-21 09:02:04 +01:00
Olivier Prat
0d34569b1a
Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb
2017-12-21 08:22:35 +01:00
Nissim Hadar
58c6f8e9c4
Radio buttons now work correctly.
2017-12-20 19:17:18 -08:00
Andrew Meadows
5c84c5f845
measure average time of 'present'
2017-12-20 17:41:08 -08:00
Melissa Brown
fddb192af8
Merge pull request #11961 from humbletim/add-midi-control-change
...
forward MIDI_CONTROL_CHANGE events
2017-12-20 17:11:08 -08:00
Zach Fox
b30d3fcc12
Change three lines of code. Fix one thing. Break another.
2017-12-20 15:40:10 -08:00
SamGondelman
2ba3e337db
cleanup
2017-12-20 14:18:01 -08:00
vladest
79f9b54f6a
Store button list in the resources section of fake item instead of C++ space
2017-12-20 22:59:07 +01:00
SamGondelman
7a7b1f7089
fix web entity crash
2017-12-20 13:58:58 -08:00
Nissim Hadar
d4b34b71ad
First version with packet update.
2017-12-20 13:12:07 -08:00
SamGondelman
bd06dc6443
cleaning up modelmeshpartpayload
2017-12-20 11:00:14 -08:00
Zach Fox
297a3df63c
Merge pull request #11815 from zfox23/commerce_QmlWhitelist
...
QML Whitelisting + Commerce Integration
2017-12-19 18:07:14 -08:00
Sam Gondelman
5f5bf94f2a
Merge pull request #12008 from AndrewMeadows/fix-animation-crash
...
fix interface crash for bad QVector index in animation loop
2017-12-19 17:59:47 -08:00
NissimHadar
88ade87c71
Merge pull request #11774 from NissimHadar/hazeOnTransparent
...
Haze on transparent
2017-12-19 17:20:14 -08:00
Stephen Birarda
1a6546999a
track reliably sent adds in sent packet history from OEPS
2017-12-19 16:00:55 -08:00
David Rowe
e6c40f4aae
Window JSDoc
2017-12-20 10:16:09 +13:00
vladest
012f65a87f
Merge branch 'master' into tablet_home_paginate
2017-12-19 21:40:47 +01:00
SamGondelman
9aed825328
Merge remote-tracking branch 'upstream/master' into burp2
2017-12-19 11:39:21 -08:00
Nissim Hadar
2c6868b03e
Pass keylight direction as parameter to the shader.
2017-12-19 11:12:27 -08:00
John Conklin II
09e9707404
Merge pull request #12018 from sethalves/pr-12015-for-rc-61
...
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 10:53:01 -08:00
howard-stearns
16a58ddf5a
Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser
2017-12-19 10:48:34 -08:00
Nissim Hadar
de7edc68d4
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeOnTransparent
2017-12-19 10:47:16 -08:00
Andrew Meadows
bad2c1df76
proper modulus of animation frame
2017-12-19 10:40:17 -08:00
Andrew Meadows
559cb33563
remove incorrect comment
2017-12-19 10:40:17 -08:00
Andrew Meadows
661a63bd0c
fix crash for bad QVector index
2017-12-19 10:40:17 -08:00
Zach Fox
18d5be147c
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-19 09:48:15 -08:00
Howard Stearns
f8cef6631b
Merge pull request #11995 from birarda/bug/fix-connection-reset
...
make udt::Connection live as long as node connection
2017-12-19 09:43:54 -08:00
Seth Alves
63ac426bf2
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 08:13:44 -08:00
Nissim Hadar
73f16b1b2a
Merge branch 'hazeOnTransparent' of https://github.com/NissimHadar/hifi
2017-12-19 07:59:12 -08:00
Brad Hefta-Gaub
04fa4d2999
Merge pull request #12016 from SamGondelman/versionFix
...
Bump protocol version
2017-12-19 07:30:55 -08:00
John Conklin II
d4e44fec56
Merge pull request #12015 from sethalves/fix-av-collision-after-grab
...
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 07:01:37 -08:00
Olivier Prat
bd666406f4
Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends
2017-12-19 14:17:17 +01:00
SamGondelman
90d0e9dc32
bump protocol version
2017-12-18 18:35:15 -08:00
Sam Gateau
8f6929fe53
Merge pull request #12011 from SamGondelman/skybox
...
Fix equirectangular skybox loading
2017-12-19 08:32:22 +07:00
Seth Alves
ca45c4e8da
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-18 17:30:56 -08:00
Thijs Wenker
3a55fcfaf5
Merge pull request #12014 from thoys/feat/list-assignment-types
...
list assignment types in assignment-client help
2017-12-18 16:55:57 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2
...
Commerce: Add Passphrase Auth Status data tracking
2017-12-18 16:26:59 -08:00
Thijs Wenker
1bfb62bd7f
list assignment types in assignment-client help
2017-12-18 15:32:32 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning
...
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
2017-12-18 15:20:23 -08:00
SamGondelman
ee3c47d5ec
fix equirectangular skybox loading
2017-12-18 13:21:12 -08:00
Daniela Fontes
7ca4a21a91
Fix entity property href not being able to reset (empty) once it was set with
...
the correct input for the first time.
2017-12-18 21:00:29 +00:00
SamGondelman
b0ecaa10d4
fix equirectangular skybox loading
2017-12-18 12:38:25 -08:00
Zach Fox
e075cd79fb
Add Passphrase Auth Status data tracking
2017-12-18 11:51:12 -08:00
Brad Davis
9f7b6f543d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-12-18 11:17:07 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
...
Cleanup names of debug stats and trace contexts.
2017-12-18 10:02:42 -08:00
Olivier Prat
24cc19aeaa
Partial fix of colors per vertex of FBX models exported by Blender 2.79
2017-12-18 14:37:50 +01:00
Olivier Prat
116756c976
Parallel optimizations of setBlendedVertices
2017-12-18 11:22:43 +01:00
Sam Gondelman
c39da5094b
weak_ptr _cacheFile
2017-12-17 22:31:09 -08:00
Sam Gondelman
a39eea5a34
cr and cleanup
2017-12-17 22:30:57 -08:00
SamGondelman
9bdcf34c91
clear all _cacheFiles on recycle
2017-12-17 22:30:47 -08:00
SamGondelman
90b97aba59
remove extra recycle
2017-12-17 22:30:31 -08:00
SamGondelman
355ceddcc6
keep _cacheFile alive
2017-12-17 22:30:05 -08:00
Sam Gondelman
6814dfcbfc
weak_ptr _cacheFile
2017-12-17 22:09:20 -08:00
Sam Gondelman
6990dda48d
cr and cleanup
2017-12-17 16:11:55 -08:00
Brad Davis
c6bc6f6ef2
Merge remote-tracking branch 'upstream/master' into android_nov
2017-12-16 16:20:16 -08:00
vladest
62a762b879
Merge branch 'master' into tablet_home_paginate
2017-12-16 20:32:21 +01:00
vladest
cdb9d72387
Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons
2017-12-16 20:27:19 +01:00
Nissim Hadar
dcce5964dd
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeOnTransparent
2017-12-16 00:23:08 -08:00
Nissim Hadar
d69297c02e
Replace evalGlobalLightingAlphaBlended with evalGlobalLightingAlphaBlendedWithHaze in all shaders.
2017-12-16 00:22:26 -08:00
Brad Hefta-Gaub
637e24504c
Merge pull request #11951 from dback2/polymaterialurl
...
Allow space characters in material library name
2017-12-15 19:42:25 -08:00
SamGondelman
3ae52c0e0e
clear all _cacheFiles on recycle
2017-12-15 17:52:48 -08:00
Sam Gondelman
dab4b12a72
Merge pull request #12001 from hyperlogic/bug-fix/anim-skeleton-crash
...
Fix for crash in AnimSkeleton::getNumJoints()
2017-12-15 17:40:42 -08:00
howard-stearns
813a94a79e
function => macro to conditionally take debug arg
2017-12-15 17:12:44 -08:00
howard-stearns
d730b7b87b
consistent goToUser behavior in PAL, and be able to go to flying user.
2017-12-15 17:00:54 -08:00
Anthony J. Thibault
e2df9e29e2
Fix for crash in AnimSkeleton::getNumJoints()
...
When initAnimGraph is called it asynchronously loads the Animation graph in the background.
If the model url is changed, or the Model is deleted in between the initial load and it's completion,
It's possible to access a bad Rig::_animSkeleton pointer.
The fix is to hold onto the _animSkeleton pointer via a weak ref.
2017-12-15 16:46:27 -08:00
SamGondelman
3477aa57a8
remove extra recycle
2017-12-15 16:36:07 -08:00
SamGondelman
52c4aef721
keep _cacheFile alive
2017-12-15 16:23:53 -08:00
Seth Alves
b1503f7c46
Merge pull request #11976 from luiscuenca/fixLinuxAudioDLock
...
Fix getActiveDevice deadlocks on Linux
2017-12-15 15:41:41 -08:00
Brad Hefta-Gaub
5087893097
Merge pull request #11804 from amantley/character_entity_fixes
...
Fixed Entity Animation Property not applying to FBXs
2017-12-15 15:31:11 -08:00
Brad Hefta-Gaub
4ceedf7731
Merge pull request #11986 from kencooke/audio-wavloader-fix
...
Unsupported WAV files should always be logged and not played
2017-12-15 15:24:24 -08:00
Olivier Prat
264f41472d
Added tangents to blendshape for possible break of bump mapping when doing blend shape animations
2017-12-15 12:06:07 +01:00
Olivier Prat
2a325d45e0
Mesh color attributes are now stored as RGBA8
2017-12-15 09:21:36 +01:00
Nissim Hadar
82b94eaacd
Reduced size of parameters in (shader) function call.
2017-12-14 18:50:41 -08:00
Stephen Birarda
a5c951a666
remove tracking of last receiver response from SendQueue
2017-12-14 16:41:20 -08:00
Stephen Birarda
75e56b5daa
make the _lastMessageNumber in Connection default to 0
2017-12-14 16:41:20 -08:00
Stephen Birarda
8a2c31d342
only de-activate the SendQueue when it has nothing to send
2017-12-14 16:41:20 -08:00
Stephen Birarda
cf28fdf188
fix message erase in conn, SendQueue ctor order
2017-12-14 16:41:20 -08:00
Atlante45
34c1c27455
Keep track of message numbers
2017-12-14 16:41:20 -08:00
Atlante45
702d2c34a5
Reset ACK in ctor
2017-12-14 16:41:20 -08:00
Atlante45
b2beeae6b1
Keep connection alive as long as the node is connected
2017-12-14 16:41:20 -08:00
Stephen Birarda
6be7a3662c
Merge pull request #11992 from birarda/bug/fix-connection-reset
...
Make udt::Connection live as long as node connection
2017-12-14 16:34:51 -08:00
Nissim Hadar
76af59e331
Merge branch 'master' into hazeOnTransparent
2017-12-14 16:31:13 -08:00
Nissim Hadar
c352d5fc23
Passed light direction instead of light object into computeHazeColorKeyLightAttenuation.
2017-12-14 16:23:14 -08:00
Nissim Hadar
026b19d770
Set 4th position component from 0.0 to 1.0
2017-12-14 16:17:50 -08:00
Nissim Hadar
05e47ae668
Removed unneeded 'mix'.
...
Defined EPSILON.
2017-12-14 16:14:08 -08:00
Nissim Hadar
d5d4c22a3d
Removed dual calls to getViewInverse().
2017-12-14 15:55:31 -08:00
Nissim Hadar
00a2013b60
Added missing space before {
2017-12-14 15:38:07 -08:00
Stephen Birarda
da56d47307
make the _lastMessageNumber in Connection default to 0
2017-12-14 15:30:51 -08:00
Stephen Birarda
8b5e8f8d08
only de-activate the SendQueue when it has nothing to send
2017-12-14 15:30:25 -08:00
Nissim Hadar
1d4801adf5
Fix for Haze crash (bug 10537)
2017-12-14 13:48:31 -08:00
Zach Fox
504949cd32
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning
2017-12-14 12:08:00 -08:00
Stephen Birarda
7f948586dd
fix message erase in conn, SendQueue ctor order
2017-12-14 12:07:32 -08:00
NissimHadar
df34103895
Merge pull request #11980 from NissimHadar/crashFix10537
...
Protect against use of null HazePointer.
2017-12-14 11:45:49 -08:00
Nissim Hadar
409eade006
Merge branch 'master' into hazeOnTransparent
2017-12-14 11:41:53 -08:00
Ken Cooke
b6a88bbdda
Invalid WAV files should always be logged and not played
2017-12-14 10:20:46 -08:00
Zach Fox
af346f2ced
Protocol change
2017-12-14 10:09:10 -08:00
Olivier Prat
4abc428518
Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb
2017-12-14 17:57:47 +01:00
Olivier Prat
f38e473218
Working packing of normals and tangents in GL_INT_10_10_10_2_REV format. Need to check this with all available 3D data input formats
2017-12-14 17:57:34 +01:00
Olivier Prat
deb0b6b06f
Working interleaved normals and tangents. I'm still wondering why it works with blendshapes though...
2017-12-14 16:12:44 +01:00
Olivier Prat
5ad69afa8a
Added support for INT_2_10_10_10_REV format
2017-12-14 14:18:56 +01:00
Atlante45
ad547f483d
Keep track of message numbers
2017-12-13 19:25:24 -08:00
amantley
5bc113c818
deleted some debug print statements in ModelEntityItemcpp and deleted else statement that was superfluous
2017-12-13 19:07:23 -08:00
Zach Fox
4980c769c0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning
2017-12-13 17:30:19 -08:00
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl
...
allow custom metaverse URL to be used with env var
2017-12-13 17:29:45 -08:00
Atlante45
44190f16c0
Reset ACK in ctor
2017-12-13 16:55:08 -08:00
amantley
2817eadb7a
iMerge remote-tracking branch 'origin/character_entity_fixes' into character_entity_fixes
...
updating branch with remote
2017-12-13 16:48:33 -08:00
amantley
7c29a1b09a
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating branch to master
2017-12-13 16:47:15 -08:00
luiscuenca
483443d218
No mutex
2017-12-13 17:02:36 -07:00
luiscuenca
e581c66b56
added mutex for audio handler
2017-12-13 16:11:46 -07:00
Nissim Hadar
79f0124244
Protect against use of null HazePointer.
2017-12-13 15:02:03 -08:00
Atlante45
3a45907df0
Keep connection alive as long as the node is connected
2017-12-13 14:42:20 -08:00
Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -08:00
Nissim Hadar
b4df115507
Protect against use of null HazePointer.
2017-12-13 12:53:01 -08:00
Zach Fox
d388ca5ac9
Missed a spot. That was the problem the whole time.
2017-12-13 11:22:31 -08:00
luiscuenca
e709561a62
Fix getActiveDevice deadlocks on Linux
2017-12-13 12:14:49 -07:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm
...
Cascaded Shadow Maps and bug fix
2017-12-14 00:32:43 +07:00
Olivier Prat
37deb2674a
Texture coordinates are now encoded in vec2 half float in FBXReader
2017-12-13 17:18:05 +01:00
vladest
99a6b12828
Merge branch 'master' into tablet_home_paginate
2017-12-13 16:02:29 +01:00
Olivier Prat
19e240460d
Slightly optimized matrix operations in LightStage as samcake's remark
2017-12-13 15:30:57 +01:00
Brad Davis
6cff86b0f3
Fix polyvox archive, correct build errors, add additional libraries
2017-12-12 18:29:36 -08:00
Zach Fox
7113a72f2e
Bugfixes
2017-12-12 18:04:20 -08:00
MiladNazeri
8a28d04322
Merge pull request #11885 from ctrlaltdavid/21624
...
Overlays JSDoc
2017-12-12 17:04:46 -08:00
Stephen Birarda
7a81c3e8e7
allow passing of custom URL on env
2017-12-12 16:32:43 -08:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
Zach Fox
bced55801d
ABC ORDER!
2017-12-12 15:52:35 -08:00
Zach Fox
f5df83667f
Add getStaticCertificateJSON() to Entity Scripting Interface
2017-12-12 15:50:04 -08:00
Sam Gondelman
e5a4f077c9
Merge pull request #11964 from SamGondelman/memFix
...
Remove unneeded getDedicatedMemory
2017-12-12 14:43:15 -08:00
Andrew Meadows
87fa919ac8
save files to Documents by default
2017-12-12 14:11:25 -08:00
David Rowe
578c42b4ea
Merge branch 'master' into 21624
2017-12-13 09:41:09 +13:00
MiladNazeri
cf3e9f78c9
Merge pull request #11884 from ctrlaltdavid/21603
...
Quat JSDoc
2017-12-12 12:20:23 -08:00
MiladNazeri
16e16501cd
Merge pull request #11791 from ctrlaltdavid/21602
...
JSDoc updates
2017-12-12 12:18:02 -08:00
Zach Fox
1bd12857ef
Add static certificate JSON versioning; add serverScripts to cert JSON
2017-12-12 12:07:08 -08:00
amantley
079d9639e4
Got rid of the while loop in updateFrameCount in ModelEntityItem_cpp
2017-12-12 09:12:11 -08:00
amantley
29538851b6
Made the changes from the latest code review, except getting rid of the
...
while loop.
2017-12-12 09:06:43 -08:00
SamGondelman
fba06a74aa
fix laser and stylus deadspot
2017-12-11 15:51:22 -08:00
SamGondelman
ae625306ff
remove getDedicatedMemory
2017-12-11 14:54:29 -08:00
Bradley Austin Davis
282ae7b6f9
Small fixes
2017-12-11 14:42:37 -08:00
David Rowe
58fa8b9fbf
Miscellaneous fixes
2017-12-12 10:49:05 +13:00
Bradley Austin Davis
9df9cf7a47
Adding more libs, ifdefs for android incompatible code
2017-12-11 13:18:23 -08:00
Andrew Meadows
406bf7898d
cleanup prof stats and trace context names
2017-12-11 11:31:00 -08:00
Andrew Meadows
2538204b1e
expose physics simulation stats to Test JS API
2017-12-11 11:31:00 -08:00
Andrew Meadows
4540e9e483
add ability to save simulation stats to file
2017-12-11 11:31:00 -08:00
Andrew Meadows
fcff9d7e36
use class hierarchy instead of lambdas
2017-12-11 11:31:00 -08:00
Andrew Meadows
068d04c58d
abstraction of recursion through bullet perf stats
2017-12-11 11:31:00 -08:00
amantley
65bb896450
Merge remote-tracking branch 'origin/master' into character_entity_fixes
2017-12-11 10:55:54 -08:00
Zach Fox
2d786451c2
Add comment
2017-12-11 10:50:24 -08:00
Seth Alves
2cd64ccd2c
merge from upstream
2017-12-11 10:14:30 -08:00
Sam Gateau
0ff91e5926
Merge pull request #11952 from samcake/light
...
Exposing multi highlight and selection feature to js api
2017-12-12 01:09:15 +07:00
Zach Fox
b81cdf49ef
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-11 09:52:32 -08:00
samcake
63fb9b5503
fix float literal syntax
2017-12-11 09:30:31 -08:00
Clément Brisset
833f98b98b
Merge pull request #11920 from Atlante45/feat/reduce-memory-usage
...
Reduce Image library memory usage
2017-12-11 09:29:22 -08:00
samcake
1008175a92
Removing commented code
2017-12-11 09:28:33 -08:00
samcake
b4f7433042
removing .f for a float in shader
2017-12-11 09:26:43 -08:00
vladest
e797f5cda0
Merge branch 'master' into tablet_home_paginate
2017-12-11 17:53:21 +01:00
vladest
cc78fc1f53
Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections
2017-12-11 17:50:16 +01:00
amantley
7e49ce26d7
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating branch to the master
2017-12-11 08:02:33 -08:00
Olivier Prat
b9d49318e7
Fixed bug which culled medium sized objects in shadow maps due to perspective frustum assumed octree selection
2017-12-11 12:19:10 +01:00
Sam Gateau
cc4b266647
Add names to objects of the selection, remove comments in shader and fix one more warning on linux
2017-12-11 00:31:54 -08:00
Olivier Prat
a679dc6705
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
2017-12-11 08:48:48 +01:00
humbletim
4374b4f9a8
forward MIDI_CONTROL_CHANGE events
2017-12-11 00:39:23 -05:00
Sam Gateau
eec4e966a7
Fix the linux build and correct the name of the property Intensity to Opacity
2017-12-10 10:13:49 -08:00
Sam Gateau
429d54d65d
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-10 09:53:22 -08:00
divya
e187852df1
Merge pull request #11941 from huffman/feat/atp-baking-process
...
Move asset server baking to a separate process
2017-12-09 20:48:14 -08:00
Ryan Huffman
e3d00c4aa5
Remove unnecessary logging from PathUtils
2017-12-08 17:48:10 -08:00
Ryan Huffman
982607eedf
Remove unused variable from PathUtils
2017-12-08 15:40:33 -08:00
vladest
3aaf666295
Merge branch 'master' into tablet_home_paginate
2017-12-08 19:59:41 +01:00
Sam Gondelman
352c11d7c4
Merge pull request #11358 from vladest/fix_google_vr_height
...
Momentum aka flickable for WebView
2017-12-08 10:46:52 -08:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
Anthony J. Thibault
42424d32f1
Added exponential smoothing filter
...
Tuned coefficients to maximize glitch and vibration damping while minimizing latency.
2017-12-08 09:29:54 -08:00
samcake
9a4f667059
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-08 08:50:33 -08:00
