Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37358 commits 71 branches 56 tags 1.2 GiB
Commit graph

37358 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
9068d55998 Fix display of File > About Interface window 2016-01-11 15:58:00 +13:00
Philip Rosedale
e4855b7595 Script that drops different kinds of entities near you 2016-01-10 15:34:46 -08: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
Brad Hefta-Gaub
d8ced32879 fix mac/unix build buster 2016-01-08 21:37:00 -08:00
Zach Pomerantz
407c1bc626 Handle out-of-range in render::FetchItems 2016-01-08 20:16:08 -08:00
Zach Pomerantz
293e432fe9 Fix setter named getFocalLength 2016-01-08 20:14:44 -08:00
Zach Pomerantz
c1e8fe88e4 Fix shader typo (ambien->ambient) 2016-01-08 20:14:31 -08:00
Zach Pomerantz
ea8bdd5728 Change pipeline initialization to depend on class, not global pipelineLib state 2016-01-08 20:14:08 -08:00
Zach Pomerantz
bf68f2f2fa Templatize item culling 2016-01-08 20:11:52 -08:00
Anthony J. Thibault
8e915733f0 added place holder right hand open/searching animation 2016-01-08 17:15:18 -08:00
Zach Pomerantz
c8d3342aca Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-08 17:04:02 -08:00
Brad Hefta-Gaub
e2a3903def add support for advanced/developer plugins and change diplay modes to match spec 2016-01-08 16:58:25 -08:00
ericrius1
a66bc791a3 directory.js - icon is now movable and persistent 2016-01-08 16:33:51 -08:00
ericrius1
7e7424ec2b Removed marketplace icon from edit menu 2016-01-08 16:22:10 -08:00
ericrius1
b3f19ef4d6 separating out marketplace 2016-01-08 16:08:43 -08:00
Zach Pomerantz
56aba41299 Rename ShapeRender to DeferredPipelineLib 2016-01-08 14:02:49 -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
Zach Pomerantz
d8a3ae70a7 Conform to coding standard 2016-01-07 17:02:15 -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
David Rowe
6eed6a0bc3 Merge branch 'master' into 20763 2016-01-08 13:13:39 +13: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
Zach Pomerantz
695c69fd34 Conform to coding standards 2016-01-07 14:26:59 -08:00
Brad Hefta-Gaub
cdc982c6e5 mini mirror off by default 2016-01-07 14:22:20 -08:00
Zach Pomerantz
c19b457401 Forward arguments and mark T::JobModel as dependent name 2016-01-07 14:15:01 -08:00
Brad Hefta-Gaub
a8383238e4 make mini mirror a standard option 2016-01-07 13:46:55 -08:00
Zach Pomerantz
e809c4f89d Avoid copying Item before rendering 2016-01-07 13:42:56 -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
Zach Pomerantz
1b3e144395 Rename Shape to ShapePipelineLib, Shape.h to ShapePipeline.h 2016-01-07 13:29:35 -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
David Rowe
fc2bf8f585 Miscellaneous code tidying, noticed in passing 2016-01-08 10:17:36 +13:00