Stephen Birarda
|
eb0f7da517
|
cleanup to snapshot class to reduce passing of variables
|
2014-09-22 16:14:06 -07:00 |
|
Stephen Birarda
|
e5a54116dc
|
correctly return empty string for domain ID if it is null
|
2014-09-22 15:00:07 -07:00 |
|
Stephen Birarda
|
523a4e6ba2
|
allow moving of location from DataWebDialog for locations
|
2014-09-22 11:58:23 -07:00 |
|
Stephen Birarda
|
84df6058cb
|
add domainID to location scripting interface
|
2014-09-22 10:42:14 -07:00 |
|
Stephen Birarda
|
25c86af40f
|
Merge branch 'master' into move-locations
|
2014-09-22 10:22:30 -07:00 |
|
Atlante45
|
36a3372f58
|
Same fix for MyAvatar class
|
2014-09-19 15:47:13 -07:00 |
|
Atlante45
|
c570931f35
|
Fix attachemnt getting into wrong state
If you play a recording containing attachement with different
attachemnts already on, those attachement will sometime get into a wrong
state.
|
2014-09-19 15:43:22 -07:00 |
|
Stephen Birarda
|
e09eef98f2
|
add option to add javascript objects to a DataWebDialog
|
2014-09-18 17:17:33 -07:00 |
|
Philip Rosedale
|
d3cc22b39d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-09-18 14:51:19 -07:00 |
|
Brad Hefta-Gaub
|
a5ea0479c1
|
Merge pull request #3450 from birarda/master
handle hifi urls emitted from DataWebDialog in Application
|
2014-09-18 13:36:37 -07:00 |
|
Stephen Birarda
|
9f3d908d9f
|
fix typo in comment
|
2014-09-18 13:32:01 -07:00 |
|
Brad Hefta-Gaub
|
c48b3ae51e
|
Merge pull request #3451 from birarda/fix-ssl-handshake-race
make sure the OAuthWebViewHandler is ready before the NodeList might need it
|
2014-09-18 13:29:54 -07:00 |
|
Stephen Birarda
|
75ecdd2f68
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-09-18 11:27:33 -07:00 |
|
Philip Rosedale
|
3f9eff2a90
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-09-18 10:48:44 -07:00 |
|
Philip Rosedale
|
8c71ed3f10
|
Improving headMove, added JS call for neckPosition
|
2014-09-18 10:48:36 -07:00 |
|
Stephen Birarda
|
533a60c35e
|
make sure OAuthWebViewHandler is ready before the NodeList is
|
2014-09-18 10:34:17 -07:00 |
|
Stephen Birarda
|
7e7c4bd580
|
handle hifi urls emitted from DataWebDialog
|
2014-09-18 10:09:57 -07:00 |
|
Andrew Meadows
|
2f3eba2896
|
merge upstream/master into andrew/ragdoll
|
2014-09-18 09:55:50 -07:00 |
|
Andrew Meadows
|
1ad08e34c4
|
support for mulitiple frames for scripted motor
|
2014-09-18 09:54:27 -07:00 |
|
Philip Rosedale
|
929e463e40
|
Merge pull request #3447 from birarda/webkit-dialogs
add a DataWebDialog class to display auth'ed pages from data-web
|
2014-09-18 09:48:22 -07:00 |
|
Stephen Birarda
|
a0675162b6
|
hook My Locations to data-web dialog
|
2014-09-18 09:35:33 -07:00 |
|
Stephen Birarda
|
93561d3b21
|
remove the existing user locations dialog
|
2014-09-18 09:27:07 -07:00 |
|
Stephen Birarda
|
bf83e8fe09
|
remove the user locations model
|
2014-09-18 09:23:22 -07:00 |
|
Stephen Birarda
|
d860b8e8db
|
remove test DataWebDialog from Application
|
2014-09-18 09:22:14 -07:00 |
|
Brad Hefta-Gaub
|
945b251f9b
|
Merge pull request #3446 from stojce/20037
Code Review for Job #20037
|
2014-09-18 09:05:29 -07:00 |
|
Stephen Birarda
|
e2c3b626b3
|
add a DataWebDialog for authenticated access to data-web html
|
2014-09-18 09:05:25 -07:00 |
|
Philip Rosedale
|
432622d168
|
merge fix
|
2014-09-18 08:37:14 -07:00 |
|
Philip Rosedale
|
dbcb778ea9
|
Drive mouth with loudness relative to long term average
|
2014-09-18 08:33:41 -07:00 |
|
Brad Hefta-Gaub
|
cfc8cf0d7b
|
Merge pull request #3443 from ey6es/master
Allow blenders to stack up to a point in order to reduce latency with fewer avatars (but still cap work with lots of avatars).
|
2014-09-17 23:30:36 -07:00 |
|
stojce
|
a6a48aafdc
|
Hide name for all avatars, including MyAvatar
|
2014-09-18 07:34:14 +02:00 |
|
stojce
|
9a523a60cf
|
Add option to toggle on/off names above heads
|
2014-09-18 06:59:29 +02:00 |
|
Andrew Meadows
|
b8f49dc6ef
|
fix vertical jitter (for real this time)
|
2014-09-17 21:56:38 -07:00 |
|
Andrzej Kapolka
|
e0a56b4a95
|
Rejiggered the blender handling: allow up to N blenders active at once so
that with small numbers of avatars, the blenders can stack for lower latency.
|
2014-09-17 17:57:08 -07:00 |
|
Andrew Meadows
|
8359e672bb
|
merge upstream/master into andrew/ragdoll
|
2014-09-17 17:56:35 -07:00 |
|
Andrew Meadows
|
cefe8e0268
|
scripted motor params are now Q_PROPERTIES
|
2014-09-17 17:55:10 -07:00 |
|
Andrew Meadows
|
21a17823d4
|
Fix for vertical jitter when walking on floor
|
2014-09-17 16:26:07 -07:00 |
|
Andrzej Kapolka
|
4a2e68fea4
|
Fix for eyes on skeleton (e.g., Mixamo) models.
|
2014-09-17 15:36:22 -07:00 |
|
Brad Hefta-Gaub
|
fd321a5ed1
|
Merge pull request #3439 from birarda/master
upload a snapshot for location on location creation, cleanup interface start errors
|
2014-09-17 14:52:04 -07:00 |
|
Brad Hefta-Gaub
|
cf135c300c
|
Merge pull request #3436 from ey6es/master
Fix for shirts on avatars created with new version of Fuse.
|
2014-09-17 14:51:54 -07:00 |
|
Stephen Birarda
|
48e45265a3
|
only add a directory to the filesystem watcher if not empty
|
2014-09-17 14:43:48 -07:00 |
|
Stephen Birarda
|
abafaffe44
|
fix a missed Model->Entity rename that caused slot error
|
2014-09-17 14:43:48 -07:00 |
|
Stephen Birarda
|
8dddbb9d4b
|
make snapshots uploaded for locations temp files that will be cleared
|
2014-09-17 14:43:48 -07:00 |
|
Stephen Birarda
|
e7b9e2b060
|
have LocationManager upload snapshot after location creation
|
2014-09-17 14:43:48 -07:00 |
|
Stephen Birarda
|
7848c63fae
|
handle name location shortcut explicitly to work around bug
|
2014-09-17 14:43:48 -07:00 |
|
Andrzej Kapolka
|
a3c107545e
|
Allow rendering eye vectors even if there's no head model.
|
2014-09-17 14:35:34 -07:00 |
|
Atlante45
|
3751e05ce3
|
Fixes crash in Model::scaleToFit()
|
2014-09-17 13:37:16 -07:00 |
|
AndrewMeadows
|
42a84b7ff1
|
Merge pull request #3429 from ctrlaltdavid/20021
Code Review for Job #20021
|
2014-09-17 09:19:29 -07:00 |
|
Andrzej Kapolka
|
fbd1efad81
|
Allow specifying material opacity.
|
2014-09-16 17:52:39 -07:00 |
|
Andrew Meadows
|
489871d0d6
|
added MyAvatar.setMotorVelocity() & friends for JS
|
2014-09-16 17:09:32 -07:00 |
|
ZappoMan
|
9cbc53abc3
|
pack position and orientation in silent frames
|
2014-09-16 13:06:46 -07:00 |
|