Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58172 commits 71 branches 56 tags 1.2 GiB
Commit graph

837 commits

Author SHA1 Message Date
Seth Alves
327bc23b5c get ready for highlighting 2017-08-13 11:41:12 -07:00
Seth Alves
e7437d66ef if a raypick hits something that's very close, put it into the nearby-entities list 2017-08-12 17:49:02 -07:00
Seth Alves
ec93172676 far-search rays work, but nothing else about far-grab. 2017-08-12 17:27:48 -07:00
Seth Alves
505b564c62 sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase 2017-08-12 13:14:00 -07:00
Seth Alves
9fb1835a26 grabbing overlays works, again 2017-08-12 12:38:36 -07:00
Seth Alves
7ae41064db tablet stylus works again 2017-08-12 11:19:39 -07:00
Seth Alves
b4a54b017a plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict 2017-08-11 12:15:41 -07:00
Seth Alves
0d0f147056 port action-near-grab to dispatcher 2017-08-09 17:48:35 -07:00
Seth Alves
5e3b573d19 Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher 2017-08-09 14:08:07 -07:00
Seth Alves
2c8aac53cd Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher 2017-08-09 14:05:49 -07:00
SamGondelman
6157f4fa55 script fixes 2017-08-09 11:56:25 -07:00
SamGondelman
684001a756 workaround deadlock in editRenderState 2017-08-08 11:11:19 -07:00
SamGondelman
8b1c24e636 added setLockEndUUID, update handControllerGrab and grab 2017-08-04 18:26:11 -07:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
Howard Stearns
71ce5a6494 Merge pull request #11016 from highfidelity/context-overlays 
Context Overlays
 2017-08-03 16:28:14 -07:00
Anthony J. Thibault
1b6feb63c8 Fix for crash when attempting to teleport while avatar was loading 
The fix had two parts.
  * Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
  * Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
 2017-08-01 18:40:43 -07:00
Seth Alves
cfe3981bc2 cleanups 2017-07-27 18:22:17 -07:00
Seth Alves
fcf1dc839a parenting near grab works 2017-07-27 17:52:23 -07:00
Seth Alves
f0c9f1d120 starting on controller-dispatcher experiment 2017-07-27 15:32:13 -07:00
SamGondelman
e3288a9004 fix flicker, scissor warning, and handControllerGrab sphere size 2017-07-27 11:17:30 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
SamGondelman
5e4a83dad9 defaultRenderStates, handControllerGrab.js, fix teleport.js a little 2017-07-26 17:58:39 -07:00
Zach Fox
8a7561d61b IT'S WORKING SOB SOB SOB 2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357 WHYYYY DOESN'T THIS WORK 2017-07-26 16:14:35 -07:00
Zach Fox
1336a59b6c Stupid bracket 2017-07-26 15:14:58 -07:00
Zach Fox
17c7e38fce Bugfixes? 2017-07-26 15:02:52 -07:00
Zach Fox
3a05219c59 Closer still 2017-07-26 14:10:41 -07:00
Zach Fox
40038ce54b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-25 09:33:07 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
David Kelly
5cd05da31e strict comparisons 2017-07-20 15:16:40 -07:00
SamGondelman
5de0970365 put back ignoredEntities functionality in teleport 2017-07-20 14:17:52 -07:00
SamGondelman
c7f0f03fce expanded RayPick JS API 2017-07-20 13:53:39 -07:00
Zach Fox
46d09a12fe Fix bug where overlay would get stuck 2017-07-20 13:26:43 -07:00
SamGondelman
d156680bc8 ignore/include by ID, simplified caching logic 2017-07-20 12:15:06 -07:00
Zach Fox
f515a24568 UX improvements 2017-07-20 12:00:13 -07:00
Dante Ruiz
3805228b70 fixed grab the tablet in third person 2017-07-20 16:26:51 +01:00
SamGondelman
bf243d6025 lockEnd, editRenderState, and updated grab.js 2017-07-19 17:45:21 -07:00
Zach Fox
2dc3844116 Improve reliability of hand lasers; increase size of target 2017-07-19 17:07:57 -07:00
Zach Fox
c866bd814d Make clicks work right 2017-07-19 12:24:20 -07:00
SamGondelman
c6b3f69db0 teleport third eye laser on invalid hand pose 2017-07-19 11:51:31 -07:00
Zach Fox
1d26a268c1 Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay 2017-07-19 09:53:51 -07:00
Zach Fox
761d35d633 Getting there! 2017-07-18 17:10:23 -07:00
Zach Fox
82111a8f6a Timer for hand controller lasers 2017-07-18 16:40:18 -07:00
Zach Fox
8f6af3a1ab ContextOverlay 2017-07-18 16:28:24 -07:00
Zach Fox
265f978a06 It's working! 2017-07-18 15:57:26 -07:00
Dante Ruiz
b3ec306063 better version 2017-07-18 23:48:21 +01:00
Dante Ruiz
8cbe63f296 removed search laser in edit mode for 2d mode 2017-07-18 22:45:54 +01:00
Zach Fox
2b1a0921da Initial work on clickable overlays 2017-07-18 14:01:16 -07:00
Zach Fox
67c8ddfd57 Merge in changes from laser PR 2017-07-17 17:09:40 -07:00
Zach Fox
a37f0137e7 Destroy overlays when trigger released 2017-07-17 14:29:43 -07:00