Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-13 07:27:23 +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
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
Brad Hefta-Gaub
99a0804429 Merge pull request #8086 from imgntn/activeElement 
Fix some edit.js errors and log messages
 2016-06-16 18:25:20 -07:00
David Rowe
77976281ab Make audio device selection available without advanced menus enabled 2016-06-17 09:58:44 +12:00
Ryan Huffman
c2ebcd1f77 Make activity logging from scripts only available for certain events 2016-06-16 13:49:25 -07:00
Ryan Huffman
bce05df56b Update enabled_edit to only get sent when you have permission 2016-06-16 13:25:14 -07:00
Ryan Huffman
56c84bbc27 Add opened_marketplace and enabled_edit to edit.js 2016-06-16 13:18:08 -07:00
James B. Pollack
96d6cb12ac supress some messages and errors 2016-06-16 12:27:03 -07:00
Howard Stearns
faa2624ca7 Merge pull request #8081 from howard-stearns/continue-grabbing-through-overlays 
Continue grabbing through overlays
 2016-06-15 16:07:01 -07:00
Howard Stearns
0915d1287f Merge pull request #8079 from howard-stearns/no-laser-without-trigger 
No laser without trigger
 2016-06-15 16:06:56 -07:00
Howard Stearns
980eafb972 Merge pull request #8065 from hyperlogic/feature/grab-script-preliminaries 
grab script preliminaries
 2016-06-15 16:06:06 -07:00
howard-stearns
6f671b7cde see comment. 2016-06-15 15:17:34 -07:00
howard-stearns
1e3b20b66d Explicit check enumerated states instead of relying on order, per 
feedback.
 2016-06-15 15:06:36 -07:00
howard-stearns
2c7642a367 Do not make ReticleClick when we enter an overlay with the trigger 
pressed.
 2016-06-15 12:28:42 -07:00
howard-stearns
6366ca7508 Go red for full trigger. 2016-06-15 11:08:59 -07:00
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07:00
Howard Stearns
b9754c8564 continue grabbing through overlays 2016-06-14 20:17:52 -07:00
Howard Stearns
ae65790bf3 no laser (or mouse cursor) from hand controllers unless trigger squeezed 2016-06-14 18:07:08 -07:00
Anthony J. Thibault
071584597d Merge branch 'vive-ui' into feature/grab-script-preliminaries 2016-06-14 15:33:38 -07:00
Anthony J. Thibault
67aac09033 Set state debug flag to false 2016-06-14 14:59:29 -07:00
James B. Pollack
b97dc584ea fix bug where buttons would show when minimized 2016-06-14 14:14:31 -07:00
howard-stearns
5759c2d29d final 2016-06-14 11:28:44 -07:00
Brad Hefta-Gaub
1c391e626f Merge pull request #8054 from ctrlaltdavid/20957 
fix model export continued
 2016-06-14 10:57:25 -07:00
howard-stearns
35fac3ca56 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into use-system-pointer2 2016-06-14 10:47:23 -07:00
Bradley Austin Davis
175dbb8924 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-14 09:48:56 -07:00
James B. Pollack
3b2e0842b0 add face camera to text properties 2016-06-13 23:27:08 -07:00
Anthony J. Thibault
cb51d00c1d Removed CONTINUE_FAR_TRIGGER and CONTINUE_NEAR_TRIGGER 2016-06-13 19:08:33 -07:00
Anthony J. Thibault
28b6cc2777 handControllerGrab.js is now eslint clean. 2016-06-13 18:54:21 -07:00
howard-stearns
dfd03d5e61 Prepare for working laser. But at this point, we still show the laser AND 
the Reticle.
 2016-06-13 17:15:51 -07:00
howard-stearns
526fc7d062 Make handControllerGrab independent of whether we're using laser or 
Reticle.
 2016-06-13 17:13:10 -07:00
howard-stearns
0366c891cc Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into use-system-pointer 2016-06-13 17:06:43 -07:00
Anthony J. Thibault
b01eb0439d removed sticky thumb equip states. 
* removed STATE_WAITING_FOR_EQUIP_THUMB_RELEASE and waitingForEquipThumbRelease
* removed STATE_EQUIP
* removed STATE_WAITING_FOR_RELEASE_THUMB_RELEASE and waitingForReleaseThumbRelease
* removed 'Hifi-Object-Manipulation' 'loaded' support and checkNewlyLoaded method.
 2016-06-13 16:49:38 -07:00
