Commit graph

75928 commits

Author SHA1 Message Date
raveenajain
f73296182c Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_embedded 2019-01-31 14:19:58 -08:00
Jeff Clinton
1239ca086d
Merge pull request #14831 from danteruiz/the-spot
Case 20942: Goto the spot on first launch (80.0/master)
2019-01-31 14:15:24 -08:00
raveenajain
997660d430 review changes 2019-01-31 13:50:17 -08:00
raveenajain
216e9bd4cb Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_update 2019-01-31 13:47:38 -08:00
raveenajain
ae09aec5d9 embedded model geometry 2019-01-31 13:36:53 -08:00
Thijs Wenker
80f5cbc8ab also ignore picking on the material entity 2019-01-31 22:14:15 +01:00
SamGondelman
ee1552661c fix textures 2019-01-31 12:04:46 -08:00
Dante Ruiz
778ddad9ac to the spot on first launch 2019-01-31 10:52:48 -08:00
Thijs Wenker
15066faaf7 ignore pickRay for zone shape visualizers 2019-01-31 19:45:29 +01:00
luiscuenca
5438bddc84 Fix assertion on shapeInfo when creating multisphere with empty data 2019-01-31 09:43:30 -07:00
SamGondelman
2d0c1184e4 only domain zone entities control flying and ghosting 2019-01-30 18:27:17 -08:00
SamGondelman
5553752d81 fall when flying not allowed 2019-01-30 18:04:44 -08:00
Sam Gateau
196748c4f9 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-01-30 18:04:39 -08:00
Clement
283dabc622 Fix reload mechanic for entity server scripts 2019-01-30 17:29:28 -08:00
Anthony Thibault
2c40b120ca Make Animation Tests Pass Again 2019-01-30 17:26:52 -08:00
SamGondelman
6e61c02d04 fix getEntityProperties 2019-01-30 17:17:39 -08:00
Howard Stearns
75c1bdbf0d
Merge pull request #14812 from SimonWalton-HiFi/avatar-data-packet-overrun
80.0/master: Fix small miscalculation in space requirements for serialized avatar-data
2019-01-30 17:00:12 -08:00
Brad Davis
9714271a2a Migrate shutdown hack applied to QtActivity to InterfaceActivity 2019-01-30 16:23:22 -08:00
Bradley Austin Davis
2db5bbd381 Fix mac frame player 2019-01-30 16:23:22 -08:00
Brad Davis
3866c7568c Update dockerfile 2019-01-30 16:23:22 -08:00
Brad Davis
eb0566b94e Fix signing configs 2019-01-30 16:23:22 -08:00
Brad Davis
67cf08e8ae Quest frame player 2019-01-30 16:23:22 -08:00
Brad Davis
b1eb0b0a46 GPU tweaks 2019-01-30 16:23:21 -08:00
Brad Davis
5d1277e1bb GL helpers cleanup 2019-01-30 16:23:21 -08:00
Brad Davis
fed9e27a66 Expose current android app name to source code 2019-01-30 16:23:21 -08:00
Brad Davis
c3c22aa84c EGL and Oculus depedency macros 2019-01-30 16:23:21 -08:00
Brad Davis
8a1a55189a CMake cleanup and modernization 2019-01-30 16:23:14 -08:00
SamGondelman
6cbc0fad7f fixes 2019-01-30 15:58:15 -08:00
Wayne Chen
03789e01da adding fix for oculus store argument check 2019-01-30 15:53:21 -08:00
Seth Alves
30d9fe705e avoid possible crash 2019-01-30 14:56:50 -08:00
Seth Alves
c6f44234f8 avoid possible crash 2019-01-30 14:56:02 -08:00
Seth Alves
f33e5ba5ae cleanup 2019-01-30 14:47:38 -08:00
Seth Alves
3ab2db96b6 deactivate grab action when grab is released 2019-01-30 14:43:11 -08:00
Seth Alves
0846eb8ec6 attempt to allow position edits in releaseGrab entity-method 2019-01-30 14:43:11 -08:00
John Conklin II
10bb637753
Merge pull request #14810 from SamGondelman/skybox
Case 20833: Fix procedural skybox depth testing
2019-01-30 14:16:36 -08:00
Dante Ruiz
93a91cdba2 webengine fileselector 2019-01-30 13:57:49 -08:00
Simon Walton
08b21109c1 Include the new scale float in min remaining size calculation 2019-01-30 13:55:12 -08:00
SamGondelman
0e35458f9e use precisionPicking in RayPick::getAvatarIntersection 2019-01-30 13:27:47 -08:00
SamGondelman
e32a3ba20d organize new avatar intersection 2019-01-30 13:19:45 -08:00
Brad Davis
a310eec41e Support relative paths in serialized frames 2019-01-30 13:15:23 -08:00
Brad Davis
b8d8079590 Enable transforming a frame to use only relative paths 2019-01-30 13:15:23 -08:00
Brad Davis
2f92e10142 Support using prefering mobile compressed textures on desktop 2019-01-30 13:15:22 -08:00
Brad Davis
ab9a4a55f8 Allow movement in frameplayer app 2019-01-30 13:15:22 -08:00
Brad Davis
2446080a23 Removing dead code 2019-01-30 13:15:22 -08:00
SamGondelman
93e32f1bd5 fix skybox depth testing 2019-01-30 12:25:48 -08:00
Ryan Huffman
9c8e21ec6b
Merge pull request #14806 from thoys/fix/create/mismatchingEntityHostTypeChildren
MS20893 [CreateApp] Ignore children of mismatching entityHostTypes
2019-01-30 09:55:39 -08:00
Sam Gateau
b47ecc9890 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-01-30 09:17:02 -08:00
Jeff Clinton
3b84580e88
Merge pull request #14794 from SamGondelman/colors
Case 20888: Fix color space
2019-01-30 09:09:07 -08:00
Sam Gateau
d418fa282a
Merge pull request #14801 from SamGondelman/transparent
Case 20867: Fix translucent textures not getting reset
2019-01-30 08:54:48 -08:00
Jeff Clinton
0def57f2c8
Merge pull request #14805 from danteruiz/fix-qml-rendering
Case 20902: Give SendAsset.qml a background color
2019-01-30 08:54:03 -08:00