Seth Alves
|
d02ef9fb86
|
Merge pull request #9415 from hyperlogic/tablet-ui2
Adjusted tablet spawn position and orientation to be more natural
|
2017-01-18 06:36:18 -08:00 |
|
Seth Alves
|
3fe9505f18
|
Merge pull request #9414 from fayeli/menu-scrolling
Fix tablet menu scrolling issue
|
2017-01-18 06:35:06 -08:00 |
|
Anthony J. Thibault
|
03f8a310fc
|
Fix for exception on script ending
|
2017-01-17 18:17:41 -08:00 |
|
Anthony J. Thibault
|
c6f3eb138a
|
Adjusted tablet spawn position and orientation to be more natural
|
2017-01-17 18:16:40 -08:00 |
|
Faye Li Si Fi
|
d7209ef7f7
|
syntax
|
2017-01-17 16:56:54 -08:00 |
|
Faye Li Si Fi
|
42a96a94b4
|
fix
|
2017-01-17 16:54:40 -08:00 |
|
Faye Li Si Fi
|
126bfba512
|
fix tablet menu scrolling issue
|
2017-01-17 16:40:12 -08:00 |
|
Seth Alves
|
c8382e6853
|
Merge pull request #9412 from fayeli/menu-fix
Fixes for Tablet Menu Issues
|
2017-01-17 14:58:47 -08:00 |
|
Seth Alves
|
016d247fc8
|
Merge pull request #9411 from sethalves/tablet-ui-fix-other-camera-index
Tablet ui fix other camera index
|
2017-01-17 13:34:36 -08:00 |
|
Seth Alves
|
be165b567e
|
remove XXX comments
|
2017-01-17 13:32:58 -08:00 |
|
Seth Alves
|
e76f1c5937
|
if another avatar has something hung from their camera, don't act like their camera is my camera
|
2017-01-17 13:28:13 -08:00 |
|
Seth Alves
|
89d7b8bfc6
|
call releaseEquip when an equipped entity is dropped with a secondary press
|
2017-01-17 13:27:01 -08:00 |
|
Faye Li Si Fi
|
20ac96a7f9
|
fix clicking on checkboxes in menus or on ghosted menu items slides in a blank page
|
2017-01-17 12:29:38 -08:00 |
|
Faye Li Si Fi
|
965f9ab0a7
|
fix tapping menu when already at the top-level menu blanks the tablet
|
2017-01-17 11:58:48 -08:00 |
|
Seth Alves
|
0cc317d13b
|
Merge pull request #9408 from sethalves/tablet-ui-fix-unhook-loop
avoid an unhook loop if two different hands have passed something bac…
|
2017-01-17 10:25:32 -08:00 |
|
Seth Alves
|
5c205f5800
|
avoid an unhook loop if two different hands have passed something back and forth more than once
|
2017-01-17 10:24:30 -08:00 |
|
Seth Alves
|
3d8b504ace
|
Merge pull request #9407 from sethalves/tablet-ui-upstream-merge
Tablet ui upstream merge
|
2017-01-17 10:21:28 -08:00 |
|
Seth Alves
|
1eb7b668bf
|
merge from upstream
|
2017-01-17 09:33:49 -08:00 |
|
Seth Alves
|
6bace4f451
|
merge from upstream
|
2017-01-17 09:29:30 -08:00 |
|
Philip Rosedale
|
b02a5f85ec
|
Merge pull request #9405 from ZappoMan/bugFix
improve comment in domain settings
|
2017-01-16 20:47:43 -08:00 |
|
ZappoMan
|
5e49e8025a
|
improve comment in domain settings
|
2017-01-16 21:06:38 -06:00 |
|
Seth Alves
|
f900629cdb
|
Merge pull request #9390 from sethalves/load-models-in-keyhole
fix physics not starting up when a model is close behind
|
2017-01-16 18:06:23 -08:00 |
|
Chris Collins
|
1df13d6a56
|
Merge pull request #9399 from howard-stearns/hand-controll-grab-update
handControllerGrab update loop change
|
2017-01-16 16:41:02 -08:00 |
|
Chris Collins
|
5f34ad3596
|
Merge pull request #9400 from AndrewMeadows/fix-cauterization-hack
don't render non-skinned meshes on head when in first person
|
2017-01-16 15:47:52 -08:00 |
|
Andrew Meadows
|
fd28457807
|
fix cauterization hack
|
2017-01-16 15:13:28 -08:00 |
|
howard-stearns
|
0a3236dcc9
|
handControllerGrab update loop change
|
2017-01-16 14:54:32 -08:00 |
|
Zach Fox
|
079e5c4296
|
Merge pull request #9397 from zfox23/FB-2814
Fix FB-2814 "Users.requestUsernameFromID() doesn't work for yourself"
|
2017-01-16 12:54:28 -08:00 |
|
Zach Fox
|
e22c1ac30e
|
Fix the bug
|
2017-01-16 11:48:51 -08:00 |
|
David Kelly
|
95aad3140d
|
Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal
Manage audio interval timer in PAL
|
2017-01-16 11:29:05 -08:00 |
|
Stephen Birarda
|
1993e358d6
|
Merge pull request #9318 from birarda/ovr-platform-entitlement
handle OVR Platform entitlement checks
|
2017-01-16 11:16:31 -08:00 |
|
Zach Fox
|
d2c7342a62
|
Merge pull request #9352 from zfox23/PerAvatarVolume
PAL: Per-Avatar Volume Slider; visual tweaks
|
2017-01-16 10:34:31 -08:00 |
|
samcake
|
36ee7758cf
|
Merge pull request #9394 from jherico/fbx_parse_fix
Fix bug in FBX parse changes
|
2017-01-16 10:27:52 -08:00 |
|
Seth Alves
|
c212fc93c9
|
Merge pull request #9395 from sethalves/tablet-ui
more changes to handle camera-relative-controller joints.
|
2017-01-16 10:27:23 -08:00 |
|
Seth Alves
|
23ea65e2b5
|
more changes to handle camera-relative-controller joints.
|
2017-01-16 10:26:16 -08:00 |
|
Brad Davis
|
67ce5040ec
|
Fix bug in FBX parse changes
|
2017-01-16 10:09:47 -08:00 |
|
Seth Alves
|
bd67715cd2
|
don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed
|
2017-01-16 08:54:56 -08:00 |
|
Chris Collins
|
2557c797af
|
Merge pull request #9300 from zzmp/graphics/forward-opaque
Add opaques/skinned to forward rendering path
|
2017-01-16 08:48:18 -08:00 |
|
Seth Alves
|
455c60b7fb
|
Merge pull request #9392 from sethalves/tablet-ui
Tablet ui
|
2017-01-16 07:51:12 -08:00 |
|
Seth Alves
|
b617b3a114
|
put code to delete prim-stylus tip back in
|
2017-01-16 07:50:36 -08:00 |
|
Seth Alves
|
756d96c368
|
fix search ray getting left on. started adding stylus models
|
2017-01-16 07:46:12 -08:00 |
|
Seth Alves
|
e434defc7f
|
Merge pull request #9391 from sethalves/tablet-ui
Tablet ui
|
2017-01-16 06:49:15 -08:00 |
|
Seth Alves
|
c2d6bf10d2
|
hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size
|
2017-01-16 06:47:50 -08:00 |
|
Seth Alves
|
f0248275ec
|
Merge branch 'load-models-in-keyhole' of github.com:sethalves/hifi into tablet-ui
|
2017-01-16 06:47:15 -08:00 |
|
Seth Alves
|
050a7e87d2
|
load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled.
|
2017-01-15 17:04:51 -08:00 |
|
Seth Alves
|
17b1bdba86
|
Merge pull request #9389 from sethalves/tablet-ui
Tablet ui grab changes
|
2017-01-15 11:31:34 -08:00 |
|
Seth Alves
|
4a451e95dc
|
don't call release when off state is entered. don't attempt to unhook stylus as a stray child
|
2017-01-15 11:29:29 -08:00 |
|
Seth Alves
|
3b4f5e3023
|
don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint
|
2017-01-15 11:27:29 -08:00 |
|
Seth Alves
|
7ab3e60f36
|
Merge pull request #9388 from sethalves/tablet-ui-grab-changes
Tablet ui grab changes
|
2017-01-15 10:18:23 -08:00 |
|
Seth Alves
|
b8234ad75c
|
try a different way of keeping track of original parentIDs of grabbed entities
|
2017-01-15 10:16:28 -08:00 |
|
Seth Alves
|
36fdaa6350
|
avoid a little pop when grabbing something with ignore-ik as true
|
2017-01-15 10:10:54 -08:00 |
|