James B. Pollack
5ac9460592 fix branching 2016-06-13 16:43:33 -07:00
Anthony J. Thibault
fe65df350b Combined the release and off states. 2016-06-13 15:05:34 -07:00
Anthony J. Thibault
bd3326d2fc Collapse continueNearGrabbing and nearGrabbing into a single state. 
* Moved the update logic from STATE_NEAR_GRABBING, STATE_HOLD & STATE_EQUIP into the entryMethods
  for those states.
* Removed STATE_CONTINUE_NEAR_GRABBING, STATE_CONTINUE_HOLD & STATE_CONTINUE_EQUIP states
  This functionality has been moved into the updateMethod for their respective states.

This *should* be a pure re-factor no functionality was changed.
 2016-06-13 14:40:30 -07:00
Anthony J. Thibault
6d2181f0f1 Combine DISTANCE_HOLDING and CONTINUE_DISTANCE_HOLDING states. 2016-06-13 14:40:30 -07:00
James B. Pollack
188590a891 cleanup 2016-06-13 13:08:22 -07:00
James B. Pollack
567118f4a9 cleanup 2016-06-13 13:08:12 -07:00
James B. Pollack
342fc07d29 select active element in edit.js after change 2016-06-13 13:06:56 -07:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -07:00
Howard Stearns
b0f6b59207 Merge pull request #8040 from hyperlogic/bug-fix/equip-hotspot-render 
Only render equip-hotspots for objects with attach points.
 2016-06-13 11:29:39 -07:00
Howard Stearns
357ccc17aa Merge pull request #8030 from howard-stearns/fix-paused-interactions-with-mouse 
fix paused interactions with mouse
 2016-06-13 11:28:47 -07:00
David Rowe
58f89c88a2 Remember last directory used for Window.browse() and Window.save() 
Use last directory if not specified in method call. Default to desktop.
 2016-06-11 16:45:17 +12:00
howard-stearns
4344a35c60 Use the new system pointer functionality. 2016-06-10 16:00:16 -07:00
howard-stearns
542cfb2e11 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse 2016-06-10 13:02:49 -07:00
Brad Davis
472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
 2016-06-10 10:43:09 -07:00
howard-stearns
82cc219ab8 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse 2016-06-09 13:30:28 -07:00
David Rowe
0fe93a1e89 Fix capitalization of import and export dialog titles 2016-06-09 16:12:11 +12:00
Brad Hefta-Gaub
69ae33ad9a Merge pull request #7997 from SamGondelman/touchFixes 
Corrected Oculus Touch coordinate system so that hands track properly
 2016-06-08 15:39:17 -07:00
Anthony J. Thibault
42068cf2dd Only render equip-hotspots for objects with attach points. 2016-06-08 15:01:53 -07:00
Brad Davis
0565d3aea1 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-08 14:59:58 -07:00
James B. Pollack
65e2cdbbf3 clear dead code 2016-06-08 13:44:53 -07:00
howard-stearns
3138c4041b Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse 2016-06-08 11:54:00 -07:00
howard-stearns
f8353fb082 New button content and initial positions. 2016-06-08 11:11:18 -07:00
howard-stearns
74c5ddd49f fix paused interactions with mouse 2016-06-07 09:50:10 -07:00
SamGondelman
1994eabc98 grip buttons on vive and touch will make you active in away.js 2016-06-06 16:22:02 -07:00
Anthony J. Thibault
b836a580ff Updated some debug print information 2016-06-06 14:40:58 -07:00
Anthony J. Thibault
6d462a477d Change equip-hotspot to a green sphere. 2016-06-06 14:40:57 -07:00
Anthony J. Thibault
c9f440a49d handControllerGrab: initial rendering of equip hot-spots 
* When trigger is depressed, any entities that are marked with a wearable equip-point
  will become highlighted by a wireframe box (temporary art).
* The grab state machine is now defined by the CONTROLLER_STATE_MACHINE object.
  this includes each state's name and updateMethod name.
* Support was added for entry and exit methods when changing states, this
  functionality is used to draw and delete the hot spots when entering
  and exiting the searching state.
 2016-06-06 14:40:57 -07:00
James B. Pollack
15745eb5b2 Merge remote-tracking branch 'upstream/master' into moreshelfstuff 2016-06-06 12:00:41 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
Howard Stearns
91450addd3 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into goto-button 2016-06-05 10:46:18 -07:00
Howard Stearns
dbc688f445 Merge pull request #8005 from howard-stearns/pointer-cleanup 
pointer cleanup -- see comment on #8012
 2016-06-05 10:17:36 -07:00
