Seth Alves
|
34c5d480c4
|
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
|
2017-02-27 06:35:50 -08:00 |
|
Seth Alves
|
1864975c51
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-27 06:35:22 -08:00 |
|
Brad Hefta-Gaub
|
795ff9a531
|
Merge pull request #9760 from birarda/bug/ess-crashes
fix a crash in ESS on ES shutdown
|
2017-02-26 22:29:39 -08:00 |
|
Andrew Meadows
|
6269284b3d
|
Merge pull request #9758 from kunalgosar/passwordmatchingbug
Fix Password Setting Bug
|
2017-02-26 16:37:16 -08:00 |
|
Andrew Meadows
|
dbd1526d56
|
Merge pull request #9757 from kunalgosar/EntityFocusFix
Fix for Web Entity not leaving Focus
|
2017-02-26 16:35:55 -08:00 |
|
Stephen Birarda
|
f213b32167
|
clear the entity viewer before restarting ESS script engine
|
2017-02-26 09:38:51 -08:00 |
|
Philip Rosedale
|
4925b3c47c
|
Merge pull request #9756 from ctrlaltdavid/21122
Point index finger and raise thumb if not touching controller
|
2017-02-25 14:59:48 -08:00 |
|
Seth Alves
|
6a7e04f052
|
Merge pull request #9733 from hyperlogic/bug-fix/script-engine-double-destroy
Make Debug defaultScripts.js option less error prone.
|
2017-02-25 08:57:23 -08:00 |
|
Seth Alves
|
a2f527b28a
|
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
|
2017-02-25 08:44:03 -08:00 |
|
Seth Alves
|
36bcaa8d0f
|
delete tablet overlays when switching domains
|
2017-02-25 08:43:06 -08:00 |
|
kunalgosar
|
a4e0d970bf
|
Fix security section of domain server
|
2017-02-24 19:03:30 -08:00 |
|
kunalgosar
|
d6c1f1c99a
|
Fixed Wed Entity not leaving Focus
|
2017-02-24 18:18:48 -08:00 |
|
David Rowe
|
0cc499b08b
|
Point index fingers and raise thumbs if not touching controls
|
2017-02-25 14:20:23 +13:00 |
|
David Rowe
|
a205d2a00c
|
Use animation for pointing index finger instead of setting joint angles
|
2017-02-25 11:36:06 +13:00 |
|
Seth Alves
|
fcd3c09404
|
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay
|
2017-02-24 14:27:30 -08:00 |
|
Seth Alves
|
1287beb3a2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-24 13:58:03 -08:00 |
|
Chris Collins
|
8e91fc3dde
|
Merge pull request #9748 from ZappoMan/avatarBandwidthBudgetImprovements
fix avatars slightly out of view in large audience from freezing
|
2017-02-24 13:57:56 -08:00 |
|
Seth Alves
|
34755dd75d
|
notify children of an overlay when the parent overlay moves
|
2017-02-24 13:57:49 -08:00 |
|
Seth Alves
|
b2a35f45db
|
when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3
|
2017-02-24 13:04:43 -08:00 |
|
Seth Alves
|
6e9854cad0
|
don't crash if geometry fails to load
|
2017-02-24 13:01:01 -08:00 |
|
Seth Alves
|
eedc5c1647
|
don't allow tablet to get stuck to a hand when passing it back and forth between hands
|
2017-02-24 12:10:52 -08:00 |
|
Seth Alves
|
71ab6a1a84
|
fix a couple of problems related to grabbing tablet while edit.js is active
Conflicts:
scripts/system/controllers/handControllerGrab.js
|
2017-02-24 11:38:42 -08:00 |
|
Seth Alves
|
70060eb464
|
in 2d mode, clicks on tablet don't get used for other things
Conflicts:
scripts/system/libraries/entitySelectionTool.js
|
2017-02-24 11:37:04 -08:00 |
|
Seth Alves
|
73774a6590
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-24 11:34:59 -08:00 |
|
Seth Alves
|
f208f5e2d1
|
fix a couple of problems related to grabbing tablet while edit.js is active
|
2017-02-24 11:34:10 -08:00 |
|
Howard Stearns
|
a9b8045697
|
Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance
Filter pal by view distance
|
2017-02-24 11:10:13 -08:00 |
|
Seth Alves
|
e43c4c17f5
|
in 2d mode, clicks on tablet don't get used for other things
|
2017-02-23 21:27:25 -08:00 |
|
Brad Hefta-Gaub
|
60fd4afc4d
|
don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing
|
2017-02-23 18:52:10 -08:00 |
|
Seth Alves
|
ce717d04e9
|
merge in tablet-as-overlay code
|
2017-02-23 18:40:20 -08:00 |
|
Seth Alves
|
610c20e01a
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-02-23 17:41:38 -08:00 |
|
Seth Alves
|
c725393423
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-edit-js
|
2017-02-23 17:41:30 -08:00 |
|
Seth Alves
|
57ab2ba7ca
|
Merge pull request #7 from fayeli/edit-js-create-tab
Create Tab and Tab Bar QML Styling
|
2017-02-23 17:40:48 -08:00 |
|
Seth Alves
|
d6428ee98c
|
Merge pull request #6 from fayeli/tablet-edit-layout-fix
fix overlapping issue with the delete button
|
2017-02-23 17:40:15 -08:00 |
|
Chris Collins
|
e723385df2
|
Merge pull request #9726 from ZappoMan/avatarBandwidthBudgetImprovements
Avatar bandwidth budget improvements
|
2017-02-23 17:12:18 -08:00 |
|
Faye Li
|
c60360b6e0
|
particle explorer icon
|
2017-02-23 16:34:10 -08:00 |
|
Seth Alves
|
0a2a1b1637
|
include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet
|
2017-02-23 15:25:09 -08:00 |
|
Seth Alves
|
a286c72b3b
|
cleanups
|
2017-02-23 15:12:45 -08:00 |
|
Seth Alves
|
4600d546c0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-23 14:56:06 -08:00 |
|
Seth Alves
|
9c0104a060
|
don't use Entities.getEntityProperties on tablet when it's an overlay
|
2017-02-23 14:55:52 -08:00 |
|
Faye Li
|
80c3c00398
|
switch to properties tab when you create an entity
|
2017-02-23 14:48:06 -08:00 |
|
Faye Li
|
d4ea0c116d
|
asset server button
|
2017-02-23 14:36:39 -08:00 |
|
Brad Hefta-Gaub
|
1b7ec7d61e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
Conflicts:
libraries/avatars/src/AvatarData.cpp
|
2017-02-23 13:50:16 -08:00 |
|
Brad Hefta-Gaub
|
1e91f74ce7
|
clean up some uneedded nullptr checks, make them asserts
|
2017-02-23 13:32:35 -08:00 |
|
Seth Alves
|
2c42309aaa
|
perfer tablet over other overlays for mouse-clicks
|
2017-02-23 13:32:24 -08:00 |
|
Faye Li
|
3850bc35a9
|
icons on new entity buttons
|
2017-02-23 13:31:03 -08:00 |
|
Andrew Meadows
|
ed932fead5
|
Merge pull request #9611 from kunalgosar/AvatarEntityMapMetaObj
Add QMetaObject for AvatarEntityMap
|
2017-02-23 13:27:55 -08:00 |
|
Brad Hefta-Gaub
|
8cb8d686ec
|
more cleanup and some CR feedback fixes
|
2017-02-23 13:09:39 -08:00 |
|
Chris Collins
|
57beeeefb9
|
Merge pull request #9739 from sethalves/stable-to-master-update
Stable -> Master update
|
2017-02-23 13:09:00 -08:00 |
|
Faye Li
|
bd834097d5
|
tab bar styling
|
2017-02-23 12:36:27 -08:00 |
|
Seth Alves
|
c765c8da73
|
pull stable into master
|
2017-02-23 11:57:32 -08:00 |
|