Anthony J. Thibault
8f78a0624c
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-11 10:16:51 -08:00
Brad Davis
7204f9af8e
Merge pull request #6805 from ctrlaltdavid/20771
...
Fix display of File > About Interface window
2016-01-11 01:44:49 -05:00
David Rowe
9068d55998
Fix display of File > About Interface window
2016-01-11 15:58:00 +13:00
Brad Hefta-Gaub
c50e816074
Merge pull request #6803 from jherico/vr_menu_fit
...
Ensure VR menus never render off the overlay
2016-01-10 13:45:10 -08:00
Brad Davis
d74686474a
Ensure VR menus never render off the overlay
2016-01-10 11:39:47 -08:00
Seth Alves
27e56a9ced
Merge pull request #6801 from huffman/fix-agent-parent-finder
...
Fix AssignmentParentFinder not handling null parentID
2016-01-09 19:01:02 -08:00
Ryan Huffman
46ed5f6479
Fix AssignmentParentFinder not handling null parentID
2016-01-09 14:27:57 -08:00
Anthony J. Thibault
8e915733f0
added place holder right hand open/searching animation
2016-01-08 17:15:18 -08:00
Ryan Downe Karpf
1131222472
Merge pull request #6797 from ZappoMan/menuGroups
...
More tweaks to menus
2016-01-08 13:46:05 -08:00
Brad Hefta-Gaub
86691d5d0e
remove vsync and framerate menus from 2d display plugin
2016-01-08 13:12:43 -08:00
Brad Hefta-Gaub
e70be2d8fe
more menu rework
2016-01-08 11:58:13 -08:00
Anthony J. Thibault
4c1ad6900d
handControllerGrab.js: removed previous animationStateHandler
...
Which was conflicting with the new HandAnimationBuddy animationStateHandler
2016-01-08 11:28:02 -08:00
Brad Hefta-Gaub
b9068d0738
fix selectAudioDevice.js to honor new menu spec
2016-01-08 11:22:21 -08:00
Brad Hefta-Gaub
fb484584e4
fix edit.js to honor new menu spec
2016-01-08 11:21:55 -08:00
Brad Hefta-Gaub
0f52b82c21
allow scripted addMenu() to specify grouping
2016-01-08 11:21:37 -08:00
Philip Rosedale
d5c8689843
Merge pull request #6793 from sethalves/fix-get-query-aabox
...
fix queryAABox bug
2016-01-08 09:49:27 -08:00
Anthony J. Thibault
cac19b8579
grab animation work
...
Hand animations now have 5 states:
* idle
* open
* grasp
* point
* farGrasp
The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.
Also, removed hand trigger AnimVar setting from C++ Rig class.
2016-01-07 19:36:57 -08:00
Anthony J. Thibault
c2736cb68c
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-07 16:58:10 -08:00
Seth Alves
8e199e0457
Merge pull request #6794 from hyperlogic/tony/soft-avatar-attachment-script
...
Added avatarAttachmentTest.js script
2016-01-07 16:41:41 -08:00
Seth Alves
31bed934fe
fix bug caused by accidental reuse of variable -- queryAABox was often of size 1 rather than the correct dimensions
2016-01-07 16:27:14 -08:00
Brad Hefta-Gaub
4c1ffcdb86
Merge pull request #6792 from jherico/qml_moves
...
movable audio bar
2016-01-07 16:17:07 -08:00
Anthony J. Thibault
5d19de76ab
Added avatarAttachmentTest.js script
2016-01-07 16:15:24 -08:00
Anthony J. Thibault
7bef1ebdac
Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script
2016-01-07 16:14:52 -08:00
Anthony J. Thibault
031f59b7b5
Support for adding soft attachments from script.
...
Also, bug fixes for setting MyAvatar.attachmentData property.
2016-01-07 16:12:36 -08:00
Brad Davis
35e17b7604
movable audio bar
2016-01-07 15:43:51 -08:00
Brad Davis
3a7ec33d38
Merge pull request #6790 from ZappoMan/menuGroups
...
Menu restructuring
2016-01-07 17:48:20 -05:00
Brad Hefta-Gaub
45b85735d3
disable the not yet implemented menu items
2016-01-07 14:37:42 -08:00
Brad Hefta-Gaub
e9ec561a55
add separator in View menu
2016-01-07 14:28:44 -08:00
Brad Hefta-Gaub
cdc982c6e5
mini mirror off by default
2016-01-07 14:22:20 -08:00
Brad Hefta-Gaub
a8383238e4
make mini mirror a standard option
2016-01-07 13:46:55 -08:00
Philip Rosedale
c5ab29071e
Merge pull request #6791 from jherico/qml_hang
...
Stop QML hanging the app on shutdown
2016-01-07 13:29:47 -08:00
Brad Hefta-Gaub
04a5f5ce1b
remove dead code for friends, since its handled by users.js
2016-01-07 13:26:03 -08:00
Philip Rosedale
3e8f26d591
Merge pull request #6789 from jherico/url_loop
...
Stop looping on URL fixing
2016-01-07 13:10:54 -08:00
Brad Hefta-Gaub
d51f514281
reworking of view/camera mode to match spec
2016-01-07 12:42:18 -08:00
Brad Davis
660304a0a3
Stop QML hanging the app on shutdown
2016-01-07 12:25:25 -08:00
Brad Hefta-Gaub
1508a637ab
Menu restructuring
2016-01-07 12:09:02 -08:00
Seth Alves
bc538a0f7d
Merge pull request #6756 from AndrewMeadows/physics-cleanup-003
...
more correct management of MotionState pointers
2016-01-07 11:04:28 -08:00
Andrew Meadows
8ae1e750ab
Merge pull request #6783 from sethalves/fix-h0ld-action
...
try harder to ensure that a held object is active in bullet
2016-01-07 10:53:55 -08:00
Andrew Meadows
0df920d9a3
Merge pull request #6718 from birarda/master
...
cleanup QTimer management in ThreadedAssignment
2016-01-07 10:53:35 -08:00
Brad Davis
144af19ebd
Stop looping on URL fixing
2016-01-07 10:52:28 -08:00
Seth Alves
cf9af462b5
replace some logging with an assert
2016-01-07 10:21:39 -08:00
Andrew Meadows
42711e5bad
remove unused variable
2016-01-07 10:20:03 -08:00
Andrew Meadows
36e19b43c9
add some comments; specify const and overrides
2016-01-07 10:19:46 -08:00
Andrew Meadows
c1206ca73d
fix bad merge
2016-01-07 10:19:46 -08:00
Andrew Meadows
4f29156da1
fixing asserts for EntityItem delete pipeline
2016-01-07 10:19:46 -08:00
Andrew Meadows
e0ec941476
fix typo
2016-01-07 10:19:46 -08:00
Andrew Meadows
6a642bdcf8
fix misusage of smart-pointers
2016-01-07 10:19:46 -08:00
Andrew Meadows
e8e965d548
fix crash mode for empty LineEntityItem
2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Andrew Meadows
8886f48c78
minor cleanup
2016-01-07 10:19:46 -08:00
