Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 04:40:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79143 commits 25 branches 0 tags 1.1 GiB
Commit graph

28 commits

Author SHA1 Message Date
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions 
(cherry picked from commit 6aac596698)
 2018-12-22 00:55:10 -05:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
SamGondelman
6aac596698 updated entityscriptinginterface API and related functions 2018-12-07 15:25:21 -08:00
Dante Ruiz
f664421fe0 addressing code review feedback 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
sabrina-shanman
55ab0a394b Return std::make_shared 2018-09-25 12:21:22 -07:00
sabrina-shanman
6e83e96d1c Check type in Pointer::getPickResultCopy 2018-09-25 12:05:47 -07:00
sabrina-shanman
660bdf36d0 Check if pick result is null when building visual pick result 2018-09-25 09:56:51 -07:00
sabrina-shanman
eca31e7a99 Fix instantiating abstract class when creating visual pick result for pointers 2018-09-25 09:20:57 -07:00
David Rowe
90ef109476 Remove superseded Pointers API functions 2018-09-25 11:11:53 +12:00
David Rowe
e29b403abc Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/raypick/PointerScriptingInterface.cpp
#	interface/src/raypick/PointerScriptingInterface.h
#	interface/src/raypick/StylusPointer.h
#	libraries/pointers/src/Pointer.h
#	scripts/system/controllers/controllerModules/teleport.js
 2018-09-24 11:44:28 +12:00
Sam Gondelman
7cdc7dcc66
Merge pull request #13873 from sabrina-shanman/stt_parenting 
Collision Pick Parenting
 2018-08-31 14:43:55 -07:00
sabrina-shanman
e94d7de99a Add JS API hook for getting overlay IDs from a pointer via 
Pointer.getPointerProperties
 2018-08-31 09:18:07 -07:00
David Rowe
c41d74621e Merge branch 'master' into M17217-b 
# Conflicts:
#	interface/src/raypick/PathPointer.cpp
 2018-08-31 14:26:24 +12:00
SamGondelman
cda8b82ead improve pointer performance 2018-08-29 13:32:53 -07:00
David Rowe
5be945715f Include the teleporter target in the occlusion 2018-08-03 08:22:36 +12:00
Brad Davis
6a91d549ce Fix stylus overlay 2018-01-22 15:08:26 -08:00
David Rowe
6e43497e14 Merge tag 'RELEASE-7602' into 21661 
Jenkins Git plugin tagging with RELEASE-7602
 2018-01-03 16:46:10 +13:00
SamGondelman
ce96fa7078 change hysteresis values based on testing 2017-12-11 17:32:58 -08:00
SamGondelman
fba06a74aa fix laser and stylus deadspot 2017-12-11 15:51:22 -08:00
SamGondelman
61c7ccde6e cleanup 2017-11-17 10:45:39 -08:00
SamGondelman
8730a26d20 use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation 2017-11-15 14:12:16 -08:00
SamGondelman
cbf0543646 deadspot 2017-11-10 13:22:38 -08:00
SamGondelman
5a78c9ebfe integrated stylus into pointer system, need to update controller module 2017-11-09 11:59:17 -08:00
SamGondelman
f970eb2302 merge with pointers branch 2017-11-06 14:49:50 -08:00
Brad Davis
f061b9c2da Add stylus functionality to pointer manager 2017-11-01 11:27:57 -07:00