Commit graph

74887 commits

Author SHA1 Message Date
Jeff Clinton
7143689ddf
Merge pull request #14620 from amantley/hmdSmoothFix
VIVE can now auto-detect hmd and desktop modes
2019-01-02 09:15:32 -08:00
Jeff Clinton
bb27acf934
Merge pull request #14530 from SamGondelman/NOverlays4
Case 20134: Grid Entities
2019-01-02 09:12:34 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
2019-01-02 09:00:56 -08:00
Anthony Thibault
d87bc3e898 Update eye look at interest calculation
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
2018-12-31 13:37:22 -08:00
Anthony Thibault
95c93e59a7 Make the Out of Range Strategy drop down wider
So the "DropAfterDelay" item is not cut off on the Settings > Controlls > Calibration screen.
2018-12-31 09:23:33 -08:00
Adam Smith
833ad936c0
Merge pull request #14630 from jherico/fix/20284_master
Fix for Oculus reset view issue
2018-12-28 16:24:40 -08:00
Adam Smith
52980559b8
Merge pull request #14491 from SamGondelman/v3
Case 20080: v3 + v4 procedurals and misc shader fixes
2018-12-28 15:17:50 -08:00
Ryan Huffman
e7f7f295b0
Merge pull request #14583 from dback2/unityAvatarExporter2
Avatar Exporter - joint rotation offsets and file workflow changes
2018-12-28 15:14:55 -08:00
John Conklin II
4f3dd390b5
Merge pull request #14625 from SamGondelman/deprecateDashed
Case 20392: Deprecated 3D Overlay dashed/isDashed
2018-12-28 10:16:27 -08:00
Adam Smith
0d27cb65ca
Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics
(case 20297) Move graphics preparation from Serializers to runtime preparation step
2018-12-27 15:46:21 -08:00
Brad Hefta-Gaub
440f517b88
Merge pull request #14602 from samcake/punk
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
2018-12-27 15:43:17 -08:00
Ryan Huffman
a79bf783d2 Fix MyAvatar::collisionWithEntity not firing 2018-12-27 15:12:23 -08:00
Ryan Huffman
9c60b09c6b Fix texture MB column not sorting correctly in entity list 2018-12-27 14:50:12 -08:00
unknown
b0ae323d52 better extension check 2018-12-27 13:07:33 -08:00
unknown
87026a85f1 CR changes 2018-12-27 12:56:44 -08:00
unknown
65cc683f80 fix case-sensitivity on fbx 2018-12-26 12:16:51 -08:00
SamGondelman
87947a7165 try to fix grid color issue 2018-12-25 02:17:37 -05:00
SamGondelman
a25c9395b3 glsl initializer lists are 4.2 2018-12-25 00:46:42 -05:00
SamGondelman
8dae2502ee fix overlay picking 2018-12-22 02:21:29 -05:00
SamGondelman
64b461274b remove new API
(cherry picked from commit 5eccaad135)
2018-12-22 01:45:56 -05:00
SamGondelman
43bc184254 different entity flags for domain/avatar
(cherry picked from commit 7054188f21)
2018-12-22 00:55:27 -05:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions
(cherry picked from commit 6aac596698)
2018-12-22 00:55:10 -05:00
David Back
a3206c84f2 remove unneeded logs 2018-12-21 18:00:59 -08:00
David Back
1b98944caa missing newlines 2018-12-21 18:00:59 -08:00
David Back
c16f58bdc7 UX feedback changes 2018-12-21 18:00:58 -08:00
David Back
71cd0976d6 newline 2018-12-21 18:00:57 -08:00
David Back
b139e52fb6 update package 2018-12-21 18:00:56 -08:00
David Back
d63609bedd more file workflow changes including export project popup window, add readme 2018-12-21 18:00:55 -08:00
David Back
58e1df970f remove need for Asset/Resources folder, fix rotations on root 2018-12-21 18:00:55 -08:00
David Back
28b4527632 Avatar Exporter - joint rotation offsets and file workflow changes 2018-12-21 18:00:55 -08:00
Adam Smith
a9f59fae71
Merge pull request #14631 from highfidelity/revert-14547-NOverlays5
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
2018-12-21 10:32:59 -08:00
Adam Smith
3c89d51994
Merge pull request #14626 from luiscuenca/gltfEmbeddedBinCrashFix
Case 20391: Fix crash when importing a glTF model that contains embedded buffers
2018-12-20 16:55:37 -08:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
SamGondelman
835615fbbd separate out v3 and v4 2018-12-20 16:33:13 -08:00
Brad Davis
c985eb3e80 Fix for Oculus reset view issue 2018-12-20 16:07:55 -08:00
SamGondelman
9fc7813e24 Merge remote-tracking branch 'upstream/master' into v3 2018-12-20 16:05:06 -08:00
SamGondelman
bb030660bd Merge remote-tracking branch 'upstream/master' into NOverlays4 2018-12-20 13:26:23 -08:00
sam gateau
26c9d7a94e Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:22:19 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3
Case 20132, Case 16928: First class Image Entities
2018-12-20 21:20:49 +00:00
sam gateau
49df69e609 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-20 13:17:02 -08:00
sam gateau
7e1f75e0f3 Fixing the debug of shadow frustum for real 2018-12-20 13:16:41 -08:00
luiscuenca
52bfaafd91 Fix crash on glTF import when the file contains embedded buffers 2018-12-20 13:25:19 -07:00
SamGondelman
837c261fd5 deprecated dashed/isDashed 2018-12-20 11:28:42 -08:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities
2018-12-20 19:10:22 +00:00
sam gateau
21577ba311 fixing warnings and the debug of shadows 2018-12-20 09:27:15 -08:00
David Kelly
2c647462b1 ACs don't need to call into flagtimeForConnecitonStep 2018-12-20 10:15:44 -07:00
Jeff Clinton
3d4311b7d4
Merge pull request #14613 from zfox23/MS20253_eventBridge
MS20253: Only emit screenChanged once screen has changed
2018-12-20 08:58:53 -08:00
Sam Gateau
8fba8062c3 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-19 20:01:48 -08:00
Sam Gateau
80a55e2ae9 Compiling 2018-12-19 20:01:14 -08:00
sam gateau
253a71a20c updating some code and probably broken in this version 2018-12-19 18:22:01 -08:00