David Rowe
94e20d9a13
Fix login dialog keyboard
2016-10-14 14:29:14 +13:00
David Rowe
0e3cb3eabf
Merge branch 'master' into 21070
2016-10-14 13:29:38 +13: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
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
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
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
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
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
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
David Rowe
a359626316
Merge branch 'master' into 21070
2016-10-13 09:54:59 +13:00
David Rowe
e269a84d0e
Add placeholder "FIXME"s for making Web entity keyboard HMD-only
2016-10-13 09:35:39 +13:00
Andrew Meadows
867fc3ccbf
prevent avatar from recentering below ground
2016-10-12 13:23:44 -07:00
Anthony J. Thibault
aa52963e5d
Made the Grip buttons less sensitive to inadvertent squeezes.
2016-10-12 12:59:43 -07:00
David Rowe
18f19b07d4
Fix checkbox not being disabled per dropdown default
...
And tweak checkbox position.
2016-10-13 08:37:30 +13:00
Anthony J. Thibault
ba4c356d7f
Deadlock fix in avatar grab action.
...
Reverse the order we acquire the entityTree & holdActions locks, to avoid deadlocks when the network thread also acquires them.
The network thread does this when hold actions from other avatars are received.
2016-10-12 11:05:19 -07:00
David Rowe
86f6cee2ad
Fix Asset Browser add-to-world drop-down
2016-10-12 20:08:33 +13:00
David Rowe
ee31e3b896
Fix Asset Browser add-to-world with spaces unwittingly appended to names
2016-10-12 20:08:15 +13:00
Brad Davis
28771cbda9
Additional plugin debugging, better plugin resource cleanup
2016-10-11 19:40:02 -07:00
Brad Hefta-Gaub
f532affdf3
hardwire xbox to match help
2016-10-11 14:39:45 -07:00
David Rowe
49709b42d7
Merge branch 'master' into 21070
2016-10-12 09:45:34 +13:00
David Rowe
31b35f0a35
Only raise keyboard if in HMD display mode
2016-10-12 09:43:33 +13:00
Andrew Meadows
abb05bc686
Merge pull request #8753 from ctrlaltdavid/21068
...
Improve indication of user not being logged in
2016-10-11 10:40:37 -07:00
Anthony J. Thibault
ace8639f5b
Bug fixes in oculus_touch default mapping
...
* Made sticks less sensitive. Raised deadSpot min from 0.05 to 0.3.
* Fixed problem were grip and trigger was mapped to Standard triggers. This was causing all sorts of problems
with the handControllerGrab script. Including double lasers and a stuck right hand laser.
* mapped grip to standard grip. So now you can use the grip button to drop equipped objects.
* increased deadZone on grip to make inadvertent drops less likely to happen.
2016-10-10 18:42:06 -07:00
David Rowe
552f276a06
Load avatar browser dialog such that JavaScript EventBridge works
2016-10-11 11:12:57 +13:00
David Rowe
d0900ec75e
Add keyboard to avatar browser dialog
2016-10-11 10:11:36 +13:00
Chris Collins
2b8765b47e
Merge pull request #8765 from ctrlaltdavid/fix-address-bar
...
Fix address bar not being able to regain focus
2016-10-10 10:11:34 -07:00
David Rowe
827c2b015b
Update other dialogs to use single keyboard QML file
2016-10-09 11:52:30 +13:00
David Rowe
12f4b2854d
Fix address bar not being able to regain focus
2016-10-08 19:38:57 +13:00
David Rowe
5a4665b02f
Combine numeric keys into alpha keyboard QML file for scrolling windows
2016-10-08 16:27:51 +13:00
David Rowe
b954852ba9
Use temporary copy of keyboard QML file while refactoring
2016-10-08 15:23:11 +13:00
David Rowe
a934f59c2a
Fix virtual keyboard in login dialog
2016-10-08 13:37:31 +13:00
Ryan Huffman
6476dfecc6
Update help window images
2016-10-07 16:06:26 -07:00
Ryan Huffman
c995e51128
Fix compilation bugs in Application
2016-10-07 10:30:18 -07:00
Ryan Huffman
b839926396
Remove unnecessary lambda for location initialization on startup
2016-10-07 10:30:18 -07:00
Ryan Huffman
9ddeda389e
Update initial run logic
2016-10-07 10:30:18 -07:00
Ryan Huffman
20b93a7afa
Add redirection to entry on first turn if you don't have Vive
2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc
Update tutorial to work with HMD + Hand Controllers only
2016-10-07 10:30:18 -07:00
Ryan Huffman
1699299de9
Fix location that server content version is looked for
2016-10-07 10:30:18 -07:00
Ryan Huffman
37096910fc
Fix tutorial begin location
2016-10-07 10:30:18 -07:00
Ryan Huffman
9c7ea6ac7c
Update logic for going to tutorial on launch
2016-10-07 10:30:18 -07:00
Ryan Huffman
1e0772d613
Remove unused variable
2016-10-07 10:30:18 -07:00
Ryan Huffman
4c3cb83d47
Set default preferred device to vive and rift
2016-10-07 10:30:18 -07:00
