Dante Ruiz
410baaf7bc
Merge pull request #11464 from druiz17/controller-dispatacher-bugs
...
fix auto dropping and re-grabbing loop
2017-09-26 16:46:34 -07:00
anshuman64
ca4d5ef807
Merge pull request #11454 from ElderOrb/case7877
...
7877 Unexpected Behavior when pressing Enter on Input Field
2017-09-26 16:26:42 -07:00
Andrew Meadows
dafadf82bb
Merge pull request #11458 from jherico/fix/tablet_latency
...
Fix long tablet lag on first load
2017-09-26 16:18:31 -07:00
Andrew Meadows
a0cfd87674
Merge pull request #11348 from jherico/android_new
...
Working on new android toolchain & sample
2017-09-26 16:00:09 -07:00
Bradley Austin Davis
9d18fd3a46
Merge branch 'master' into android_new
2017-09-26 15:59:01 -07:00
druiz17
5a1242a1ac
fix spelling error
2017-09-26 15:06:31 -07:00
druiz17
76c1fe688c
fix auto dropping
2017-09-26 14:52:01 -07:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Andrew Meadows
909e5e86b1
Merge pull request #11442 from vladest/fix_dde_visibility
...
Fix dde visibility
2017-09-26 14:19:47 -07:00
Seth Alves
a871a6db1d
Merge pull request #11430 from sethalves/fix-parent-grab
...
Fix parent grab
2017-09-26 13:00:16 -07:00
Seth Alves
7397a123c5
Merge pull request #11345 from SamGondelman/textAA
...
Text3D Overlays and Entities fixes and no-AA
2017-09-26 12:26:08 -07:00
Seth Alves
51d5f86989
Merge pull request #11460 from AndrewMeadows/fix-debug-build-20170926
...
remove asserts that break Debug build
2017-09-26 12:22:31 -07:00
Seth Alves
81f74f9297
Merge pull request #11444 from druiz17/module-handcontrollerPointer
...
Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet
2017-09-26 12:21:03 -07:00
Seth Alves
91f5f61ea3
Merge pull request #11456 from druiz17/bugs-handControllerGrab
...
Correctly grab tablet in 3rd person
2017-09-26 12:19:20 -07:00
Seth Alves
913d3c4d12
Merge pull request #11422 from hyperlogic/feature/ant-man2
...
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
Stephen Birarda
608d42cdf7
Merge pull request #11461 from birarda/bug/too-much-logging
...
remove noisy logging added by auto baking
2017-09-26 13:29:42 -05:00
Dante Ruiz
74f9e07f1a
Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu
...
Move Tablet becomes toolbar menu from General to Developer menu
2017-09-26 11:26:42 -07:00
Seth Alves
216888aa03
Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab
2017-09-26 11:08:40 -07:00
Seth Alves
737b583745
avoid unequipping things during a HMD snap-turn
2017-09-26 11:08:33 -07:00
Dante Ruiz
e397d49564
Merge pull request #11159 from vladest/modal_dialogs_async
...
Modal dialogs async
2017-09-26 11:07:42 -07:00
Seth Alves
24e7ad69ed
Merge pull request #10 from druiz17/fix-parent-grab
...
fix cloning equiping
2017-09-26 10:46:11 -07:00
Stephen Birarda
b77ceab661
remove noisy logging added by auto-baking
2017-09-26 10:45:23 -07:00
druiz17
2cc8a55151
fix cloning equiping
2017-09-26 10:37:36 -07:00
Andrew Meadows
ec80846281
Merge pull request #11443 from SamGondelman/sharks
...
Laser Pointer fixes and updates
2017-09-26 10:22:55 -07:00
Seth Alves
afeb98059b
Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab
2017-09-26 10:14:21 -07:00
Sam Gateau
ff1101cc69
Merge pull request #11453 from Menithal/entity-custom-shader-emit-fix
...
Experimental Fix: Entity Shader Lightmap use / emissive
2017-09-26 09:39:33 -07:00
Andrew Meadows
67481287ff
comment out asserts that fail to compile in Debug
2017-09-26 09:29:43 -07:00
Seth Alves
0b60928dd3
fix rollup-to-parent code to only roll up to entity parents
2017-09-25 19:07:40 -07:00
Brad Davis
40c42d35a5
Fix long tablet lag on first load
2017-09-25 17:50:04 -07:00
druiz17
6332a53ee2
able to grab tablet in 3rd person
2017-09-25 16:36:29 -07:00
Seth Alves
5da5b24894
unmangle merge
2017-09-25 15:18:22 -07:00
beholder
5502a639e2
7877 Unexpected Behavior when pressing Enter on Input Field
2017-09-26 01:07:47 +03:00
druiz17
ec40df711d
fix tablet grabbing and eslint changes
2017-09-25 14:31:13 -07:00
Menithal
19a290be70
Fixed Entity Shader emmissive
...
Makes sure that the emissiveAmount information is used correctly for a custom
shader, instead of using specular rgb information to generate the
emissiveness, which was incorrect
2017-09-26 00:12:45 +03:00
Seth Alves
e09d82c8f2
Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab
2017-09-25 12:31:55 -07:00
Sam Gateau
191066a111
Merge pull request #11452 from SamGondelman/pos3D
...
Fix pointer event properties
2017-09-25 11:49:54 -07:00
druiz17
b1b31444f0
fix mouse visiblity
2017-09-25 11:34:18 -07:00
SamGondelman
a73fdf4397
fix pointer event properties
2017-09-25 10:19:42 -07:00
druiz17
dda20c1ef5
fixing merge conflict
2017-09-25 09:45:29 -07:00
Seth Alves
5741782f45
merge from upstream
2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub
030da7d850
Merge pull request #11401 from druiz17/module-scale-entities
...
ScaleEntity Module
2017-09-25 09:10:32 -07:00
Seth Alves
90954a4e4f
Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab
2017-09-25 09:09:58 -07:00
Andrew Meadows
cf0dd6f8c3
Merge pull request #11371 from cain-kilgore/21542
...
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
2017-09-23 22:20:52 -07:00
Brad Hefta-Gaub
bafb59e691
Merge pull request #11436 from SamGondelman/missingModels
...
Fix missing models
2017-09-23 13:56:50 -07:00
Zach Fox
921ebc221e
Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled
...
Enable Inspection Mode for all; change Commerce setting name
2017-09-22 17:52:27 -07:00
Sam Gateau
d68577be7e
Merge pull request #11441 from SamGondelman/glowAlpha
...
Fix alpha on Line3DOverlays with glow
2017-09-22 17:17:23 -07:00
druiz17
b8ee60a394
fix scripting error
2017-09-22 17:13:48 -07:00
SamGondelman
86198606e0
add _modelJustLoaded and updateTransforForSkinnedMesh on creation
2017-09-22 17:12:44 -07:00
druiz17
2c7b8cdb4f
fixing script issues
2017-09-22 16:26:41 -07:00
SamGondelman
0e3f1c5149
add setLaserLength, setLockEndUUID doesn't use defaultRenderStates
2017-09-22 16:11:24 -07:00
