John Conklin II
|
87b39f690c
|
Merge pull request #14106 from jherico/fix/mac_gl1
Fix some Mac rendering issues
|
2018-10-01 16:35:57 -07:00 |
|
Seth Alves
|
c144671c97
|
Merge pull request #14110 from sethalves/fix-clang-7-build
get interface building and working with clang-7 on ubuntu 18
|
2018-10-01 16:32:39 -07:00 |
|
Brad Hefta-Gaub
|
6290b56383
|
Merge pull request #14079 from luiscuenca/simpleAvatarTransit
Simple avatar transit
|
2018-10-01 16:24:46 -07:00 |
|
Brad Hefta-Gaub
|
edd5db7768
|
Merge pull request #14042 from thoys/perf/create/getMultipleEntities
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
|
2018-10-01 16:16:48 -07:00 |
|
John Conklin II
|
1135228b3b
|
Merge pull request #14095 from kencooke/audio-hrtf-reset
Audio-mixer optimizations
|
2018-09-28 16:34:38 -07:00 |
|
John Conklin II
|
11492ce8ee
|
Merge pull request #14045 from sethalves/enterEntity-wait-for-script
don't call enterEntity before the entity's script is loaded
|
2018-09-28 16:07:08 -07:00 |
|
Seth Alves
|
bbe9b5c26f
|
code review, remove some unneeded automoc includes
|
2018-09-28 16:04:40 -07:00 |
|
Seth Alves
|
cb04894e33
|
try another way of fixing _spare warning
|
2018-09-28 14:53:05 -07:00 |
|
Seth Alves
|
b69d0f3997
|
get interface building and working with clang-7 on ubuntu 18
|
2018-09-28 13:46:51 -07:00 |
|
John Conklin II
|
5d00aa0bdb
|
Merge pull request #14009 from sethalves/fix-worn-shape-double-scale
fix scaling of worn shape entities
|
2018-09-28 13:08:46 -07:00 |
|
Bradley Austin Davis
|
3dea4fd10a
|
Fix some Mac rendering issues
|
2018-09-27 19:21:50 -07:00 |
|
Roxanne Skelly
|
af6db93b70
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-27 12:05:21 -07:00 |
|
Ken Cooke
|
9dc0aa5c8d
|
HRTF starts in silent state
|
2018-09-26 18:23:26 -07:00 |
|
Ken Cooke
|
a8f7ff7d8a
|
Add HRTF reset()
|
2018-09-26 18:18:20 -07:00 |
|
John Conklin II
|
b02e2c8123
|
Merge pull request #14081 from SamGondelman/blendshapes
Improve ModelBlender queuing
|
2018-09-26 15:10:02 -07:00 |
|
John Conklin II
|
c1dc0ff2ec
|
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only
Prevent thread issues with PickResults modified by Pointers
|
2018-09-26 12:12:58 -07:00 |
|
John Conklin II
|
6c47ba0dc7
|
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps
Use C++ chrono system_clock for timestamps
|
2018-09-26 11:22:49 -07:00 |
|
John Conklin II
|
0de433c7c7
|
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
fix for deadlock in other avatar entity removal from tree
|
2018-09-26 09:58:26 -07:00 |
|
John Conklin II
|
c5ff72bd20
|
Merge pull request #14024 from wayne-chen/toggle404Redirect
Toggle going to 404 redirect domain
|
2018-09-25 20:44:57 -07:00 |
|
John Conklin II
|
3d71dfc467
|
Merge pull request #14072 from SamGondelman/highlight
Fix avatar highlighting
|
2018-09-25 16:13:14 -07:00 |
|
John Conklin II
|
19438d143e
|
Merge pull request #14073 from jherico/fix/18069_test
Working on Vive shutdown issues
|
2018-09-25 15:41:32 -07:00 |
|
Roxanne Skelly
|
cbb4bff2db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-25 14:16:43 -07:00 |
|
Thijs Wenker
|
80beb6c444
|
addressed CR feedback
|
2018-09-25 22:43:58 +02:00 |
|
Brad Davis
|
15de0590e8
|
Cleaning up commented out code
|
2018-09-25 13:18:49 -07:00 |
|
Brad Davis
|
5adc4c2290
|
Protect against null pointer usage in sound scripting wrapper
|
2018-09-25 13:17:49 -07:00 |
|
SamGondelman
|
21cd3948ae
|
improve blender queuing
|
2018-09-25 12:07:05 -07:00 |
|
sabrina-shanman
|
8dd36e465b
|
Merge branch 'master' into crash_ray-pick-dtor_pointer-only
|
2018-09-25 09:22:30 -07:00 |
|
sabrina-shanman
|
eca31e7a99
|
Fix instantiating abstract class when creating visual pick result for pointers
|
2018-09-25 09:20:57 -07:00 |
|
luiscuenca
|
80daf35e77
|
Animation and particles clean up
|
2018-09-25 07:17:26 -07:00 |
|
luiscuenca
|
3e2ee119f0
|
API to configure animation and particle effect
|
2018-09-25 06:03:29 -07:00 |
|
sabrina-shanman
|
5dbebd4aae
|
Add comment explaining why visualPickResult is a copy
|
2018-09-24 17:36:24 -07:00 |
|
John Conklin II
|
be23d07621
|
Merge pull request #14010 from sethalves/thread-safe-settings
make settings thread safe
|
2018-09-24 17:24:50 -07:00 |
|
sabrina-shanman
|
7f189e4d10
|
Make visualPickResult used by Pointers a private copy
|
2018-09-24 17:15:56 -07:00 |
|
Wayne Chen
|
69d5299362
|
patching fix for previous commits
|
2018-09-24 15:22:46 -07:00 |
|
Brad Davis
|
72fc686ec1
|
Fix timer managmement during shutdown
|
2018-09-24 14:52:13 -07:00 |
|
John Conklin II
|
55848e6959
|
Merge pull request #14008 from sethalves/fix-local-angular-velocity
fix bug that caused localAngularVelocity to get zeroed out
|
2018-09-24 14:32:57 -07:00 |
|
SamGondelman
|
ad73cb3996
|
fix avatar highlighting
|
2018-09-24 14:02:35 -07:00 |
|
Wayne Chen
|
ac5814a1f8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect
|
2018-09-24 13:57:23 -07:00 |
|
John Conklin II
|
a602bff217
|
Merge pull request #13981 from gcalero/android_settings
Android settings (AEC)
|
2018-09-24 13:55:30 -07:00 |
|
Roxanne Skelly
|
6f4c376d9f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-24 13:45:24 -07:00 |
|
John Conklin II
|
45b206d748
|
Merge pull request #14065 from SamGondelman/blendshapeCrash
Fix blendshape crash on avatar removal
|
2018-09-24 12:39:52 -07:00 |
|
John Conklin II
|
d520152a95
|
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
Small Improvements to Anim Stats
|
2018-09-24 11:56:01 -07:00 |
|
luiscuenca
|
012cd207b3
|
No data sent during basic transit
|
2018-09-24 11:39:10 -07:00 |
|
Stephen Birarda
|
b31837168d
|
fix bad lock, optimize some operations, clarify comment
|
2018-09-24 11:27:20 -07:00 |
|
SamGondelman
|
d772cdb34a
|
please
|
2018-09-24 10:16:35 -07:00 |
|
luiscuenca
|
82b14b6e9b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport
|
2018-09-22 05:47:05 -07:00 |
|
luiscuenca
|
01f87a0645
|
lerp myavatar
|
2018-09-22 05:34:17 -07:00 |
|
Seth Alves
|
86e502637e
|
Make Settings thread safe
|
2018-09-21 15:46:35 -07:00 |
|
Roxanne Skelly
|
61cbee72af
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-21 12:31:36 -07:00 |
|
John Conklin II
|
428ace17e1
|
Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall
Fixing double loginFailed
|
2018-09-21 11:36:06 -07:00 |
|