Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-13 06:07:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44807 commits 25 branches 0 tags 1.1 GiB
Commit graph

318 commits

Author SHA1 Message Date
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
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
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
Seth Alves
5ab82cd7c8 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-02 15:11:59 -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
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
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
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
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
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
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
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
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
Anthony J. Thibault
972c292857 Fix for equip-hotspot being visible for whiteboard markers 2016-06-21 11:59:11 -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
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
Anthony J. Thibault
35276c3893 Use Array.prototype.filter instead of my hand rolled filter function 2016-06-20 11:30:40 -07:00
Anthony J. Thibault
7ccbc9e6eb Primary thumb press can be used to drop an equipped object 2016-06-20 11:22:56 -07:00
Anthony J. Thibault
14efd5dc12 Disable WANT_DEBUG_STATE 2016-06-20 10:44:09 -07:00
Anthony J. Thibault
1759132377 Use trigger to both grab and equip objects 
* Removed entry into HOLD state via secondary aka grip buttons.
* Changed equip logic to prioritize equip over near over far grabs.
* Added drop gesture, upside down controller + slight shake + trigger press
* Bug fix for near grab snapping to an incorrect offset after a far grab (this bug is present in master)
 2016-06-20 10:39:07 -07:00
Brad Hefta-Gaub
c297fa7c0e Merge pull request #8060 from imgntn/usersUpdates 
Hide users.js options when logged out
 2016-06-17 14:17:42 -07:00
Brad Hefta-Gaub
852eda3101 Merge pull request #8066 from imgntn/faceCameraText 
Add face camera option to edit.js text entity properties
 2016-06-17 14:14:06 -07:00
Howard Stearns
4aa5e87a26 Merge pull request #8093 from jherico/vive-toolbars 
Support toolbar API
 2016-06-17 13:43:16 -07:00
Howard Stearns
aeebe8b3fb Merge pull request #8094 from howard-stearns/fix-depth-request 
fix depth request
 2016-06-17 13:26:07 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
howard-stearns
74a3db4e1c When setting Reticle.depth, don't assume that we're in the center of the 
HUD.
 2016-06-17 11:14:56 -07:00
Bradley Austin Davis
5bc8b53d1b Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-17 10:56:53 -07:00