sam gateau
cc0019479a
fixing review comments
2018-09-25 14:07:07 -07:00
sam gateau
e41b8f06e1
Cleaning up the pipeline and checking that it is working for all cases
2018-09-25 13:57:50 -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
sabrina-shanman
55ab0a394b
Return std::make_shared
2018-09-25 12:21:22 -07:00
SamGondelman
21cd3948ae
improve blender queuing
2018-09-25 12:07:05 -07:00
sabrina-shanman
6e83e96d1c
Check type in Pointer::getPickResultCopy
2018-09-25 12:05:47 -07:00
Wayne Chen
1394d06480
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements
2018-09-25 10:52:47 -07:00
Anthony Thibault
b6d7b9b544
spelling
2018-09-25 10:44:00 -07:00
Anthony Thibault
a41591323b
Code review feedback.
2018-09-25 10:42:43 -07:00
sabrina-shanman
660bdf36d0
Check if pick result is null when building visual pick result
2018-09-25 09:56:51 -07:00
luiscuenca
1e34d3aa35
Remove not needed code
2018-09-25 09:22:33 -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
Ryan Huffman
af897bdef2
Fix models with 1^3 dimensions never being resized
2018-09-25 09:13:59 -07:00
luiscuenca
af2935187b
Fix warnings
2018-09-25 08:32:43 -07:00
sam gateau
9f16024616
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-25 08:27:38 -07:00
luiscuenca
0676f25e31
Save transit preferences
2018-09-25 07:42:28 -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
Kerry Ivan Kurian
ff83713365
Use persistent object id counter
2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830
Implement delete-from-list functionality in marketplace item tester
2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841
Resolve merge conflicts
2018-09-25 00:57:43 -07:00
David Rowe
af1b4fef5d
Modify layout of rotation mode settings options
2018-09-25 18:03:57 +12:00
Sam Gateau
69734ce21b
Getting better'
2018-09-24 22:34:43 -07:00
Kerry Ivan Kurian
0a43c17ce0
Use entity-specific glyphs in marketplace item tester
2018-09-24 21:15:08 -07:00
David Rowe
a00cacc03e
Fix post-teleport display; hide immediately avatar moves
2018-09-25 16:02:19 +12:00
Zach Fox
1ac2800e18
Fix wallet dot logic
2018-09-24 17:50:37 -07:00
sabrina-shanman
5dbebd4aae
Add comment explaining why visualPickResult is a copy
2018-09-24 17:36:24 -07:00
sam gateau
7cf7eaa7c8
Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape
2018-09-24 17:34:42 -07:00
Zach Fox
be304ea975
Small bugfixes again
2018-09-24 17:33:23 -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
David Rowe
03f0b95a3f
Fix unwanted hexagonal occlusion artefact
2018-09-25 12:03:41 +12:00
Anthony Thibault
fa27bb7e11
Bug fix for Vive puck calibration of hands and feet
...
Before this PR, there were small errors that can occur if you calibrate while not facing down the z-axis in vive sensor space.
As indicated by the small arrow in the steam vr grid.
The hands could end up flipped 180 degrees and the feet could end up with an incorrect offset resulting in a wider or narrower stance then expected.
This PR is intended to fix these issues.
2018-09-24 16:56:22 -07:00
David Rowe
7396bf0dbe
Immediately hide post-teleport play area if start teleporting again
2018-09-25 11:39:41 +12:00
David Rowe
06b4f51a08
Misc fixes
2018-09-25 11:33:08 +12:00
Kerry Ivan Kurian
697f556a60
Persist list of marketplace items in test
...
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
2018-09-24 16:30:49 -07:00
Andrew Meadows
a3f946dee1
activate OtherAvarar in physics sim on position change
2018-09-24 16:27:37 -07:00
Roxanne Skelly
e3943f210d
Save 'enabled' configuration between restarts
2018-09-24 16:16:56 -07:00
David Rowe
90ef109476
Remove superseded Pointers API functions
2018-09-25 11:11:53 +12:00
Dante Ruiz
57ae8ff8a1
update interstitial page stability count and loading bar
2018-09-24 16:09:53 -07:00
Roxanne Skelly
c1d2f00c9b
Fix url.toString()
2018-09-24 15:45:38 -07:00
David Rowe
4927ffece3
Misc fixes
2018-09-25 10:33:49 +12:00
Wayne Chen
69d5299362
patching fix for previous commits
2018-09-24 15:22:46 -07:00
David Rowe
991ceb643c
Fix teleport not working after script reload in HMD mode
2018-09-25 10:18:52 +12:00
Brad Davis
72fc686ec1
Fix timer managmement during shutdown
2018-09-24 14:52:13 -07:00
David Rowe
858abaf6fc
Fix sensor overlays not displaying after re-enter HMD mode
2018-09-25 09:49:11 +12:00
Zach Fox
a76c3f028d
Small bugfixes
2018-09-24 14:46:00 -07:00