Anthony J. Thibault
31f1d69c43
Merge branch 'master' into feature/grab-script-polish-part-deux
2016-07-14 15:57:41 -07:00
Brad Hefta-Gaub
45aa78702c
Merge pull request #8217 from sethalves/fix-throwing
...
fix throwing
2016-07-14 15:52:41 -07:00
Anthony J. Thibault
6094fb3de3
Remember object attach point offsets in user settings
2016-07-14 15:51:05 -07:00
Brad Davis
8685b23610
When using the hand controller as a mouse, disable the navigation focus state in QML
2016-07-14 12:11:12 -07:00
Anthony J. Thibault
eb5107d9a5
highlight the grabbed hotspot when the drop gesture is detected
2016-07-14 12:07:07 -07:00
Anthony J. Thibault
e62d34136d
Added haptics and hysteresis to drop gesture
2016-07-14 10:53:47 -07:00
Anthony J. Thibault
51cce939b3
removed shake to drop
2016-07-14 10:32:02 -07:00
Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
Anthony J. Thibault
23ea85541c
Animate equip hotspots scale instead of alpha
2016-07-14 10:24:08 -07:00
Anthony J. Thibault
66830a0538
First pass at equip sphere animation
2016-07-13 19:44:51 -07:00
Anthony J. Thibault
f3ef2801b4
Support for model overrides for equip hotspots rendering
...
Bug fix for modelScale on hotspots
2016-07-13 19:13:40 -07:00
Anthony J. Thibault
0ce970408c
Fix for double rendering of equip hotspots
2016-07-13 19:13:40 -07:00
Anthony J. Thibault
848d5a8975
Reduce calls to Entity.getEntityProperties().
...
By using a single EntityProprtiesCache instance instead of one per controller.
2016-07-13 19:13:39 -07:00
samcake
219b41e813
Fix the mini mirror perf issue and improve the debugDeferredLighting script
2016-07-13 17:37:35 -07:00
Stephen Birarda
aa433e7233
handle click event on overlays only when in ignore mode
2016-07-13 16:23:40 -07:00
Stephen Birarda
946c7d4644
only handle trigger events when overlays are shown
2016-07-13 16:21:12 -07:00
Stephen Birarda
61975fe33a
use correct function for peeked overlay
2016-07-13 15:47:52 -07:00
Stephen Birarda
9deb9744c6
handle trigger off in controller mapping
2016-07-13 15:34:20 -07:00
Stephen Birarda
cd1c114807
enable the trigger mapping so it's actually usable
2016-07-13 15:20:31 -07:00
Stephen Birarda
a6f39d5e68
add code from entitySelectionTool to handle hmd overlay pick
2016-07-13 15:06:31 -07:00
Stephen Birarda
0918b55e7e
add ignore to defaultScripts
2016-07-13 15:06:31 -07:00
Stephen Birarda
5fc2afe549
switch to new icon for ignore target
2016-07-13 15:06:31 -07:00
Stephen Birarda
599d9c568a
remove unneeded check from copy-paste
2016-07-13 15:06:31 -07:00
Stephen Birarda
aeabae4faf
handle removal of an overlay for an avatar that is removed
2016-07-13 15:06:31 -07:00
Stephen Birarda
7bd8c45098
add the correct ignore icon, cleanup data structure
2016-07-13 15:06:31 -07:00
Stephen Birarda
22ab3fc7b5
cleanup a couple of comments
2016-07-13 15:06:31 -07:00
Stephen Birarda
154834b0ab
hook up ignoring of user to overlay
2016-07-13 15:06:31 -07:00
Stephen Birarda
3c330d0c48
show simple overlay for script testing
2016-07-13 15:06:31 -07:00
Stephen Birarda
8724f0d0d9
add a stubbed version of the ignore script
2016-07-13 15:06:31 -07:00
samcake
8acc18ae8b
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-13 11:42:07 -07:00
samcake
51594fefa2
more clean up
2016-07-12 18:21:31 -07:00
Brad Hefta-Gaub
b8d79ec263
Merge pull request #8179 from SamGondelman/snapshotFix3
...
Various snapshot improvements
2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
819cab4aab
Merge pull request #8158 from sethalves/raypick-avatars
...
Raypick avatars
2016-07-12 15:27:30 -07:00
samcake
cde17ecaab
Clenaing the rendering and the framebuffer allocations
2016-07-12 14:34:54 -07:00
Seth Alves
1999193907
split the grab script's deactivation on an entity into two parts -- one that happens during release and a delayed part which finishes up. This makes collisions with a thrower's capsule less likely
2016-07-12 11:42:58 -07:00
samcake
5d4b55eeea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-12 09:19:28 -07:00
Seth Alves
367c26a5ee
wait a bit before resetting collides-with-my-avatar
2016-07-11 18:53:47 -07:00
Seth Alves
85cc5f8956
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-11 18:02:18 -07:00
Seth Alves
84c5bef487
back to ignore more recent 3 frames. don't have released entities collide with myAvatar until 0.25 seconds after release
2016-07-11 17:02:11 -07:00
James B. Pollack
dc9c06a159
clean util
2016-07-11 15:14:19 -07:00
James B. Pollack
27f70e9d52
finish merge
2016-07-11 15:13:25 -07:00
Seth Alves
c034879b74
Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing
2016-07-11 11:12:20 -07:00
Anthony J. Thibault
6f6fe5f244
reduced radius of grab sphere
2016-07-08 18:23:33 -07:00
samcake
2fbdb22493
Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward
2016-07-08 18:14:05 -07:00
Seth Alves
5c69e55475
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-08 17:43:52 -07:00
Anthony J. Thibault
bec71e4af4
Went back to transparent spheres for equip points
2016-07-08 17:05:23 -07:00
Seth Alves
051616d7c3
experimenting
2016-07-08 16:16:06 -07:00
James B. Pollack
6249f3ed12
less changes to hand grab
2016-07-08 16:01:17 -07:00
James B. Pollack
ee970c5e07
cleanup
2016-07-08 15:16:26 -07:00
James B. Pollack
4f899d8752
play nice with grab
2016-07-08 15:14:04 -07:00
James B. Pollack
5ca14b528b
remove prints and format
2016-07-08 15:08:44 -07:00
James B. Pollack
3492367c63
cleanup comments etc
2016-07-08 15:03:59 -07:00
James B. Pollack
38e580b211
fix some bugs and also change it to use arrival mode
2016-07-08 14:50:21 -07:00
Anthony J. Thibault
c8d0decab7
Fix for far grab not working until after edit button is pressed
2016-07-08 14:47:13 -07:00
Anthony J. Thibault
7d1f52da70
Added glow effect to search beam
2016-07-08 14:33:22 -07:00
Anthony J. Thibault
9242147394
Merge branch 'master' into feature/grab-script-polish
2016-07-08 13:40:01 -07:00
James B. Pollack
1cda8afa40
simplify code
2016-07-08 13:37:59 -07:00
James B. Pollack
24832df14a
changes
2016-07-08 13:13:32 -07:00
Anthony J. Thibault
1ec3472230
Model overlay dimensions fixes
...
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
2016-07-08 11:36:43 -07:00
samcake
ed67fe4051
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-08 09:04:40 -07:00
Brad Hefta-Gaub
5f71f77445
Merge pull request #8192 from AndrewMeadows/simple-hull-shapes
...
experimental ModelEntityItem collision shape options (no visual debugging)
2016-07-08 08:55:11 -07:00
James B. Pollack
1a46366557
uncomment
2016-07-07 19:23:04 -07:00
James B. Pollack
f8ff0da901
trying to fix interaction with grab script...
2016-07-07 19:22:42 -07:00
Anthony J. Thibault
0d454cd45e
Equip hotspots render when your hand is near them.
2016-07-07 17:28:23 -07:00
James B. Pollack
7fa1dc7053
make thumb and trigger work in any order and on either button released
2016-07-07 16:36:40 -07:00
James B. Pollack
71392bc1b2
change to sphere now that sphere alpha works.
2016-07-07 16:30:30 -07:00
samcake
1eb4acf815
Unifying the lighting pass for scaterring and not
2016-07-07 15:41:00 -07:00
James B. Pollack
5c83db3b28
take care of naughty intervals
2016-07-07 14:37:51 -07:00
James B. Pollack
4a9f6e677c
add new target model
2016-07-07 12:52:24 -07:00
James B. Pollack
be770c8177
make thumb and trigger mode an option
2016-07-07 12:39:11 -07:00
James B. Pollack
93081e73d8
thumb and trigger
2016-07-07 12:12:22 -07:00
James B. Pollack
8212ada4de
introduce delay
2016-07-07 11:42:41 -07:00
Seth Alves
6786a07ac2
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-07 09:53:24 -07:00
Brad Hefta-Gaub
7724065298
Merge pull request #8196 from howard-stearns/loaded-machine
...
an objective test of basic performance on struggling machines
2016-07-07 09:02:31 -07:00
James B. Pollack
54e0c131a5
cleanup and protect against some interval naughtiness
2016-07-06 18:30:50 -07:00
James B. Pollack
5626938fb4
add instant mode
2016-07-06 18:13:42 -07:00
James B. Pollack
1728878982
working smooth arrival
2016-07-06 17:52:18 -07:00
Howard Stearns
74ef82f800
add 'dynamic' property as a load
2016-07-06 16:15:02 -07:00
Anthony J. Thibault
2db8160568
handControllerGrab improvements
...
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
2016-07-06 15:46:14 -07:00
James B. Pollack
5cb585aec3
remove debug prints
2016-07-06 15:25:01 -07:00
James B. Pollack
696169ed37
terminate lines at intersection
2016-07-06 15:19:10 -07:00
James B. Pollack
dc8e21d76c
cleanup stretchy stuff
2016-07-06 15:16:31 -07:00
howard-stearns
110f5e9e2a
Don't compare distance when no intersection.
2016-07-06 15:08:57 -07:00
howard-stearns
9495d93a72
Merge branch 'master' of https://github.com/highfidelity/hifi into basic-hand-controller-edit
2016-07-06 15:06:51 -07:00
James B. Pollack
e993a69519
last commit for stretched beams -- doesnt work at long distances due to lack of precision
2016-07-06 14:06:53 -07:00
Howard Stearns
8ef9f48221
An objective test of basic performance on struggling machines.
2016-07-06 13:42:46 -07:00
James B. Pollack
b2ef491b97
rotate target toward you
2016-07-06 13:20:42 -07:00
James B. Pollack
2d073cc99c
working teleporter in huffmans build
2016-07-06 12:31:03 -07:00
SamGondelman
6a44ea76e5
fixed snapshot preview on windows
2016-07-06 11:57:29 -07:00
Andrew Meadows
76cb80112e
support new shape types in edit.js
2016-07-06 10:51:43 -07:00
James B. Pollack
b0494ec9d5
bug notes
2016-07-05 17:48:30 -07:00
SamGondelman
4eb94f8ccb
added support for snapshot notification in HMD, although 3d image overlays seem to be broken in master
2016-07-05 17:40:33 -07:00
James B. Pollack
26950eaaa6
working second model adjustment with hack but wtf
2016-07-05 17:30:17 -07:00
James B. Pollack
c78dbe26b6
working initial beam, still trying to clear up no intersection beam issues
2016-07-05 17:25:21 -07:00
SamGondelman
04184ee1fb
added snapshot notification in desktop mode
2016-07-05 17:21:57 -07:00
howard-stearns
b8e6572ebf
basic hand-controller editing
2016-07-05 17:00:54 -07:00
James B. Pollack
cbd1f8df88
add stuff for fading in/out and also for a nice stretchy beam
2016-07-05 13:11:14 -07:00
samcake
16c5a085d8
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-05 10:50:04 -07:00
James B. Pollack
056e9e3a72
add teleport models etc
2016-07-05 10:31:47 -07:00
James B. Pollack
ac99ec04d0
Merge remote-tracking branch 'upstream/master' into viveteleporter
2016-07-05 10:28:07 -07:00
Clément Brisset
7c0879d919
Merge pull request #8183 from humbletim/fix-typedarrays
...
fix TypedArray byte ordering and .subarray indexing
2016-07-05 10:00:15 -07:00
James B. Pollack
ff745a345e
remove dupe
2016-07-05 09:44:51 -07:00
James B. Pollack
f4d409f1e1
fix typo
2016-07-05 09:22:19 -07:00
David Rowe
0ad7aa72fb
Prevent users window from being dragged offscreen
2016-07-04 14:34:38 +12:00
Sam Gondelman
34042d51ad
Merge pull request #8180 from ctrlaltdavid/fix-users-border
...
don't show users border when hover mouse if logged out
2016-07-03 03:14:17 -07:00
humbletim
b7874116b9
fix TypedArray byte ordering and .subarray end indexing
2016-07-02 23:36:08 -04:00
Seth Alves
5ab82cd7c8
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-02 15:11:59 -07:00
samcake
2a52f1db7f
Adding the lighting model class to configure accross the jobs the lighting
2016-07-01 18:36:51 -07:00
James B. Pollack
9b822f97c0
end of day
2016-07-01 17:26:52 -07:00
David Rowe
760f4366e1
Don't show users border when hover mouse if logged out
2016-07-02 11:25:04 +12:00
Ryan Downe Karpf
7eb07cba4c
Merge pull request #8171 from jherico/qml_fixes
...
Keyboard focus polish for Vive UI
2016-07-01 16:20:36 -07:00
James B. Pollack
00ce75ef48
more notes
2016-07-01 15:30:21 -07:00
James B. Pollack
9afc4d0c26
cleanup
2016-07-01 15:19:53 -07:00
James B. Pollack
ffbfc89e99
teleportr
2016-07-01 15:19:37 -07:00
samcake
9281b28d43
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-01 13:39:12 -07:00
howard-stearns
71c44f4f93
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-07-01 13:05:32 -07:00
James B. Pollack
4762091aaf
add easy mode
2016-07-01 11:12:20 -07:00
howard-stearns
43c7fd1e27
New art.
2016-07-01 10:34:13 -07:00
howard-stearns
804a187a7b
Mute changes.
2016-07-01 10:17:17 -07:00
Ryan Downe Karpf
873b57219a
Merge pull request #8167 from hyperlogic/feature/equip-hotspots
...
equip-hotspots feature
2016-07-01 09:55:49 -07:00
James B. Pollack
b2e407a8e1
fix vive bug
2016-07-01 00:48:29 -07:00
samcake
9a604d0ede
Bringing Beckmann specular to the lighting
2016-06-30 19:03:24 -07:00
James B. Pollack
104ee63a77
notes
2016-06-30 17:05:16 -07:00
howard-stearns
125f6d8b63
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-06-30 16:49:19 -07:00
howard-stearns
f03f5f3e68
new icons
2016-06-30 16:47:10 -07:00
howard-stearns
ff55644fe8
stateful hud toolbar buttons
2016-06-30 16:24:11 -07:00
James B. Pollack
82e074de0f
working teleporter
2016-06-30 16:05:44 -07:00
Anthony J. Thibault
d8e5e3cbe4
equip bug fix
...
you should not be able to equip an object that is already equipped, with your other hand.
2016-06-30 16:00:18 -07:00
Brad Davis
14784a6088
Remove default focus on text fields
2016-06-30 15:22:13 -07:00
Brad Davis
dfb6cb1aa3
Updating entity list
2016-06-30 14:25:36 -07:00
Anthony J. Thibault
82b1cba81d
equip improvements
...
Allow the user to equip an object while near or far grabbing it from the other hand.
2016-06-30 13:58:44 -07:00
Howard Stearns
5556bbb0a3
Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered
2016-06-30 11:25:44 -07:00
Brad Hefta-Gaub
7dd53d7757
Merge pull request #8149 from howard-stearns/limit-hand-controller-actions-to-recommended-area
...
limit hand controller actions to recommended area
2016-06-30 11:06:32 -07:00
samcake
ab21a5a5d5
FIxing the bad brdf and adding better debug tool and better Pipeline architecture
2016-06-29 18:59:06 -07:00
James B. Pollack
4b4e38a57c
end of day
2016-06-29 18:28:39 -07:00
Anthony J. Thibault
6072487c9c
Equip-points attachments work
...
Also made handControllerGrab.js eslint clean.
2016-06-29 17:28:53 -07:00
James B. Pollack
fd062d09dc
initial notes and research
2016-06-29 15:59:51 -07:00
Anthony J. Thibault
43d4dba4c0
iterate over hotspots not entities.
...
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473
WIP, equip-points work but they don't use the proper attach point.
2016-06-29 13:53:06 -07:00
Anthony J. Thibault
b042210637
Addition of equipHotspots
2016-06-29 13:53:06 -07:00
samcake
b37df393e2
Merging with the new GL45Backend
2016-06-29 10:40:28 -07:00
Howard Stearns
b649b30777
Reduce margin.
2016-06-29 08:20:47 -07:00
Seth Alves
52d017ac74
undo previous change
2016-06-28 19:22:19 -07:00
Howard Stearns
b551bc3c1a
Use the whole area, less a margin.
2016-06-28 18:01:09 -07:00
Howard Stearns
d650c50a5b
Use normal Script.update (60hz) instead of a timer (@20hz).
2016-06-28 17:44:30 -07:00
Seth Alves
224008afd6
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-06-28 16:56:27 -07:00
Seth Alves
b782ae667c
when one hand adjusts something equippd in the other, print out the new local position and rotation in case a content-creator wants to update userData
2016-06-28 16:36:37 -07:00
Seth Alves
630d5cfc82
make trigger more sensitive, print out position and rotation when releasing something
2016-06-28 15:47:17 -07:00
samcake
d128af48db
Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL
2016-06-28 13:47:55 -07:00
howard-stearns
c492d125e0
limit hand controller actions to recommended area
2016-06-28 13:19:03 -07:00
howard-stearns
799686f29d
Only update the (invisible) cursor position from hand controllers when the
...
trigger is partially squeezed.
2016-06-28 11:36:08 -07:00
Brad Hefta-Gaub
3fca0d655c
Merge pull request #8145 from ctrlaltdavid/20978
...
reduce users window flicker when restart script
2016-06-28 10:03:46 -07:00
samcake
197d49fc03
introducing the depth aware blur
2016-06-27 17:04:37 -07:00
David Rowe
79cfd2e9dc
Reduce users window flicker when restart script
2016-06-28 11:40:49 +12:00
Brad Hefta-Gaub
1af455b8b9
Merge pull request #8135 from SamGondelman/fixEditLockHMD
...
Prevent entering independent camera mode through edit.js in HMD mode
2016-06-27 15:50:25 -07:00
Brad Hefta-Gaub
cecd871c66
Merge pull request #8139 from ctrlaltdavid/20978
...
fix users.js display and operation
2016-06-27 12:56:10 -07:00
samcake
938bc77b1f
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-27 10:13:00 -07:00
David Rowe
dc07368dc9
Hide users list when logged out
2016-06-25 14:23:35 +12:00
David Rowe
0b6797acc3
Fix "show me" and "visible to" in users window not being remembered
2016-06-25 13:48:43 +12:00
Howard Stearns
de7738e644
Merge pull request #8134 from highfidelity/vive-ui
...
Vive UI bug fixes
2016-06-24 18:39:06 -07:00
David Rowe
8b0f59c9cf
Fix users window minimized state not being remembered
2016-06-25 13:12:16 +12:00
samcake
a619a142ed
Friday night build, working on getting the LUT generated on the GPU
2016-06-24 17:48:40 -07:00
David Rowe
1c1d81ae25
Fix missing users.js menu item
2016-06-25 12:18:03 +12:00
David Rowe
8a5369fcb1
Undo hide users.js when logged out
2016-06-25 12:03:36 +12:00
SamGondelman
d5feac94f4
coding standard fun
2016-06-24 16:23:15 -07:00
SamGondelman
5e69af83c6
can't enter independent mode through edit.js in HMD mode
2016-06-24 16:23:15 -07:00
Sam Gondelman
3c809ef40c
Merge pull request #8123 from AlexanderOtavka/first-person-hmd
...
Automatically enter first person when in HMD mode
2016-06-24 15:58:38 -07:00
Brad Hefta-Gaub
2e8f6c2cc6
Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject
...
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
2016-06-24 14:08:29 -07:00
Anthony J. Thibault
41fcfb45ca
Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements
2016-06-24 13:28:00 -07:00
howard-stearns
6a1dd235c9
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-24 12:49:54 -07:00
Anthony J. Thibault
8bf72f28da
Fix for grab script search ray length
2016-06-24 12:06:02 -07:00
Zander Otavka
0c56af7ae8
Add default script to enter first person for HMD
2016-06-24 11:57:50 -07:00
samcake
ec68eba3cb
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-24 09:37:52 -07:00
samcake
884b9211c6
Curvature is looking correct now without artefact, moving on to the lighting
2016-06-23 17:13:48 -07:00
Anthony J. Thibault
7bd553c09c
near grab logic to uses sphere vs entity box
...
instead of sphere vs sphere. Adjusted debug drawing accordingly.
2016-06-23 17:03:15 -07:00
howard-stearns
f8391f0062
fix reticle bugs
2016-06-23 16:51:15 -07:00
Anthony J. Thibault
eabb8d08c0
Merge branch 'vive-ui' into feature/equip-hotspots
2016-06-23 15:42:55 -07:00
Anthony J. Thibault
fc42a3aef5
Grab script hotspot work
...
* Updated grab/equip logic to use sphere vs sphere tests, instead of sphere vs entity bounding box.
* Added debug flag for visualizing grab spheres.
* hotspot overlays are now updated as the objects they are attached to move.
* You can now use the search beam to near grab large objects, as well as the sphere sphere test.
* Optimized EntityPropertyCache to make a single call to Entities.getEntityProperties instead of three.
* Moved grab script options from the "Developer > Hands" menu to the "Developer > Grab Script" menu.
2016-06-23 15:36:47 -07:00
Brad Hefta-Gaub
da74114b32
Merge pull request #8070 from AndrewMeadows/triangle-soup-4
...
support btBvhTriangleMeshShape for static mesh entities
2016-06-23 12:17:32 -07:00
Seth Alves
03b55e6a64
Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject
2016-06-23 10:33:31 -07:00
samcake
3ec14fd746
MErging and still trying to understand the curvature isssue
2016-06-22 18:06:55 -07:00
howard-stearns
581d87d653
feedback re magic numbers and variable name.
2016-06-22 16:40:10 -07:00
howard-stearns
67f76db7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 15:58:53 -07:00
Ryan Huffman
847685d224
Add tracking of away.js
2016-06-22 09:06:59 -07:00
samcake
90e5697940
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-22 09:06:47 -07:00
Ryan Huffman
1be30ccce9
Fix enabled_edit firing on disable
2016-06-22 08:24:50 -07:00
samcake
bd28498833
trying to fix the curvature artefact
2016-06-21 18:25:02 -07:00
Anthony J. Thibault
2a82dddc2b
Draw attach points as if they were equip-hotspots
2016-06-21 17:36:36 -07:00
howard-stearns
223f9bda2e
gratuitous change to force things.
2016-06-21 17:03:49 -07:00
Seth Alves
9ca27f267d
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
2016-06-21 16:48:04 -07:00
Ryan Huffman
70be7b3273
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Howard Stearns
7e88772e85
Merge pull request #8106 from howard-stearns/triggering-change
...
triggering change
2016-06-21 13:51:12 -07:00
Brad Hefta-Gaub
c18f5e19f5
Merge pull request #8090 from zzmp/doc/metadata-script
...
add example script for metadata from metaverse
2016-06-21 13:42:10 -07:00
Zach Pomerantz
c8ead2ad04
conform to coding braces standard
2016-06-21 13:28:15 -07:00
Howard Stearns
cd09c61f31
Merge pull request #8108 from jherico/vive-toolbars
...
Additional toolbar work
2016-06-21 13:26:09 -07:00
Anthony J. Thibault
972c292857
Fix for equip-hotspot being visible for whiteboard markers
2016-06-21 11:59:11 -07:00
Zach Pomerantz
c784fa42e9
log failure to fetch metadata
2016-06-21 11:34:23 -07:00
Andrew Meadows
f41fb30ace
add "Static Mesh" option to edit.js
2016-06-20 17:29:20 -07:00
Anthony J. Thibault
2ed88bca6d
Bug fix for bow and arrow.
...
* before this change the releaseEquip message was not getting sent to the bow,
which it would use to re-enable the grab script via the 'Hifi-Hand-Disabler' msg.
2016-06-20 17:24:36 -07:00
