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

809 commits

Author SHA1 Message Date
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
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
David Kelly
5cd05da31e strict comparisons 2017-07-20 15:16:40 -07:00
Zach Fox
46d09a12fe Fix bug where overlay would get stuck 2017-07-20 13:26:43 -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
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
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
Zach Fox
974dff36b0 Make hover overlays work for hand controller lasers 2017-07-17 13:16:53 -07:00
Seth Alves
e4aa4823f9 Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move 2017-07-07 08:51:38 -07:00
ZappoMan
c3c9df0cd0 restore old camera state 2017-07-06 10:41:46 -07:00
Seth Alves
55b7c2d767 avoid doing a lot of work during mouse-move event-handlers 2017-07-05 15:50:05 -07:00
Seth Alves
d917878638 fix whitespace 2017-07-05 11:29:09 -07:00
Seth Alves
ab340530b8 don't do a lot of processing during the mouse-move event handler 2017-07-05 11:27:13 -07:00
ZappoMan
d5acc8a6f9 Merge branch 'master' of https://github.com/highfidelity/hifi into godview 2017-07-03 12:21:29 -07:00
David Rowe
a8501a7ac6 Remove old Leap Motion code 2017-06-15 14:45:40 +12:00
Seth Alves
d87b858c0a Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue 
4869 entity resize issue
 2017-06-08 16:34:07 -07:00
Anthony J. Thibault
90d241ca3c Account for avatar scale 2017-06-06 09:10:46 -07:00
NeetBhagat
2ce72d554b Resolve 2 issues: 
1) Entity can grow/shrink if it is grabbed by first right hand then left hand.
2) Stop unwanted grow/shrink of an entity.
 2017-06-05 14:13:51 +05:30
Anthony J. Thibault
7da73d0ff1 teleport.js should still function on avatars with no feet. 2017-06-02 18:01:40 -07:00
NeetBhagat
580c2548e9 Initial Commit : 
1) Resolve a bug when 2 different entity is grabbed in 2 hands. And move your left hand and entity of left hand grow/shrink when you move right/left hand.
2) Resolve right hand-left hand grow-shrink functionality
 2017-06-02 23:04:58 +05:30
ZappoMan
60048a231f god view controller 2017-06-02 10:26:54 -07:00
Seth Alves
de40604042 whitespace 2017-05-25 09:54:40 -07:00
Seth Alves
80e641b6d4 fix code that was using old raypickInfo.properties field 2017-05-25 09:47:02 -07:00
Anthony J. Thibault
b276970258 Hand controller lasers work better in thirdPerson camera mode. 2017-05-08 14:32:50 -07:00
Seth Alves
92966377fb Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:05:57 -07:00
Seth Alves
900fae30fd avoid calling editEntity on overlays 2017-05-04 19:05:52 -07:00
Seth Alves
70efe4aa4f avoid calling editEntity on overlays 2017-05-04 18:52:17 -07:00
Anthony Thibault
7006fa6da4 Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update 
grab is driven by timer rather than update, load tablet model with high priority
 2017-05-04 14:07:21 -07:00
Seth Alves
0cd0e46ca5 make clone work again 2017-05-02 16:20:59 -07:00
Seth Alves
f1170dc17d AvatarList not AvatarManager 2017-05-02 15:48:12 -07:00
Seth Alves
eed4da3570 some cleanups, delete far-grabs during transition to near-grab rather than set ttl to zero 2017-05-02 15:36:38 -07:00
Seth Alves
dc569051f9 Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update 2017-05-02 09:50:13 -07:00
Seth Alves
4b0e7ceef5 show hand lasers when edit is enabled, but not if there are not hand-controllers 2017-04-28 10:24:04 -07:00