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

799 commits

Author SHA1 Message Date
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
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18: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
SamGondelman
d156680bc8 ignore/include by ID, simplified caching logic 2017-07-20 12:15:06 -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
SamGondelman
c6b3f69db0 teleport third eye laser on invalid hand pose 2017-07-19 11:51:31 -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
a37f0137e7 Destroy overlays when trigger released 2017-07-17 14:29:43 -07:00
SamGondelman
197ba83b10 remove old_teleport 2017-07-17 13:46:23 -07:00
Zach Fox
974dff36b0 Make hover overlays work for hand controller lasers 2017-07-17 13:16:53 -07:00
SamGondelman
ae99be0350 added faceAvatar and centerEndY, working on updating teleport.js, style fixes 2017-07-17 13:07:42 -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
Seth Alves
467505e421 Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update 2017-04-27 10:33:04 -07:00
Seth Alves
93f9716557 merge from upstream 2017-04-27 10:17:00 -07:00
Seth Alves
15661987be load tablet overlay models with higher priority 2017-04-27 10:16:08 -07:00
volansystech
87ceebca82 Merge branch 'master' of https://github.com/highfidelity/hifi into 21200 
# Conflicts:
#	scripts/system/controllers/handControllerGrab.js
 2017-04-27 12:58:18 +05:30
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Seth Alves
aeaa95b7a0 Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update 2017-04-26 10:23:27 -07:00
Seth Alves
37233b9fdb avoid a rare script-crash 2017-04-26 10:19:50 -07:00
Andrew Lowry
ecf3826050 Always show hand lasers when in edit mode. 2017-04-24 13:35:37 -04:00
Andrew Lowry
8479d835b2 Adds laser selection of particle systems while in edit mode in HMD. 2017-04-24 13:35:37 -04:00
volansystech
1abbca6737 Merge branch 'master' into 21200 2017-04-24 19:09:02 +05:30