Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 15:56:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77956 commits 67 branches 56 tags 1.2 GiB
Commit graph

97 commits

Author SHA1 Message Date
David Rowe
73fd61dcf0 Picks, PickType, RayPick JSDoc update 2019-04-25 13:19:07 +12:00
danteruiz
4bbae1230d making requested chantges 2019-02-19 10:07:36 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
SamGondelman
c217f8d80f remove overlay picks from stats qml 2019-02-07 14:25:07 -08:00
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
SamGondelman
ca8d64bc05 removing overlays wip 2019-01-24 14:59:45 -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
Seth Alves
a2d4c236c1
Merge pull request #14220 from SamGondelman/pickFree 
Fix PickManager::removePick heap use after free
 2018-10-22 09:48:22 -07:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings 
Fix new Mac warnings
 2018-10-20 13:40:53 -07:00
Sam Gondelman
19fd7b5ac7
cr 2018-10-16 18:24:14 -07:00
SamGondelman
a8a0671d6c fix heap use after free 2018-10-16 15:00:19 -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