Matti Lahtinen
|
e21785d5ec
|
Merge branch 'master' into 21166
|
2017-02-28 16:34:28 +02:00 |
|
Seth Alves
|
60101ac119
|
Merge pull request #9743 from sethalves/tablet-ui-tablet-is-overlay
Tablet ui tablet is overlay
|
2017-02-27 17:14:29 -08:00 |
|
Seth Alves
|
117be16c31
|
pull from upstream
|
2017-02-27 16:48:23 -08:00 |
|
Chris Collins
|
53505d6013
|
Merge pull request #9787 from samcake/flash
Fix the broken normals on Seth's avatar
|
2017-02-27 15:51:36 -08:00 |
|
Chris Collins
|
a8ae693cef
|
Merge pull request #9786 from druiz17/tablet-scaling-fix
Tablet homebutton dimension and position now scales with tablet
|
2017-02-27 15:51:02 -08:00 |
|
samcake
|
f050cc31f2
|
Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar
|
2017-02-27 13:32:24 -08:00 |
|
Menithal
|
9fbde41dc4
|
Styling formating and Rebuild attempt
|
2017-02-27 23:27:48 +02:00 |
|
Dante Ruiz
|
b0b203edf9
|
Merge branch 'master' into tablet-scaling-fix
|
2017-02-27 19:34:58 +00:00 |
|
Dante Ruiz
|
21c15927cf
|
Homebutton dimension and position scales with tablet
|
2017-02-27 19:33:52 +00:00 |
|
Seth Alves
|
df034ea6da
|
remove commented-out code
|
2017-02-27 11:27:59 -08:00 |
|
Seth Alves
|
8110921abf
|
git rid of _mouseToOverlays until I remember why I thought I needed it
|
2017-02-27 11:11:04 -08:00 |
|
Ryan Huffman
|
5b59939195
|
Merge pull request #9602 from huffman/feat/shortbow-entity-server
Add shortbow to marketplace scripts
|
2017-02-27 11:09:52 -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 |
|
Menithal
|
1d8be2aeaa
|
Added missing dynamic
|
2017-02-26 19:17:46 +02:00 |
|
Menithal
|
69949cd6b5
|
Finalized Grab-Clone action
|
2017-02-26 18:49:13 +02: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
|
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 |
|
Ryan Huffman
|
e47b1be9cf
|
Update shortbow spawning to use precise picking to find the ground
|
2017-02-24 14:48:22 -08:00 |
|
Ryan Huffman
|
85099513cd
|
Reduce enemy lifetime to 30s
|
2017-02-24 14:48:01 -08: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
|
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 |
|
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 |
|
Menithal
|
10151c3f5b
|
Added Multi-userdata field updater
|
2017-02-24 08:04:03 +02:00 |
|
Menithal
|
bdf241bafd
|
Merge branch 'master' into grab-clone
|
2017-02-24 05:43:25 +02: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 |
|
Chris Collins
|
e723385df2
|
Merge pull request #9726 from ZappoMan/avatarBandwidthBudgetImprovements
Avatar bandwidth budget improvements
|
2017-02-23 17:12:18 -08:00 |
|
Ryan Huffman
|
efd1a5c600
|
Update parameter name in getPropertiesForEntities
|
2017-02-23 16:38:28 -08:00 |
|
Ryan Huffman
|
0da9f72c42
|
Update spawn position/rotation of bows in shortbow
|
2017-02-23 16:05:12 -08:00 |
|
Ryan Huffman
|
4c310e1048
|
Update shortbow to use spawner entities to specify position/rotation at runtime
|
2017-02-23 16:02:56 -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 |
|
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 |
|