Seth Alves
a9aa6df93e
Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1
2017-09-12 10:44:29 -07:00
Seth Alves
315f874824
add profiling to controller-dispatcher
2017-09-12 10:44:09 -07:00
Seth Alves
2850029f26
add profiling to controller-dispatcher
2017-09-12 10:00:32 -07:00
Seth Alves
14965da1b2
Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1
2017-09-12 09:23:39 -07:00
druiz17
684aef23dc
Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1
2017-09-11 15:08:37 -07:00
druiz17
d78262f2f5
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-11 15:07:39 -07:00
druiz17
a46e41607c
fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown
2017-09-11 15:07:14 -07:00
anshuman64
996277b34c
Merge pull request #11335 from vladest/menu_fix
...
Make sure root item is created before lambda gets called for desktop …
2017-09-11 12:47:40 -07:00
vladest
34c1cb6579
Typos and naming fixes
2017-09-11 19:42:05 +02:00
Howard Stearns
54deef8f32
Merge pull request #11329 from davidkelly/dk/walletSSLFix
...
fix wallet for new openssl
2017-09-11 10:07:12 -07:00
Seth Alves
819f6581f3
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-11 09:34:43 -07:00
Andrew Meadows
a9feca18ca
Merge pull request #11317 from vladest/fix_flickable_on_wheel
...
Add flickable on mouse wheel to web pages
2017-09-11 09:32:31 -07:00
Andrew Meadows
ce3ed68861
Merge pull request #11333 from ctrlaltdavid/faster-fade-in
...
Reduce entity fade-in time
2017-09-11 09:29:45 -07:00
Chris Collins
47a9337aa7
Merge pull request #11323 from jherico/mac_fixes
...
Mac fixes
2017-09-11 09:10:50 -07:00
druiz17
826cb9e909
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-11 08:45:13 -07:00
Andrew Meadows
1f766f743d
Merge pull request #11293 from jherico/fix_hmd_menu
...
Fix access to menu on background thread
2017-09-11 08:26:04 -07:00
Andrew Meadows
f7ca6a45b6
Merge pull request #11299 from jherico/cleanup_cmake
...
Cleanup CMake
2017-09-11 08:21:30 -07:00
vladest
dfaa8761e5
Make sure root item is created before lambda gets called for desktop loader
2017-09-10 20:08:40 +02:00
David Rowe
6ba6c6ee35
Reduce entity fade-in time
2017-09-09 18:00:21 +12:00
Dante Ruiz
eb3b61ceed
Merge pull request #7 from sethalves/controller-dispatcher-1
...
Controller dispatcher 1
2017-09-08 17:13:17 -07:00
Seth Alves
9c098f1a0c
Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1
2017-09-08 17:10:02 -07:00
druiz17
bf1b5bd061
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 17:07:47 -07:00
druiz17
405d8c3afc
fixing cloning and laser
2017-09-08 17:07:27 -07:00
Seth Alves
a1ffc7abd0
distance from controller to object is sometimes decided by pickray
2017-09-08 17:04:09 -07:00
Seth Alves
56d5f587b6
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 17:03:29 -07:00
David Kelly
1903f65e45
oops
2017-09-08 16:58:12 -07:00
Seth Alves
f5d77104c3
Merge pull request #11332 from sethalves/squelch-cannot-render
...
suppress repeated 'item could not be rendered' messages
2017-09-08 16:23:22 -07:00
David Kelly
0a3958f743
cr feedback
2017-09-08 16:06:30 -07:00
Seth Alves
eddf1efb6f
Merge branch 'squelch-cannot-render' of github.com:sethalves/hifi into controller-dispatcher-1
2017-09-08 15:32:54 -07:00
Anthony Thibault
3de518a843
Merge pull request #11331 from hyperlogic/bug-fix/unexpected-t-pose
...
Fix MyAvatar getting stuck in T-pose on loading
2017-09-08 15:18:57 -07:00
druiz17
42ef397b5e
fixed include path
2017-09-08 15:13:19 -07:00
Seth Alves
967d3f69d3
suppress repeated 'item could not be rendered' messages
2017-09-08 14:13:58 -07:00
David Kelly
99cdbbe306
and lets fix the purchases flow too
2017-09-08 14:00:09 -07:00
druiz17
5d1a5eea4c
added test file
2017-09-08 13:45:45 -07:00
druiz17
b3e2c7ac56
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 13:30:48 -07:00
druiz17
e33012e522
laser on tablet update
2017-09-08 13:30:30 -07:00
David Kelly
c142215935
oops -- this is a windows-only thing (like so many other problems)
2017-09-08 12:52:12 -07:00
Sam Gateau
ed8aa8b74d
Merge pull request #11160 from Zvork/outline
...
Outline effect
2017-09-08 12:32:01 -07:00
druiz17
dbb91e5953
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 11:50:43 -07:00
druiz17
f0c12e50dd
some small bug fixes
2017-09-08 11:50:19 -07:00
David Kelly
3e0b222ec4
fix wallet for new openssl
2017-09-08 11:44:19 -07:00
Anthony J. Thibault
559ac6786d
Fix MyAvatar getting stuck in T-pose on loading
...
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene(). They both would end up setting the
Model::_addedToScene flag. This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
2017-09-08 11:44:06 -07:00
Bradley Austin Davis
48b6586d01
Modifying SDL initialization due to crash on OSX
2017-09-08 11:36:32 -07:00
David Kelly
db0ecb61fd
Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework
...
Use new hfc account endpoint
2017-09-08 09:03:53 -07:00
David Kelly
45c8dd9dd4
cr feedback
2017-09-08 05:28:41 -07:00
Olivier Prat
d6d36cbd43
Outline working on voxels
2017-09-08 11:14:06 +02:00
David Kelly
bb07a586ca
warning, plus salting passphrase now
2017-09-07 19:24:31 -07:00
David Kelly
efdc340c5c
Use new hfc account endpoint
2017-09-07 18:15:04 -07:00
Melissa Brown
cb2911f3e0
Merge pull request #11305 from cain-kilgore/delete-test-plan
...
Deleted unnecessary Test Plan 2.docx
2017-09-07 16:59:53 -07:00
Bradley Austin Davis
eb8b892571
Various Mac fixes
2017-09-07 14:45:35 -07:00
