Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 22:23:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
72751 commits 67 branches 56 tags 1.2 GiB
Commit graph

83 commits

Author SHA1 Message Date
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings 
Fix new Mac warnings
 2018-10-20 13:40:53 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
David Rowe
2ba8dc37d0 Miscellanous JSDoc fixes for issues noticed in passing 2018-10-05 16:57:29 +13:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
sabrina-shanman
bc861c1368 Make path pointers use scaleWithParent behind the scenes instead of scaleWithAvatar 2018-09-27 17:29:37 -07:00
sabrina-shanman
c3df710396 Use bracket default initialization for PickQuery::_jointState 2018-09-27 14:34:36 -07:00
sabrina-shanman
3ac9478101 Assign _mathPick in the Pick constructor 2018-09-27 11:30:57 -07:00
sabrina-shanman
4011660435 Merge branch 'master' into stt_parenting2 2018-09-26 10:17:45 -07:00
sabrina-shanman
eca31e7a99 Fix instantiating abstract class when creating visual pick result for pointers 2018-09-25 09:20:57 -07:00
sabrina-shanman
5dbebd4aae Add comment explaining why visualPickResult is a copy 2018-09-24 17:36:24 -07:00
sabrina-shanman
7f189e4d10 Make visualPickResult used by Pointers a private copy 2018-09-24 17:15:56 -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
sabrina-shanman
237022d304 Refactor new pick parenting system for use with RayPick, ParabolaPick 2018-09-14 10:28:15 -07: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
f71fc83309 Remove PickResult::needsToCompareResults 2018-08-31 10:48:48 -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
sabrina-shanman
a4bb8cb622 Add comment on future of PickTransformNodes 2018-08-30 09:08:02 -07:00
sabrina-shanman
cce62f4d92 Do not assume picks with doesIntersect()==false have no results to compare. Fixes CollisionPickResult 'loaded' value always evaluating to false when not colliding 2018-08-24 15:47:52 -07:00
sabrina-shanman
6e160ad22f Add TransformNode-based parenting and implement for CollisionPicks 2018-08-24 15:47:52 -07:00
sabrina-shanman
b0f8d3e427 Add PickTransformNode 2018-08-24 15:47:52 -07:00
SamGondelman
b5b7167644 add to stats 2018-08-23 17:56:24 -07:00
SamGondelman
c474f38860 force coarse picking, sort avatars 2018-08-22 18:07:16 -07:00
David Rowe
7e46a99400 Merge branch 'master' into M17217-b 2018-08-17 10:35:52 +12:00
sabrina-shanman
e5cb078133 Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target 2018-08-13 14:51:37 -07:00
SamGondelman
6b7f5b662e jsdoc fixes 2018-08-06 09:41:05 -07:00
David Rowe
c0dc70c076 Parent play area to teleport target unless underneath avatar 2018-08-04 17:26:18 +12:00
sabrina-shanman
870940b3a0 Merge branch 'master' into safe-teleport-target 2018-08-03 18:14:43 -07:00
David Rowe
ee605e5f21 Merge remote-tracking branch 'SamGondelman/parabolic' into M17217-a 
# Conflicts:
#	scripts/system/controllers/controllerModules/teleport.js
 2018-08-04 09:42:11 +12:00
SamGondelman
e9d1423c61 jsdoc fixes 2018-08-03 13:37:41 -07:00
David Rowe
5be945715f Include the teleporter target in the occlusion 2018-08-03 08:22:36 +12:00
SamGondelman
645f905239 cleanup, model performance improvements 2018-07-24 13:25:49 -07:00
sabrina-shanman
f33ee55f9e Create CollisionPick API 2018-07-19 10:33:21 -07:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00
David Rowe
8e9799b80f Pointers API JSDoc fix up 2018-05-15 16:36:42 +12:00
David Rowe
36752ee701 PickType API JSDoc fix up 2018-05-15 11:23:29 +12:00
Dante Ruiz
c99676b510 atlernate fix for selected entities 2018-03-30 13:44:54 -07:00
Andrew Meadows
3f1944eb8a fix variable name typo 2018-03-09 08:35:18 -08:00
Andrew Meadows
9eecd3cb80 update styluses first: they are cheap 2018-03-09 08:35:18 -08:00
Andrew Meadows
f83c6000df use 'auto' for very long type 2018-03-09 08:35:18 -08:00
Andrew Meadows
24635b0451 remove unused debug cruft variable 2018-03-09 08:35:18 -08:00
Andrew Meadows
9fbe7ec194 time-box Picks and solve in round-robin sequence 2018-03-09 08:35:18 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces" 2018-01-19 15:15:52 -08:00
David Rowe
24dcc8788c Code review 2018-01-20 10:07:23 +13:00
David Rowe
94e6a68d41 Code review 2018-01-20 09:50:24 +13:00