Brad Hefta-Gaub
eeb08fb401 Merge pull request #8014 from imgntn/leaphands 
add leap hands to /system
 2016-06-04 16:43:30 -07:00
David Rowe
b6cb5617d3 Save toolbar position when moving it only when stopped moving it 2016-06-05 08:55:27 +12:00
SamGondelman
4fb8eac8ea much better way of fixing script 2016-06-03 18:12:47 -07:00
James B. Pollack
da023bfbe3 leap 2016-06-03 15:40:04 -07:00
SamGondelman
2367cb1995 fixing input mapping for vive/touch grip button/trigger, script needs fixing 2016-06-03 15:07:21 -07:00
howard-stearns
6881956117 Basic HMD toggle button. 2016-06-03 14:57:46 -07:00
James B. Pollack
9c63a6417e fix attached entities manager and add to default scripts 2016-06-03 14:24:07 -07:00
howard-stearns
247286c71f Basic address bar toggle button. 2016-06-03 11:55:33 -07:00
howard-stearns
3e919cb7ac cleanup 2016-06-03 10:42:02 -07:00
Brad Davis
e9b359feb1 Make QML overlays disappear, use fade for non-window types 2016-06-02 19:15:19 -07:00
howard-stearns
6d3fd4f208 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into click-on-trigger 2016-06-01 14:17:27 -07:00
howard-stearns
84fa4402fd Click on full trigger, activate on partial trigger. 2016-06-01 14:03:49 -07:00
howard-stearns
9ad19a2eaf Draw grab balls in front of entities (not just the lines as before). 
Don't intersect with grab balls (not just lasers as before).
Don't run grab lasers through (2d or 3d) overlays.
Don't try to manage reticle in handControllerGrab because other scripts
do.
 2016-05-31 14:57:31 -07:00
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
howard-stearns
a3f1ece978 Do button mapping in C++ and simplify vive.json accordingly. Vive and 
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
 2016-05-24 16:10:12 -07:00
howard-stearns
6b606759aa Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes 2016-05-24 11:31:20 -07:00
Brad Hefta-Gaub
b8b39b962d Merge pull request #7868 from jherico/entity_shape 
Add a generic shape primitive
 2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub
49ded9c4df Merge pull request #7873 from ctrlaltdavid/20917 
restyle file browser
 2016-05-24 08:40:38 -07:00
David Rowe
3391430f0a Tidy zone flying and ghosting entities editor options 
Move options to top of section from under "skybox" subsection
Fix capitalization of labels
 2016-05-24 20:28:49 +12:00
howard-stearns
fdcd667d3c Fix hand controller pointer after input changes. 2016-05-23 13:33:42 -07:00
David Rowe
504516b627 Merge branch 'master' into 20917 2016-05-24 08:03:54 +12:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Brad Hefta-Gaub
567f7f4b77 Merge pull request #7953 from ctrlaltdavid/20929 
fix not being able to teleport to user when users window moved right
 2016-05-21 09:25:07 -07:00
David Rowe
a294170c74 Fix not being able to teleport to user when users window moved right 2016-05-21 15:50:06 +12:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones 
No fly zones
 2016-05-20 16:59:55 -07:00
Brad Hefta-Gaub
5906f88226 Merge pull request #7952 from sethalves/fix-walking-far-grab 
fix distance-grabbing and walking at the same time
 2016-05-20 16:54:52 -07:00
Seth Alves
a24d63a39c make distance-grab work better when avatar is walking 2016-05-20 15:45:00 -07:00
Chris Collins
8dbc6af719 Merge pull request #7944 from Atlante45/fix/edit-js 
fix edit.js to handle userData that's not in JSON
 2016-05-20 15:14:13 -07:00
Seth Alves
ff36b39067 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-20 14:38:53 -07:00
howard-stearns
c299aef8f2 fix 588, 558 2016-05-20 12:15:30 -07:00
Atlante45
0353e562e4 entityProperties.html handles non object userData 2016-05-20 10:18:32 -07:00
David Rowe
17b3101ca5 Merge branch 'master' into 20917 2016-05-20 18:50:01 +12:00
Brad Hefta-Gaub
8ff7af28be Merge pull request #7925 from sethalves/overlay-or-grab-not-both 
fix mouse-grab moving both an overlay and an entity at the same time
 2016-05-19 17:38:32 -07:00
Seth Alves
74520f5c92 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
Brad Hefta-Gaub
53956c8210 reduce log spam 2016-05-19 07:50:06 -07:00
Seth Alves
b4df7cada7 don't mouse-grab things through an overlay 2016-05-18 16:16:31 -07:00