Stephen Birarda
486557e28a
initial trait packet sending on skeleton URL change
2018-08-21 10:31:14 -07:00
Sam Gateau
1914f1f103
Extending the default size of the regions to 16km
2018-08-21 10:10:39 -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
SamGondelman
9ab1fc0500
Merge remote-tracking branch 'upstream/master' into perf
2018-08-20 17:04:42 -07:00
Sam Gateau
d237195944
Merge pull request #13840 from AndrewMeadows/revert-backfacing-triangle-hack
...
fix MyAvatar collision bug at transitions between meshes
2018-08-20 17:01:40 -07:00
David Rowe
67eb03ba7d
Reduce strength of teleport parabola
2018-08-21 11:18:00 +12:00
Sam Gateau
e60756cfe6
Merge branch 'master' of github.com:highfidelity/hifi into punk
2018-08-20 15:54:23 -07:00
John Conklin II
7e03fc98b2
Merge pull request #13844 from SimonWalton-HiFi/node-kill-regexp
...
Fix killing of single node from DS web interface
2018-08-20 15:19:50 -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
luiscuenca
8bd9bf39b6
Fix json load
2018-08-20 14:31:03 -07:00
John Conklin II
5db751e4be
Merge pull request #13839 from misslivirose/master
...
RC 72 Tutorial - MS17378
2018-08-20 14:21:25 -07:00
Seth Alves
c876cda89d
Merge pull request #13826 from ctrlaltdavid/M17615
...
Disable Vive teleport button if transitioning from direction button
2018-08-20 14:05:45 -07:00
Simon Walton
217e4efdda
Fix regex for web i/f single-node kill
2018-08-20 13:43:48 -07:00
luiscuenca
dc0fbcca59
Include avatar entities on recordings
2018-08-20 13:10:36 -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
luiscuenca
c564119edc
Keep attachments when playing back recordings
2018-08-20 11:58:19 -07:00
Andrew Meadows
3068865a6c
fix MyAvatar collision bug at transitions b/w meshes
2018-08-20 11:42:28 -07:00
SamGondelman
05ff99a1d2
working on blendshapes
2018-08-20 11:40:25 -07:00
sabrina-shanman
813290aad8
Do filtering with copy vector in CollisionPick::filterIntersections
2018-08-20 11:23:22 -07:00
John Conklin II
3f92430bb6
Merge pull request #13369 from SimonWalton-HiFi/check-pfx-file
...
Don't sign a production Windows installer if there's no key file
2018-08-20 11:14:00 -07:00
Liv Erickson
5ffe539360
change to tutorial audio file from mono to stereo files
2018-08-20 11:11:03 -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
Sam Gateau
adc8a39c87
Merge branch 'master' of github.com:highfidelity/hifi into punk
2018-08-20 09:32:42 -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
Ryan Huffman
ead0126365
Merge pull request #13815 from thoys/fix/create/createZeroRotationEntities
...
MS17562: CreateApp - newly created Entity rotation should be zero
2018-08-20 09:07:38 -07:00
luiscuenca
50cc68c63e
Recording app doesn't record old attachments
2018-08-19 12:43:06 -07:00
Sam Gateau
60765902fb
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-08-18 15:04:43 -07:00
Alexander Ivash
9f92ff5de9
fix for duplicating wearables on saving
...
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
2018-08-18 16:38:35 +03:00
Alexander Ivash
3bcd6f4a25
take 'relayParentJoints' into account during wearables comparison
2018-08-18 16:33:30 +03:00
Alexander Ivash
877bce23d2
explicitely specify localRotations on joint change, otherwise it will be updated by engine
2018-08-18 16:32:31 +03:00
John Conklin II
c8addd0581
Merge pull request #13730 from Cristo86/android_friends_main
...
Android - Friends in home screen menu
2018-08-17 16:58:45 -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
David Rowe
26576fa760
Fix Vive left/right buttons not disabling teleport
2018-08-18 09:34:16 +12: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
Cristian Luis Duarte
ccb5bae4b6
Android - People - Code review
2018-08-17 14:24:04 -03:00
John Conklin II
aa6ed008e1
Merge pull request #13835 from AndrewMeadows/less-avatar-flicker
...
fix for vanishing other avatars
2018-08-17 09:06:50 -07:00
Cristian Luis Duarte
4851b44de1
Android - People - Hide actions panel after remove
2018-08-16 19:39:44 -03: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
David Rowe
5328b48acc
Make Vive snap turn buttons lock teleport, also
2018-08-17 09:09:11 +12:00
David Rowe
bf733ded0f
Handle Vive controller not being available at start-up
2018-08-17 09:08:28 +12:00
Cristian Luis Duarte
a3927f4d4c
Android - People - Remove fragments and stack related logs
2018-08-16 17:31:31 -03:00
Cristian Luis Duarte
99760e2b40
Android - People - Better navigation after logged in prevents log in screen to appear after pressing back
2018-08-16 17:29:25 -03: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
