Zach Pomerantz
4ff2b85e1a
Replace ShapePipelineLib abstract with ShapePlumber instanced class
2016-01-11 16:00:08 -08:00
Brad Hefta-Gaub
511ad76092
Merge pull request #6800 from jherico/running_scripts
...
Moving running scripts functionality to scripting library
2016-01-11 15:01:55 -08:00
Chris Collins
9c5cdfaa61
Merge pull request #6809 from hyperlogic/tony/transform-post-mult-fix
...
Bug fix for Transform.postScale() with non-uniform scale.
2016-01-11 14:38:16 -08:00
Brad Hefta-Gaub
f7b22622cc
Merge pull request #6810 from jherico/oculus_crash_fix
...
Ensure Oculus session is valid before base class activation
2016-01-11 14:21:28 -08:00
samcake
e593bb4245
Merge pull request #6788 from zzmp/refactor/render-job-task2
...
Promote render::Job to render::Task, render::Job::Varying to render::Varying
2016-01-11 13:52:36 -08:00
Brad Davis
e58f99c989
Ensure Oculus session is valid before base class activation
2016-01-11 13:07:02 -08:00
Brad Davis
d1d178787c
PR comments
2016-01-11 12:55:23 -08:00
Brad Davis
d28f80aa07
Moving running scripts functionality to scripting library
2016-01-11 12:44:03 -08:00
Brad Hefta-Gaub
ddd9b0826b
Merge pull request #6798 from ericrius1/menuTweaks
...
separating out marketplace icon from edit toolbar and making directory icon from directory.js movable and persistent
2016-01-11 12:20:12 -08:00
Anthony J. Thibault
e4e4cb0110
Bug fix for Transform.postMult() with non-uniform scale.
...
Previously it would not flag the matrix as non-uniform, this would
cause some operations (such as inverse) to be incorrect.
2016-01-11 12:03:44 -08:00
Brad Davis
e07753b66f
Merge pull request #6799 from ZappoMan/menuGroups
...
add support for advanced/developer plugins and change diplay modes to…
2016-01-11 14:39:16 -05:00
Brad Hefta-Gaub
c0cf717a04
CR feedback
2016-01-11 11:13:33 -08:00
Brad Hefta-Gaub
dfba05ae5f
CR feedback
2016-01-11 11:07:07 -08:00
Anthony J. Thibault
3d8f8e5618
Set WANT_DEBUG_STATE to false
2016-01-11 10:39:27 -08:00
Anthony J. Thibault
8f78a0624c
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-11 10:16:51 -08:00
Clément Brisset
5332873273
Merge pull request #2 from zzmp/fix/render-shape
...
General fixes to rendering
2016-01-11 09:52:57 -08:00
Philip Rosedale
b8565358ff
Added basic energy bar example
2016-01-11 09:16:33 -08:00
Brad Hefta-Gaub
3e05d95478
Merge branch 'master' of https://github.com/highfidelity/hifi into menuGroups
2016-01-11 09:09:37 -08:00
ericrius1
8182372e02
Made drag selection area bigger for marketplace and directory icons. Added marketplace.js to default scripts
2016-01-11 08:39:34 -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
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
