John Conklin II
70c7ffcc71
Merge pull request #14069 from AndrewMeadows/avatar-collisions-002
...
fix MyAvatar-vs-OtherAvatar collisions
2018-09-26 15:21:18 -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
7df90881cd
Merge pull request #14007 from kkurian/marketplace-item-tester
...
Marketplace item tester interface
2018-09-26 11:25:53 -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
19438d143e
Merge pull request #14073 from jherico/fix/18069_test
...
Working on Vive shutdown issues
2018-09-25 15:41:32 -07:00
sabrina-shanman
55ab0a394b
Return std::make_shared
2018-09-25 12:21:22 -07:00
sabrina-shanman
6e83e96d1c
Check type in Pointer::getPickResultCopy
2018-09-25 12:05:47 -07:00
sabrina-shanman
660bdf36d0
Check if pick result is null when building visual pick result
2018-09-25 09:56:51 -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
Kerry Ivan Kurian
505e08b841
Resolve merge conflicts
2018-09-25 00:57:43 -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
Andrew Meadows
a3f946dee1
activate OtherAvarar in physics sim on position change
2018-09-24 16:27:37 -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
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
Andrew Meadows
c1d65f5118
update avatar shape after it loads
2018-09-24 12:07:08 -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
Stephen Birarda
b31837168d
fix bad lock, optimize some operations, clarify comment
2018-09-24 11:27:20 -07:00
Seth Alves
86e502637e
Make Settings thread safe
2018-09-21 15:46:35 -07:00
Kerry Ivan Kurian
66bf45c3ef
Update location only if certificate id
2018-09-19 15:18:18 -07:00
Wayne Chen
7e796f7e7f
committing requested changes
2018-09-19 14:26:30 -07:00
John Conklin II
3b1e0dc7d9
Merge pull request #13987 from zfox23/discovery_appUi
...
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
2018-09-19 12:38:28 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola
...
Correct transparent parabola shader
2018-09-19 11:46:24 -07:00
Wayne Chen
a43799fffa
moving settings check within slotted functions
2018-09-19 10:40:49 -07:00
Wayne Chen
795580f4e1
adding 404 redirect toggle with interstitial
2018-09-19 09:55:15 -07:00
Stephen Birarda
3a7785d10f
fix for deadlock in other avatar entity removal
2018-09-18 17:52:24 -07:00
Kerry Ivan Kurian
f2a046da91
Install marketplace item tester
2018-09-18 00:08:09 -07:00
Zach Fox
23fab0985b
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-17 11:11:21 -07:00
John Conklin II
be76c43aec
Merge pull request #13999 from gcalero/dont_popup_login_android
...
Don't popup login dialog in android
2018-09-14 16:06:03 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip
...
Safe Teleport Target
2018-09-14 15:11:18 -07:00
Anthony Thibault
b0cde2afcc
Small addition to Anim Stats
...
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
* Position - in world coordinate frame.
* Heading - the facing angle in the world corrdinate frame.
* Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
2018-09-14 15:05:17 -07:00
Zach Fox
9e50904376
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-14 14:36:22 -07:00
Gabriel Calero
72eeeac2ba
Don't popup login dialog in android
2018-09-14 14:40:30 -03:00
sam gateau
b35f09fead
Address review comments
2018-09-14 08:43:35 -07:00
Sam Gateau
eccca053f9
Clean changes
2018-09-13 23:58:40 -07:00
Sam Gateau
1438643a5f
Adding extra sanity checks on all time dependant values to avoid bad behavior maybe
2018-09-13 23:48:50 -07:00
luiscuenca
c5669ef1f5
better property names
2018-09-13 15:22:18 -07:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor
...
Fixing Error State for Timeout/localhost Redirection
2018-09-13 15:19:55 -07:00
luiscuenca
6a9a898b62
make updateCollisionCapsule private
2018-09-13 15:07:34 -07:00
luiscuenca
ceccc6d6ec
make getCollisionCapsule thread safe
2018-09-13 14:49:35 -07:00
John Conklin II
8e5f2d0e08
Merge pull request #13983 from danteruiz/disable-interstitial
...
disable interstitial by default and fix crash
2018-09-13 14:01:28 -07:00
Wayne Chen
647c4e1694
adding true fix for localhost timeouts
2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
...
Performance improvements for Avatar Mixer
2018-09-13 13:43:18 -07:00
Wayne Chen
380f24b37f
adding fix, changing window title
2018-09-13 11:53:21 -07:00
Dante Ruiz
dca34c7cbe
remove warning for GCC
2018-09-13 08:32:47 -07:00
luiscuenca
b517808bc2
Fix smaller size avatar capsule and land on detailed mesh
2018-09-12 21:24:19 -07:00
Zach Fox
01073ca18d
Lots of changes; marketplaces.js working now
2018-09-12 15:46:17 -07:00
