Stephen Birarda
|
a80d19a44a
|
remove skeleton from identity, handle in clients
|
2018-08-21 10:31:14 -07:00 |
|
Stephen Birarda
|
ac835650b7
|
add skeleton trait sending to Agent, queuing in AvatarMixer
|
2018-08-21 10:31:14 -07:00 |
|
Stephen Birarda
|
486557e28a
|
initial trait packet sending on skeleton URL change
|
2018-08-21 10:31:14 -07:00 |
|
Wayne Chen
|
acc7d493ec
|
Merge pull request #13812 from SimonWalton-HiFi/safe-landing
Safe landing client-side improvements
|
2018-08-20 20:36:17 -07:00 |
|
Simon Walton
|
8d6aaf3fb5
|
Tidy some method names per reviewer comment
|
2018-08-20 17:50:29 -07:00 |
|
John Conklin II
|
e6c81cdfba
|
Merge pull request #13833 from sabrina-shanman/stt_performance
Performance improvements for Collision Pick API
|
2018-08-20 17:34:46 -07:00 |
|
John Conklin II
|
b28aa3951f
|
Merge pull request #13802 from jherico/feature/scribe_programs
Migrating to scribe program descriptors
|
2018-08-20 14:48:54 -07:00 |
|
sabrina-shanman
|
9c36519e87
|
Fix cross-platform build error in ColliisonPick.cpp (binding to temporary)
|
2018-08-20 12:42:23 -07:00 |
|
Simon Walton
|
a891b74fac
|
Reset SafeLanding in all cases
Also remove unused data member, elevate load priority only
for entities with collisions, handle case of no nearby entities.
|
2018-08-20 12:31:21 -07:00 |
|
sabrina-shanman
|
813290aad8
|
Do filtering with copy vector in CollisionPick::filterIntersections
|
2018-08-20 11:23:22 -07:00 |
|
sabrina-shanman
|
444224a11a
|
Fix ignoring elements in CollisionPick::filterIntersections
|
2018-08-20 11:07:52 -07:00 |
|
sabrina-shanman
|
74f482b361
|
Revert "Convert entityIntersections/avatarIntersections lists in"
This reverts commit aa4a6b2eae.
|
2018-08-20 10:15:28 -07:00 |
|
sabrina-shanman
|
2a182a0033
|
Revert "Do not create a reference to a shared pointer in CollisionPick.cpp"
This reverts commit 130cb70a52.
|
2018-08-20 09:24:07 -07:00 |
|
sabrina-shanman
|
51940898d9
|
Do not implicitly convert size of vector to bool in CollisionPick::filterIntersections
|
2018-08-17 16:23:31 -07:00 |
|
sabrina-shanman
|
6081d63f53
|
Use std::vector::insert for merging CollisionPickResults
|
2018-08-17 14:23:02 -07:00 |
|
sabrina-shanman
|
e3c39020dc
|
Exit early from CollisionPick::filterIntersections on empty blacklist
|
2018-08-17 14:23:02 -07:00 |
|
sabrina-shanman
|
2933038d04
|
Rename PhysicsEngine::getCollidingInRegion to contactTest and change it to accept collision flags instead of a MotionState enum
|
2018-08-17 14:22:42 -07:00 |
|
sabrina-shanman
|
b65572725d
|
Merge branch 'master' into stt_performance
|
2018-08-16 14:44:58 -07:00 |
|
Andrew Meadows
|
90429f07cb
|
don't forget to use enqueue the Transaction
|
2018-08-16 14:38:32 -07:00 |
|
John Conklin II
|
0c0ecd18c9
|
Merge pull request #13827 from amantley/newJumpWalkMotions
Replacing jump_takeoff.fbx and jump_land.fbx animations to fix transition to fly bug
|
2018-08-16 13:26:37 -07:00 |
|
John Conklin II
|
1edf1b4337
|
Merge pull request #13555 from SamGondelman/destroy
Trying to fix dependency shutdown
|
2018-08-16 13:14:58 -07:00 |
|
sabrina-shanman
|
130cb70a52
|
Do not create a reference to a shared pointer in CollisionPick.cpp
|
2018-08-16 10:39:13 -07:00 |
|
John Conklin II
|
02f53c4ee5
|
Merge pull request #13808 from dback2/createEntitiesGrabbable
Use Create Entities as Grabbable option when adding asset to world
|
2018-08-16 09:22:23 -07:00 |
|
sabrina-shanman
|
67ff05739a
|
Take advantage of CollisionPickResult intersections being shared pointers to avoid copying on result comparison
|
2018-08-16 09:00:30 -07:00 |
|
sabrina-shanman
|
aa4a6b2eae
|
Convert entityIntersections/avatarIntersections lists in
CollisionPickResult to shared pointers
|
2018-08-16 08:59:29 -07:00 |
|
Ryan Huffman
|
5d44877f56
|
Fix functionality sometimes getting stuck if window loses focus
|
2018-08-15 13:32:58 -07:00 |
|
sabrina-shanman
|
61d12923ea
|
Do not copy list of collision pick contact points when filtering them
|
2018-08-15 11:12:50 -07:00 |
|
amantley
|
0a1a75f752
|
Merge remote-tracking branch 'upstream/master' into newJumpWalkMotions
|
2018-08-15 10:26:24 -07:00 |
|
amantley
|
48e08276bf
|
added new jump_takeoff and jump_land to fix the tposing in the transition to and from flying
|
2018-08-15 10:20:17 -07:00 |
|
Seth Alves
|
83718ca06d
|
Merge pull request #13746 from alexiamandeville/emoteIcon
updating emote app icon
|
2018-08-15 08:29:48 -07:00 |
|
Kerry Ivan Kurian
|
6a34bde49c
|
Merge pull request #13825 from roxanneskelly/autoScroll
Auto scroll
|
2018-08-14 20:56:53 -07:00 |
|
John Conklin II
|
032e67fd8e
|
Merge pull request #13748 from ElderOrb/FB16831
FB16831 qml-related warnings in log
|
2018-08-14 16:40:07 -07:00 |
|
Roxanne Skelly
|
50b0a458ce
|
Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled.
|
2018-08-14 16:32:56 -07:00 |
|
Seth Alves
|
3623590e90
|
Merge pull request #13784 from sethalves/far-point-joints
Far point joints
|
2018-08-14 15:40:07 -07:00 |
|
Roxanne Skelly
|
5a8da4ce97
|
Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app
|
2018-08-14 15:28:22 -07:00 |
|
Roxanne Skelly
|
987d8569ae
|
Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll
|
2018-08-14 15:27:22 -07:00 |
|
John Conklin II
|
a5bace4e4d
|
Merge pull request #13706 from ElderOrb/FB17062
use updated 'Last Legends: Male' from Mukul
|
2018-08-14 14:18:39 -07:00 |
|
Ryan Huffman
|
19f27ec911
|
Merge pull request #13810 from ctrlaltdavid/M11360
Don't auto-action entry in HMD file dialog when single-click
|
2018-08-14 12:57:28 -07:00 |
|
Seth Alves
|
dce7b6eae6
|
Merge pull request #13714 from sabrina-shanman/safe-teleport-target
Create CollisionPick API
|
2018-08-14 09:56:51 -07:00 |
|
Seth Alves
|
e5e9339a7b
|
Merge pull request #13819 from ElderOrb/FB16914
Avatar bookmarks missing from Avatar Favorites
|
2018-08-14 09:46:37 -07:00 |
|
Seth Alves
|
527b27da96
|
pseudo-joints for far-grab positions
|
2018-08-14 08:55:20 -07:00 |
|
Seth Alves
|
832eefd3a2
|
Merge pull request #13752 from ctrlaltdavid/M17208
Improve text in Avatar app's pop-ups
|
2018-08-14 08:48:04 -07:00 |
|
sabrina-shanman
|
e5cb078133
|
Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target
|
2018-08-13 14:51:37 -07:00 |
|
Seth Alves
|
0a5c96ecc1
|
Merge pull request #13792 from luiscuenca/attachmentsAPImgr
Attachments API returns avatar entities
|
2018-08-13 14:21:13 -07:00 |
|
Alexander Ivash
|
f910757ec4
|
FB16914 - Avatar bookmarks missing from Avatar Favorites
|
2018-08-13 22:57:07 +03:00 |
|
unknown
|
8a22d0adc7
|
set grabbable user data in addAssetToWorldCheckModelSize
|
2018-08-11 11:04:44 -07:00 |
|
unknown
|
c622a587e3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
|
2018-08-11 07:59:56 -07:00 |
|
Simon Walton
|
829b83c61d
|
Use elevated model priority during initial load
|
2018-08-10 18:16:08 -07:00 |
|
Zach Fox
|
57d2f04f14
|
Merge pull request #13799 from davidkelly/dk/17340
Only update gain if it really changed
|
2018-08-10 16:20:24 -07:00 |
|
Simon Walton
|
0ae86d5aa8
|
Remove useless statement
|
2018-08-10 16:16:58 -07:00 |
|