Stephen Birarda
|
ffd10b79bf
|
refuse to handle positional audio streams with NaN position
|
2018-02-02 11:21:50 -08:00 |
|
Zach Fox
|
f26477b3e1
|
Slight wording change to Optional Message placeholder
|
2018-02-02 11:00:32 -08:00 |
|
Zach Fox
|
2f3448ed1f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
|
2018-02-02 10:59:49 -08:00 |
|
Zach Fox
|
19235b8d94
|
Fix a bug where hover events incorrectly propagate under popups
|
2018-02-02 10:50:35 -08:00 |
|
Elisa Lupin-Jimenez
|
73fde4333e
|
new local reference to image model
|
2018-02-02 10:27:44 -08:00 |
|
Elisa Lupin-Jimenez
|
d7a847930d
|
added image icon
|
2018-02-02 10:27:44 -08:00 |
|
Elisa Lupin-Jimenez
|
f71d9e4d6a
|
snapshot referenced locally, won't work on OS
|
2018-02-02 10:27:44 -08:00 |
|
Elisa Lupin-Jimenez
|
cc4bafb46f
|
image entities shown as images in entity list
|
2018-02-02 10:27:44 -08:00 |
|
Elisa Lupin-Jimenez
|
9f8e2017ce
|
can add image directly from asset server
|
2018-02-02 10:27:44 -08:00 |
|
Elisa Lupin-Jimenez
|
62437dcc22
|
drag and drop works
|
2018-02-02 10:27:44 -08:00 |
|
Elisa Lupin-Jimenez
|
2ff47fa454
|
images auto-add to asset server, started asset browser add link
|
2018-02-02 10:27:42 -08:00 |
|
Elisa Lupin-Jimenez
|
bd7204e6ef
|
image entity now has grabbable and dynamic options
|
2018-02-02 10:27:42 -08:00 |
|
Elisa Lupin-Jimenez
|
d390e20139
|
removed extraneous commenting and image class
|
2018-02-02 10:27:42 -08:00 |
|
Elisa Lupin-Jimenez
|
fe3bc00baa
|
loading and rendering atp and http image files
|
2018-02-02 10:27:42 -08:00 |
|
Elisa Lupin-Jimenez
|
42151b8fd4
|
creating new image entity opens image property options
|
2018-02-02 10:14:27 -08:00 |
|
Elisa Lupin-Jimenez
|
308e481e63
|
switch to image property list not working
|
2018-02-02 10:11:37 -08:00 |
|
Elisa Lupin-Jimenez
|
ceb621a521
|
reverted protocol change for images
|
2018-02-02 10:08:40 -08:00 |
|
Elisa Lupin-Jimenez
|
576d683d3b
|
initial changes to incorporate snap model
|
2018-02-02 10:08:40 -08:00 |
|
Elisa Lupin-Jimenez
|
dc5f29aa58
|
entity item properties hooked up for image
|
2018-02-02 10:08:40 -08:00 |
|
Elisa Lupin-Jimenez
|
ecb53192ad
|
edit properties reflect image members
|
2018-02-02 10:08:40 -08:00 |
|
Elisa Lupin-Jimenez
|
c9c55af661
|
setting up properties page (not complete)
|
2018-02-02 10:08:39 -08:00 |
|
Elisa Lupin-Jimenez
|
6f76650789
|
updated with master
|
2018-02-02 10:08:39 -08:00 |
|
Elisa Lupin-Jimenez
|
3d000d3d01
|
changed packet number
|
2018-02-02 10:08:39 -08:00 |
|
Elisa Lupin-Jimenez
|
72d8f90ec1
|
not sure why entities don't render with these changes
|
2018-02-02 10:08:39 -08:00 |
|
Elisa Lupin-Jimenez
|
fc0e87d5ea
|
more infrastructure links
|
2018-02-02 10:08:39 -08:00 |
|
Elisa Lupin-Jimenez
|
fdca8ab93e
|
added image button to edit.js, working on connecting to cpp
|
2018-02-02 10:08:39 -08:00 |
|
Elisa Lupin-Jimenez
|
3a7290c3ed
|
starting 2d image entity type
|
2018-02-02 10:08:39 -08:00 |
|
Olivier Prat
|
03daba9bac
|
Removed duplicate shader include
|
2018-02-02 18:18:24 +01:00 |
|
Olivier Prat
|
8a011036ef
|
Removed warnings on mac and ubuntu
|
2018-02-02 18:07:35 +01:00 |
|
Seth Alves
|
861497e907
|
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
|
2018-02-02 08:56:18 -08:00 |
|
Seth Alves
|
14d5029f4d
|
only update cauterization of child entities when something relevant changes
|
2018-02-02 08:56:11 -08:00 |
|
Alexander Ivash
|
46bace97cf
|
FB11844 - Disable Preview enabled some time after unchecking the Display >Disable Preview option.
|
2018-02-02 19:08:50 +03:00 |
|
Olivier Prat
|
e9747e9d85
|
Small optimisations in shadow shader
|
2018-02-02 15:06:22 +01:00 |
|
Olivier Prat
|
ac92b3c130
|
Merge branch 'master' of http://github.com/highfidelity/hifi into scribe
|
2018-02-02 14:01:59 +01:00 |
|
Olivier Prat
|
234cb1e3e6
|
Added anti frustum test to remove lower cascade objects from higher shadow cascades
|
2018-02-02 12:15:43 +01:00 |
|
Olivier Prat
|
1f4671ba17
|
Cleaned up orthographic shadow culling functor
|
2018-02-02 11:09:28 +01:00 |
|
Olivier Prat
|
3804917cf4
|
Orthographic octree selection seems to be working
|
2018-02-02 09:40:57 +01:00 |
|
Olivier Prat
|
a44c5c9814
|
Merge branch 'master' of http://github.com/highfidelity/hifi into trnormalmap
|
2018-02-02 08:46:38 +01:00 |
|
David Back
|
55f55cd78b
|
few more updates
|
2018-02-01 17:59:38 -08:00 |
|
David Back
|
db56246cd6
|
more fixes, clean up, updates
|
2018-02-01 17:30:56 -08:00 |
|
David Back
|
c69eff3322
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
|
2018-02-01 17:29:42 -08:00 |
|
Melissa Brown
|
bf5b875382
|
Merge pull request #12241 from 1P-Cusack/FogBugz/Case_4315_okbutton
[Case 4315] Edit menu color picker OK button is hard to use in HMD
|
2018-02-01 16:52:07 -08:00 |
|
John Conklin II
|
cbdbf51ccd
|
Merge pull request #12317 from hyperlogic/feature/remove-ik-hips-offset
Removal of hips offset shifting from AnimInverseKinematics node
|
2018-02-01 15:30:08 -08:00 |
|
Zach Fox
|
dd2b7eb107
|
Send Money Effect & Lightbox
|
2018-02-01 15:17:50 -08:00 |
|
Seth Alves
|
53f536c476
|
Merge pull request #12320 from ctrlaltdavid/21731
Bump avatar mixer packet version
|
2018-02-01 14:28:23 -08:00 |
|
Zach Fox
|
fa69ea0352
|
Small comment addition
|
2018-02-01 13:57:05 -08:00 |
|
Seth Alves
|
45ab2e9654
|
Merge pull request #12319 from hyperlogic/bug-fix/cauterization-on-rigid-bound-mesh
Fix for rigidly bound mesh not being properly cauterized.
|
2018-02-01 13:44:27 -08:00 |
|
Zach Fox
|
d4f9287e3f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign
|
2018-02-01 13:15:38 -08:00 |
|
samcake
|
9867b479fd
|
APplying review feedback
|
2018-02-01 13:12:28 -08:00 |
|
David Rowe
|
f46362906d
|
Bump avatar mixer packet version
|
2018-02-02 10:02:20 +13:00 |
|