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
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
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
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
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
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
Ryan Huffman
1be30ccce9
Fix enabled_edit firing on disable
2016-06-22 08:24:50 -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
howard-stearns
bfb697bc77
No hysteresis.
2016-06-20 17:04:23 -07:00
Anthony J. Thibault
8817bbea09
reduce log spam
2016-06-20 15:53:33 -07:00
Brad Davis
37e9f66639
Additional toolbar work
2016-06-20 15:41:21 -07:00
Anthony J. Thibault
e5159ad213
Added "Developer > Hands > Drop Without Shake" menu option
2016-06-20 14:50:15 -07:00
Anthony J. Thibault
408f65100b
Bug fix for dropping near-grabbed entities via thump press.
2016-06-20 13:34:05 -07:00
Anthony J. Thibault
8792812884
Change raw for loop to Array.prototype.forEach instead
2016-06-20 13:26:41 -07:00
howard-stearns
cd1780efef
brush clearing
2016-06-20 13:21:06 -07:00
Anthony J. Thibault
359483d9ba
coding standard fix
2016-06-20 11:43:42 -07:00
Anthony J. Thibault
a14bbe4e68
Remove /* style multi-line comments
2016-06-20 11:40:59 -07:00
