Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-01 22:52:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44156 commits 25 branches 0 tags 1.1 GiB
Commit graph

142 commits

Author SHA1 Message Date
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -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
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
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