sabrina-shanman
|
ad36e23c34
|
Return early when colliding MyAvatar is found in AllContactsCallback
|
2018-08-09 17:00:54 -07:00 |
|
sabrina-shanman
|
c5e9f02372
|
Finalize Collision Pick API naming convention for intersectingObjects
|
2018-08-09 16:59:23 -07:00 |
|
sabrina-shanman
|
4f077080b0
|
Change API naming for intersectingObjects in CollisionPickResult and update docs
|
2018-08-09 15:29:21 -07:00 |
|
sabrina-shanman
|
4d31863484
|
Fix missing jsdoc note for getPrevPickResult on existence of ParabolaPickResult
|
2018-08-09 15:08:27 -07:00 |
|
sabrina-shanman
|
5b6916177c
|
Add support for rotation as CollisionRegion parameter and make it the default
|
2018-08-08 10:47:13 -07:00 |
|
sabrina-shanman
|
22142a84b8
|
Remove JS documentation on 'loaded' parameter referencing unsupported model collision pick
|
2018-08-08 10:42:26 -07:00 |
|
sabrina-shanman
|
6249d1c3aa
|
Initialize btCollisionWorld::ContactResultCallback BEFORE AllContactsCallback variables
|
2018-08-08 10:32:26 -07:00 |
|
sabrina-shanman
|
4ffe164569
|
Address Mac/Linux build warnings
|
2018-08-08 08:56:35 -07:00 |
|
sabrina-shanman
|
69812d04ae
|
Reduce scope of CollisionPick shapeType to primitive shapes
|
2018-08-07 17:42:38 -07:00 |
|
sabrina-shanman
|
577379dcb4
|
Do not re-calculate intersects flag in CollisionPickResult copy constructor
|
2018-08-06 10:53:03 -07:00 |
|
sabrina-shanman
|
c40db2e8f0
|
Add pick filtering to CollisionPick
|
2018-08-06 10:50:23 -07:00 |
|
sabrina-shanman
|
658ef4e9e6
|
Remove redundant namespace qualifier on CollisionPickResult::toVariantMap() in header file
|
2018-08-06 08:54:55 -07:00 |
|
sabrina-shanman
|
870940b3a0
|
Merge branch 'master' into safe-teleport-target
|
2018-08-03 18:14:43 -07:00 |
|
sabrina-shanman
|
a460cfac29
|
Do not store physics engine pointer in PickScriptingInterface
|
2018-08-03 17:55:54 -07:00 |
|
sabrina-shanman
|
c6b24496c8
|
Add 'loaded' parameter to CollisionPickResult to indicate if the collision region is loaded
|
2018-08-03 17:56:01 -07:00 |
|
sabrina-shanman
|
e7766039b9
|
Pass pick variant map into unsuccessful/default collision results
|
2018-08-03 17:55:54 -07:00 |
|
sabrina-shanman
|
cf34a2cffd
|
Do not const cast CollisionRegion
|
2018-08-03 17:55:54 -07:00 |
|
John Conklin II
|
3a6a72a079
|
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac
Add DS option to disable HMAC packet authentication
|
2018-08-03 17:45:32 -07:00 |
|
MiladNazeri
|
a7a8214983
|
Merge pull request #13637 from ctrlaltdavid/M08513-a
Audio API JSDoc
|
2018-08-03 16:38:03 -07:00 |
|
Sam Gateau
|
aac4ff0b7e
|
Merge pull request #13749 from samcake/punk
Fix the other avatars not being removed when Avatar mixer reset
|
2018-08-03 15:37:13 -07:00 |
|
Sam Gateau
|
c1951da2bb
|
Merge pull request #13737 from jherico/fix/fb16633_a
Don't allow Web surfaces created by non-client scripts to access files
|
2018-08-03 15:25:41 -07:00 |
|
John Conklin II
|
243bd5ea69
|
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
|
2018-08-03 13:32:11 -07:00 |
|
sabrina-shanman
|
b7d5804edb
|
Format if..else statements
|
2018-08-03 12:55:11 -07:00 |
|
David Rowe
|
fdd6b7e07b
|
Delete erroneous merge file
|
2018-08-04 07:29:57 +12:00 |
|
David Rowe
|
2270255d88
|
JSDoc review
|
2018-08-04 07:22:12 +12:00 |
|
sabrina-shanman
|
0b40608650
|
Fix collision picks not working with MyAvatar
|
2018-08-03 12:05:58 -07:00 |
|
Bradley Austin Davis
|
8e9c1e5c0a
|
Fix out of date comment
|
2018-08-03 11:38:39 -07:00 |
|
Sam Gateau
|
2013f1bd33
|
Merge pull request #13732 from AndrewMeadows/other-avatar-physics
reduce physics simulation cost of other-avatars
|
2018-08-03 09:33:59 -07:00 |
|
Sam Gateau
|
da252a70c1
|
Same as https://github.com/highfidelity/hifi/pull/13747
|
2018-08-03 09:22:29 -07:00 |
|
David Rowe
|
32e3bb0e1d
|
Merge branch 'master' into M08513-a
# Conflicts:
# libraries/audio/src/SoundCache.h
|
2018-08-03 10:29:32 +12:00 |
|
sabrina-shanman
|
a06f85faa8
|
Consolidate intersection information in CollisionPickResult to one list, and move variant conversion code to source file
|
2018-08-02 11:27:04 -07:00 |
|
Zach Fox
|
41b804a5dd
|
Merge pull request #13738 from zfox23/MS17215_newEarlyFetchLogic
Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present
|
2018-08-02 09:39:37 -07:00 |
|
Simon Walton
|
88fafc7a1f
|
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
Enable physics after ES indicates all nearby entities received
|
2018-08-01 18:15:00 -07:00 |
|
Andrew Meadows
|
e336c9276d
|
first set shape THEN use it
|
2018-08-01 17:39:57 -07:00 |
|
Simon Walton
|
6f1487bbf8
|
Don't explicitly use data method of shared node pointer
|
2018-08-01 17:11:26 -07:00 |
|
Simon Walton
|
d7a49ee594
|
Merge pull request #13622 from SimonWalton-HiFi/ac-monitor-resources
Raise POSIX descriptor-limit in AC Monitor if necessary
|
2018-08-01 17:07:33 -07:00 |
|
Zach Fox
|
67528cb646
|
Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present
|
2018-08-01 15:49:53 -07:00 |
|
Brad Davis
|
4b317a84d8
|
Don't allow Web surfaces created by non-client scripts to access files
|
2018-08-01 15:12:45 -07:00 |
|
Zach Fox
|
7905c91289
|
Merge pull request #13727 from zfox23/MS17168_filterWhenViewing
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
|
2018-08-01 14:23:26 -07:00 |
|
John Conklin II
|
e321ee0cb6
|
Merge pull request #13721 from misslivirose/tutorial-rc-70
Update bubble context for RC 71
|
2018-08-01 13:14:24 -07:00 |
|
John Conklin II
|
f02e91806c
|
Merge pull request #13686 from huffman/fix/undo-create-entity
Fix added entities not being undoable in Create
|
2018-08-01 13:11:17 -07:00 |
|
John Conklin II
|
c444bb11ba
|
Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit
Avatarapp: base 'SquareLabel' on button from Uit
|
2018-08-01 13:10:33 -07:00 |
|
Andrew Meadows
|
bd6f00e707
|
eliminate angular dynamics of other-avatars
|
2018-08-01 11:58:52 -07:00 |
|
John Conklin II
|
fd1a431729
|
Merge pull request #13689 from ctrlaltdavid/M15244
Move scriptable caches' APIs into scripting interfaces
|
2018-08-01 11:50:13 -07:00 |
|
John Conklin II
|
082a3bca89
|
Merge pull request #13679 from ElderOrb/FB16840
FB16840 - Qml spinboxes in UI toolkit should focus the underlying fie…
|
2018-08-01 11:46:59 -07:00 |
|
John Conklin II
|
fcf32dbc6b
|
Merge pull request #13642 from ctrlaltdavid/M13352
Fix HMD.mountedChanged() API signal
|
2018-08-01 11:28:11 -07:00 |
|
John Conklin II
|
bda9ed7f1a
|
Merge pull request #13680 from ElderOrb/adjust_wearables_button_fix
use 'light' color scheme
|
2018-08-01 11:23:10 -07:00 |
|
Andrew Meadows
|
c939699879
|
ignore other-avatar angularVelocity in physics simulation
|
2018-08-01 11:22:58 -07:00 |
|
Andrew Meadows
|
0d92e2de0a
|
remove bits from other-avatar collision mask
|
2018-08-01 11:21:54 -07:00 |
|
John Conklin II
|
c67ef57ad3
|
Merge pull request #13713 from hyperlogic/bug-fix/leg-ik-bug-fixes-master
Leg IK fixes
|
2018-08-01 11:17:10 -07:00 |
|