Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 01:50:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39841 commits 76 branches 59 tags 1.2 GiB
Commit graph

132 commits

Author SHA1 Message Date
Brad Hefta-Gaub
8de4a59078 add support for auto-hide reticle and seek lookat on auto-show of reticle 2016-02-28 13:06:49 -08:00
Brad Hefta-Gaub
188cf3694b fix rotation of depth reticle 2016-02-27 17:31:35 -08:00
Brad Hefta-Gaub
8b6a445b9e fix desktop detection when not pointing at overlay area 2016-02-24 16:42:08 -08:00
Brad Hefta-Gaub
2db25690f1 detect when mouse is over QML overlays or 2D JS Overlays 2016-02-23 10:14:44 -08:00
Brad Hefta-Gaub
fc002df5e7 implement Reticle.depth using the apparent 3D look at logic instead 2016-02-22 13:24:14 -08:00
Brad Hefta-Gaub
e369c1f327 fix unix warning 2016-02-22 10:28:00 -08:00
Brad Hefta-Gaub
19d0968ccb Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 
Conflicts:
	interface/src/ui/ApplicationCompositor.h
 2016-02-22 09:18:40 -08:00
Brad Hefta-Gaub
ba36eed9eb whitespace fixes 2016-02-21 11:40:15 -08:00
Brad Hefta-Gaub
68771c92f7 change position to use mutex instead of atomic<> 2016-02-21 11:38:26 -08:00
Brad Hefta-Gaub
32a7179c62 CR feedback 2016-02-21 09:59:19 -08:00
Brad Hefta-Gaub
31b895058b depth reticle work 2016-02-21 09:30:26 -08:00
Brad Hefta-Gaub
9c3abd3eb7 some cleanup and standardization in how headPose is gathered 2016-02-20 11:40:30 -08:00
Brad Hefta-Gaub
4e2c514eb1 fix mac warning 2016-02-19 18:27:25 -08:00
Brad Hefta-Gaub
1fa6e294e7 allow mouse to move outside of the overlay extents 2016-02-19 17:49:33 -08:00
Brad Hefta-Gaub
d9aa5d8857 cleanup dead code 2016-02-19 13:25:53 -08:00
Brad Hefta-Gaub
7be5811f34 tweak to UI size, clean up screen to overlay 2016-02-19 13:22:37 -08:00
Brad Hefta-Gaub
d1e1067e5a allow hydra mouse to know the correct size of screen to target 2016-02-18 22:30:31 -08:00
Brad Hefta-Gaub
bc5d4cfb7f better handling of mouse capture to account for overlapping child windows 2016-02-18 20:20:30 -08:00
Brad Hefta-Gaub
0de5c1cf71 don't capture the mouse if you're not the active window or if a menu is popped up 2016-02-18 17:11:40 -08:00
Brad Hefta-Gaub
adcadedc65 slight rework of handleRealMouseMoveEvent 2016-02-18 14:40:55 -08:00
Brad Hefta-Gaub
843039f741 fix mac warnings 2016-02-18 12:04:38 -08:00
Brad Hefta-Gaub
935af6d2cc clean up debug logs 2016-02-18 12:01:03 -08:00
Brad Hefta-Gaub
c4fc3e4057 more work on dragging in hmd 2016-02-18 10:07:37 -08:00
Brad Hefta-Gaub
279519b6d5 hmd mouse check point 2016-02-18 08:44:22 -08:00
Brad Hefta-Gaub
8b8b99c7e0 HMD mouse checkpoint 2016-02-17 21:19:01 -08:00
Brad Hefta-Gaub
a25581c656 clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor) 2016-02-16 12:11:58 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
Brad Davis
d924e042bc Merge pull request #6834 from ZappoMan/hmdFixes 
fix issues with HMD lookout 2D, and cleanup
 2016-01-14 12:42:23 -05:00
Brad Hefta-Gaub
6b76cf484d fix issues with HMD lookout 2D, and cleanup 2016-01-14 08:48:55 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
Brad Hefta-Gaub
0b781a3589 fix warnings 2015-12-17 18:39:05 -08:00
Andrew Meadows
e9f52b1211 properly scale avatar collision shape 2015-12-15 18:18:08 -08:00
Brad Hefta-Gaub
3dcdfbc0f1 first cut at simulating mouse/reticle behavior with input contorllers 2015-12-15 13:59:22 -08:00
Brad Davis
645695d5d5 Moving sixense to external plugin 2015-12-10 10:44:23 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Atlante45
0a65bb145b Some more code cleanup 2015-11-06 16:44:28 -08:00
Seth Alves
3ac0fef1ea merge from upstream 2015-11-01 15:22:57 -08:00
Brad Hefta-Gaub
d86f1b50a7 more cleanup 2015-10-27 16:37:43 -07:00
Brad Hefta-Gaub
5a42991e0c first pass at cleaning up MyAvatars use of PalmData 2015-10-27 13:51:42 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
Seth Alves
a78f2a9577 have avatar make use of SpatiallyNestable 2015-10-18 09:48:46 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
Andrew Meadows
039d9a6a98 Merge pull request #6010 from ZappoMan/disableHandMouseByDefault 
Disable hand mouse by default
 2015-10-07 14:15:58 -07:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
Brad Hefta-Gaub
6e5847bb1c make Hand Input Mouse off by default 2015-10-06 19:58:25 -07:00
Brad Davis
bac69c73a8 Fixing bug in application compositor transform 2015-10-06 19:08:44 -07:00
Atlante45
60ebd3a544 Remove unused members (Mostly mouse stuff) 2015-10-06 13:56:25 -07:00
Atlante45
dde11c5cd1 More unused 2015-10-06 13:56:23 -07:00