Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 19:15:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57771 commits 6 branches 1 tag 1.1 GiB
Commit graph

479 commits

Author SHA1 Message Date
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
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
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
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
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
Seth Alves
ec687bdb4b cleanups 2017-04-21 11:03:43 -07:00
Seth Alves
1e6b2682c9 use timers rather than relying on update calls 2017-04-21 10:17:57 -07:00
volansystech
9e2899678a Resolving conflicts of #21206 2017-04-20 23:54:41 +05:30
volansystech
abc87c0338 Increased accuracy for converting far-grab to near-grab for every object 
Near-grab radius reduced to its default = 0.3
 2017-04-20 23:37:16 +05:30