Howard Stearns
fc8bbde60a
Merge pull request #8810 from ZappoMan/handControlsWhileLoading
...
make laser pointers work even while content is loading
2016-10-14 10:01:46 -07:00
Brad Hefta-Gaub
fb47b42ea5
Merge pull request #8807 from sethalves/fix-import-with-tmp-rez
...
fix entity-import with only tmp-rez rights
2016-10-13 22:32:02 -07:00
Brad Hefta-Gaub
3a0672ba79
Merge pull request #8811 from ZappoMan/improveTeleport
...
better handling of the teleport target overlays to prevent flashing
2016-10-13 22:27:39 -07:00
Brad Hefta-Gaub
652af860ed
Merge branch 'master' of https://github.com/highfidelity/hifi into handControlsWhileLoading
2016-10-13 20:54:24 -07:00
Brad Hefta-Gaub
4bcd8008de
Merge branch 'master' of https://github.com/highfidelity/hifi into improveTeleport
2016-10-13 20:54:03 -07:00
Brad Hefta-Gaub
964377429a
Merge pull request #8800 from jherico/openvr_crash
...
Don't crash on OpenVR activation when SteamVR isn't running
2016-10-13 20:10:55 -07:00
David Rowe
94e20d9a13
Fix login dialog keyboard
2016-10-14 14:29:14 +13:00
Brad Hefta-Gaub
ef3c9ba78a
better handling of the teleport target overlays to prevent flashing and thrashing
2016-10-13 18:24:38 -07:00
Brad Hefta-Gaub
ddce0ef74a
make laser pointers work even while content is loading
2016-10-13 17:50:20 -07:00
David Rowe
0e3cb3eabf
Merge branch 'master' into 21070
2016-10-14 13:29:38 +13:00
howard-stearns
d232d115d5
persist tablet data, and clean it up on startup
2016-10-13 16:53:44 -07:00
Brad Davis
ff3d1b3d01
Don't use VR compositor if it doesn't exist
2016-10-13 16:53:37 -07:00
Brad Davis
46326ed27c
Fix crash in switching to plugin that uses the composite framebuffer in customizeContext
2016-10-13 16:46:02 -07:00
Seth Alves
fe09a1a57c
make sure interface accepts server adjustment to lifetime, even for imported entities
2016-10-13 16:45:37 -07:00
Brad Davis
d4e83a7461
Don't crash on OpenVR activation when SteamVR isn't running
2016-10-13 16:37:50 -07:00
Chris Collins
90b283f83b
Merge pull request #8806 from huffman/fix/atp-script-cache
...
Update ScriptCache to clear ATP assets when disconnected from a domain
2016-10-13 16:30:29 -07:00
Stephen Birarda
b2a896a405
Merge pull request #8808 from huffman/fix/change-entry-to-welcome
...
Change default hifi address from dev-welcome to welcome
2016-10-13 16:25:40 -07:00
David Rowe
8f42a3fe9e
Fix keyboard state in browser when switching focus to/from dialog frame
2016-10-14 12:14:23 +13:00
Ryan Huffman
6cf4802cc2
Change default hifi address from dev-welcome to welcome
2016-10-13 16:06:07 -07:00
Brad Hefta-Gaub
4a318e5498
Merge pull request #8784 from howard-stearns/crowd-animation
...
make agent avatar animations work again, and use them in crowds
2016-10-13 16:02:41 -07:00
Ryan Huffman
7626f49ddc
Replace qDebug with qCDebug in ScriptCache
2016-10-13 15:43:28 -07:00
Seth Alves
01c1cb328f
don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP
2016-10-13 15:05:13 -07:00
Ryan Huffman
decb94b719
Update ScriptCache to clear ATP assets when disconnected from a domain
2016-10-13 14:05:53 -07:00
David Rowe
64c54f9c6b
Fix keyboard in new browser window opened from Web view
2016-10-14 10:03:52 +13:00
Brad Hefta-Gaub
0e1b377227
Merge pull request #8785 from jherico/oculus_crash
...
Additional plugin debugging, better plugin resource cleanup
2016-10-13 13:54:34 -07:00
Brad Hefta-Gaub
37e58d123e
Merge pull request #8793 from AndrewMeadows/recenter-above-ground2
...
prevent avatar from recentering below ground
2016-10-13 13:50:06 -07:00
Brad Hefta-Gaub
5638f6228b
Merge pull request #8792 from howard-stearns/allow-hmd-hand-controllers-without-interface-focus
...
allow hand controller operations when Interface doesn't have focus, but ONLY when in hmd
2016-10-13 13:48:44 -07:00
Chris Collins
7ec1e05165
Merge pull request #8791 from hyperlogic/bug-fix/avatar-hold-action-deadlock-fix
...
Deadlock fix in avatar grab action.
2016-10-13 13:48:28 -07:00
Chris Collins
635e3d1ea1
Merge pull request #8796 from hyperlogic/bug-fix/avatar-hold-action-crash-on-exit
...
Prevent crash on exit.
2016-10-13 13:23:43 -07:00
Chris Collins
8659f12a62
Merge pull request #8805 from huffman/fix/temp-rez-import
...
Fix edit.js not allowing imports when you only have temp rez permissions
2016-10-13 12:09:02 -07:00
Ryan Huffman
55d4695489
Fix edit.js not allowing imports when you only have temp rez permissions
2016-10-13 11:51:54 -07:00
Chris Collins
b41d72a9fd
Merge pull request #8777 from hyperlogic/bug-fix/oculus-touch-fixes
...
Bug fixes in oculus_touch default mapping
2016-10-13 10:57:27 -07:00
Seth Alves
b746fe2b9c
Merge pull request #8801 from flipside/master
...
changed USE_STABLE_GLOBAL_SERVICES to use 1
2016-10-13 10:56:28 -07:00
Clément Brisset
b53559a64a
Merge pull request #8795 from Atlante45/fix/content-update-window
...
Update window size automaticatlly
2016-10-13 10:53:56 -07:00
Ryan Downe Karpf
397816679d
Merge pull request #8790 from huffman/feat/reliable-path-queries
...
Update ds path queries to be reliable
2016-10-13 09:21:44 -07:00
Mat Tyndall
1966a710b5
set inital USE_STABLE_GLOBAL_SERVICES to 0
2016-10-13 00:12:05 -07:00
Mat Tyndall
0e567da8d2
changed USE_STABLE_GLOBAL_SERVICES to use 1
2016-10-13 00:01:17 -07:00
David Rowe
2343e02454
Fix a couple of QML errors
2016-10-13 18:16:21 +13:00
David Rowe
a75925d1e3
Add numeric shift
2016-10-13 14:18:21 +13:00
howard-stearns
78f96a80bd
oops
2016-10-12 16:31:12 -07:00
Anthony J. Thibault
f0dba9e766
Prevent crash on exit.
...
If you or another user begins to near-grab an object while you exit the application, you might run into this crash.
The PhysicalEntitySimulation has a list of AvatarHoldActions shared_ptr's.
When it is destroyed, via the Application destructor, it will release these pointers.
This in turn will invoke a AvatarHoldAction destructor, which attempts to reference the AvatarManager via the DependencyManager.
However at this point the AvatarManager has already been destroyed, leading to a null dereference.
The fix is to check the AvatarManager pointer first.
2016-10-12 16:29:05 -07:00
David Rowe
2ef974f729
Fix alphabetic shift
2016-10-13 12:16:02 +13:00
David Rowe
4dfe290d4a
Add comma and period keys to last row of keyboard
2016-10-13 12:02:36 +13:00
David Rowe
5d390b4722
Revise positions of keys in keyboard
2016-10-13 11:45:14 +13:00
Atlante45
4bea6f2931
Update window size automaticatlly
2016-10-12 15:18:39 -07:00
howard-stearns
b377127fc1
make marketplace tablet be clientOnly
2016-10-12 14:46:04 -07:00
howard-stearns
579c95b5dd
pr feedback
2016-10-12 14:42:41 -07:00
howard-stearns
055e2ffcb0
Merge branch 'master' of https://github.com/highfidelity/hifi into crowd-animation
2016-10-12 14:38:07 -07:00
Howard Stearns
08f3a85aab
Merge pull request #8751 from davidkelly/dk/codecInAgentAvatar
...
Have avatar sounds negotiate codecs
2016-10-12 14:32:39 -07:00
David Rowe
a359626316
Merge branch 'master' into 21070
2016-10-13 09:54:59 +13:00
