John Conklin II
|
fa1dc78469
|
Merge pull request #13374 from thoys/fix/dynamic-cloneDynamic
[RC69] fix cloneDynamic
|
2018-06-14 12:58:17 -07:00 |
|
John Conklin II
|
d023d6adef
|
Merge pull request #13321 from danteruiz/tablet-imporvments
Tablet improvements
|
2018-06-14 12:38:20 -07:00 |
|
John Conklin II
|
4f561b00da
|
Merge pull request #13003 from alexiamandeville/sittingUpdates
Adding sitting and love to emote app
|
2018-06-14 11:52:47 -07:00 |
|
John Conklin II
|
b43d5287e2
|
Merge pull request #13286 from ElderOrb/spinbox-bugs
Introduce test 'controls gallery' application for controls testing & few spinbox fixes
|
2018-06-14 10:21:17 -07:00 |
|
Thijs Wenker
|
4d3087b98c
|
fix cloneDynamic
|
2018-06-14 19:07:20 +02:00 |
|
Dante Ruiz
|
60e46481b2
|
emissive maps
|
2018-06-13 10:41:02 -07:00 |
|
John Conklin II
|
0ba97fa83b
|
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
Scripted Blendshapes and Procedural Face Movement Flags
|
2018-06-13 10:32:59 -07:00 |
|
Zach Fox
|
ffb9a47be0
|
Merge pull request #13355 from zfox23/MS14314_multipleSnapshots
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-12 15:10:22 -07:00 |
|
Anthony Thibault
|
717093abf7
|
Merge pull request #13171 from luiscuenca/handTouchToDefault
Enable Avatar Hand Touch Script by Default
|
2018-06-12 14:54:26 -07:00 |
|
Zach Fox
|
bf5d6de780
|
Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots
|
2018-06-12 11:19:05 -07:00 |
|
Zach Fox
|
cf9cf45d02
|
Merge pull request #13348 from zfox23/MS14129_buyButtonStuck
Fix MS14129: Prevent Marketplace buttons from getting stuck in hover state
|
2018-06-12 11:02:52 -07:00 |
|
Dante Ruiz
|
f1d11f9566
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-12 10:21:12 -07:00 |
|
Luis Cuenca
|
9126a6f66d
|
hide debug lines
|
2018-06-12 10:12:28 -07:00 |
|
Zach Fox
|
860f9db939
|
Remove logging
|
2018-06-12 09:25:09 -07:00 |
|
Anthony J. Thibault
|
042f902d2e
|
Merge branch 'master' into scriptedBlendshapesFaceFlags
|
2018-06-11 17:13:30 -07:00 |
|
Zach Fox
|
14034f29a1
|
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-11 17:10:09 -07:00 |
|
Sam Gondelman
|
e8ec32c7f8
|
Merge pull request #13340 from SamGondelman/modelTextures
Try to fix ModelOverlay texture loading
|
2018-06-11 16:09:10 -07:00 |
|
Dante Ruiz
|
6685fbbfc4
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 13:56:54 -07:00 |
|
Dante Ruiz
|
f2d6b84e6c
|
fix qa fail issues
|
2018-06-11 13:56:44 -07:00 |
|
John Conklin II
|
9db71fb40d
|
Merge pull request #13322 from dback2/fixEquipMessage
Fix Hifi-Grab-Hand message for equipping
|
2018-06-11 13:16:39 -07:00 |
|
Zach Fox
|
a5ef3fa729
|
Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state
|
2018-06-11 12:00:51 -07:00 |
|
John Conklin II
|
d5b8570ef6
|
Merge pull request #13343 from ctrlaltdavid/21888
Fix tablet attaching to hand while far-grabbing an entity
|
2018-06-11 10:26:37 -07:00 |
|
Howard Stearns
|
5ce122f148
|
Merge pull request #13307 from howard-stearns/infinite-scroll
Infinite scroll
|
2018-06-11 10:03:52 -07:00 |
|
Sam Gondelman
|
9c66ee412a
|
Merge pull request #13325 from Cristo86/patch-1
Use third person camera mode when switching to My View from Top View mode.
|
2018-06-11 09:36:29 -07:00 |
|
Dante Ruiz
|
ba86c9753d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 09:13:14 -07:00 |
|
howard-stearns
|
d2cf042a88
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-09 14:09:42 -07:00 |
|
SamGondelman
|
2dae613612
|
remove conserveResources
|
2018-06-08 17:58:06 -07:00 |
|
Anthony Thibault
|
044d142635
|
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
|
2018-06-08 17:53:55 -07:00 |
|
David Rowe
|
54b96cd602
|
Fix incomplete transition from far-grabbing entity to grabbing tablet
|
2018-06-09 11:32:10 +12:00 |
|
Anthony J. Thibault
|
c3da4e74de
|
Code review feedback
|
2018-06-08 16:22:00 -07:00 |
|
David Rowe
|
dc46c2077d
|
Fix function name
|
2018-06-09 11:01:18 +12:00 |
|
Dante Ruiz
|
5843c24309
|
adding perfectly straight model and adjusting ovelray
|
2018-06-08 13:56:00 -07:00 |
|
Dante Ruiz
|
dfea4a0f7c
|
fixing rotation
|
2018-06-08 11:50:52 -07:00 |
|
amantley
|
913d78841d
|
Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
synching with upstream master
|
2018-06-07 16:20:11 -07:00 |
|
howard-stearns
|
2761688d39
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 16:14:57 -07:00 |
|
amantley
|
836c3da858
|
cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement
|
2018-06-07 15:11:57 -07:00 |
|
druiz17
|
8c83bd29a3
|
making requested changes
|
2018-06-07 14:04:39 -07:00 |
|
Zach Fox
|
93eba5fe5e
|
Merge pull request #13293 from zfox23/MS7224_cubeSnapshots
Fix MS7224: Add dimensions to printed Snapshot entity
|
2018-06-07 12:52:20 -07:00 |
|
Cristian Duarte
|
664884c9a8
|
Use third person camera mode when switching to My View from Radar mode.
This makes it consistent with the default third person camera in My View.
|
2018-06-07 16:41:41 -03:00 |
|
howard-stearns
|
890c97e7cb
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 12:24:27 -07:00 |
|
luiscuenca
|
df32fe60e4
|
using RayPick API
|
2018-06-07 11:44:59 -07:00 |
|
luiscuenca
|
5403db6d51
|
Merge branch 'master' into handTouchToDefault
|
2018-06-07 11:42:26 -07:00 |
|
John Conklin II
|
067fa46355
|
Merge pull request #13265 from wayne-chen/toggleSpaceMode
Re-adding toggleSpaceMode function
|
2018-06-07 11:21:28 -07:00 |
|
John Conklin II
|
389bddb0f4
|
Merge pull request #13255 from ctrlaltdavid/21884
Fix properties not populating particle explorer tab
|
2018-06-07 09:42:45 -07:00 |
|
John Conklin II
|
d39eb250e1
|
Merge pull request #13310 from ElderOrb/FB15569
FB15569 - Debug default scripts no longer on developer menu
|
2018-06-07 09:41:59 -07:00 |
|
John Conklin II
|
66e2bebcbf
|
Merge pull request #13279 from thoys/fix/create-camera
Fix MS13500: create-app camera orbit to not jump around on secondary monitor
|
2018-06-07 09:38:10 -07:00 |
|
David Back
|
8f5de7b16a
|
use messageGrabEntity flag instead
|
2018-06-06 18:05:26 -07:00 |
|
David Back
|
0ee55a09b6
|
fix tabs
|
2018-06-06 17:35:25 -07:00 |
|
David Back
|
048872c79a
|
use messageEquip flag to fix Hifi-Hand-Grab
|
2018-06-06 17:32:52 -07:00 |
|
David Rowe
|
32c21a1397
|
Fix particle property value reverting to old value when switch tabs
|
2018-06-07 12:22:56 +12:00 |
|