Leonardo Murillo
1de473a013
Fixing globals var scopt
2014-10-06 14:27:25 -06:00
Andrzej Kapolka
0d5f81c062
Merge pull request #3540 from samcake/temp0
...
replacing glutSolidSPhere by a cached Geometry
2014-10-06 12:23:44 -07:00
Clément Brisset
b8c7a9263c
Merge pull request #3544 from murillodigital/master
...
Changing bucket name
2014-10-06 11:39:52 -07:00
Leonardo Murillo
f0852ba283
Using new variable in all references to S3 bucket
2014-10-06 11:21:35 -06:00
Thijs Wenker
b7165cb353
store the last selected audio device
2014-10-05 21:11:42 +02:00
Sam Gateau
bd5c6517a5
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
...
Conflicts:
interface/src/ui/MetavoxelEditor.cpp
interface/src/ui/overlays/Sphere3DOverlay.cpp
2014-10-03 17:31:05 -07:00
Sam Gateau
738369e21f
Replacing glutSolidSphere by a cached Geometry
...
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)
- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using fOuterRadius
2014-10-03 16:55:58 -07:00
ZappoMan
23f584d9da
added file headers
2014-10-03 09:26:09 -07:00
ZappoMan
4ad10cb6cc
fix comment
2014-10-03 04:27:41 -07:00
ZappoMan
023916e7e5
Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements
2014-10-03 04:25:24 -07:00
ZappoMan
f7a8689436
hide rotate handles till implemented
2014-10-03 04:25:13 -07:00
ZappoMan
98c959d94c
implement more corner stretching
2014-10-03 04:21:44 -07:00
ZappoMan
f6fc1173e6
fix RBN stretching, tweak some names, add some additional edge grabbers to some sides
2014-10-03 03:52:57 -07:00
ZappoMan
ea0d74b957
implement TOP, BOTTOM, LEFT, RIGHT side stretching
2014-10-03 03:33:32 -07:00
ZappoMan
6207e951b6
implement FAR side stretching
2014-10-03 03:17:45 -07:00
ZappoMan
88c983cd3b
dry up some code
2014-10-03 03:12:09 -07:00
ZappoMan
4af3968e01
move XZ translation into the selection tool so that it plays nice with stretchers
2014-10-03 03:03:48 -07:00
ZappoMan
05f2263c9c
implement NEAR face stretch
2014-10-03 02:31:45 -07:00
ZappoMan
370d01b1f5
implement up/down translation
2014-10-03 01:16:26 -07:00
ZappoMan
175e5d5f79
add ray picking to 3D overlays
2014-10-02 20:44:49 -07:00
Clément Brisset
a5f524c4e5
Merge pull request #3528 from ctrlaltdavid/20049
...
CR for Job #20049 - Leap - Some fixes to Leap
2014-10-02 18:31:55 -07:00
ZappoMan
ab58a4e5b8
tweaks to translation, reduce redraws of selection handles
2014-10-02 17:58:18 -07:00
ZappoMan
d666f9ce98
Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements
...
Conflicts:
examples/editModels.js
2014-10-02 15:17:59 -07:00
ZappoMan
4ed047cf98
first pass at newEditEntities.js
2014-10-02 15:15:52 -07:00
ZappoMan
bfde23349f
moving libraries style JS files to libraries
2014-10-02 15:15:09 -07:00
ZappoMan
d0026cd529
latest selection UI features: grabbers, and rotate handles in correct locations
2014-10-02 10:19:51 -07:00
Brad Hefta-Gaub
4e752f9bb8
Merge pull request #3520 from Adrianl3d/20082
...
CR for Job #20082 - Entity properties bad readable, background is wrong sized
2014-10-02 08:35:50 -07:00
David Rowe
51f229af57
Make recalibrate Leap-on-desk if avatar head or skeleton changes
2014-10-01 18:34:56 -07:00
David Rowe
38b6d5dd5d
Make leapHands.js handle Leap-on-HMD setting changes
2014-10-01 16:05:19 -07:00
David Rowe
84a3f6e8f4
Make recalibrate Leap-on-desk if avatar scale changes
2014-10-01 15:00:19 -07:00
ZappoMan
060a690f85
moved the selection display class into own file
2014-10-01 09:46:34 -07:00
Philip Rosedale
8f40780af0
Merge pull request #3517 from ctrlaltdavid/20048
...
CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift
2014-09-30 21:06:45 -07:00
ZappoMan
c3b0700601
introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane
2014-09-30 14:52:44 -07:00
Thijs Wenker
9ba2a9736c
style
2014-09-30 22:23:40 +02:00
Thijs Wenker
eed6e2e8f6
- Edit -> Model List menu option
...
- Combo items can be JS objects now, write a toString() function for each JS object to describe them
2014-09-30 22:11:21 +02:00
ZappoMan
7fc6eecca7
added support for dashed lines for 3D Circle overlays
2014-09-30 11:27:16 -07:00
David Rowe
26cd76e07b
Position and orient hands when using Leap on HMD
2014-09-30 10:08:50 -07:00
ZappoMan
16cdc2614f
added circle overlays
2014-09-30 10:06:39 -07:00
Philip Rosedale
a07a0f4f72
Disable room limits set for demo comedy club
2014-09-30 09:57:05 -07:00
Adrianl3d
2ab38ace1b
Improved contrast to textOverlay and resize
...
Increased background alpha, increased text color, and resize to allow
for new properties.
2014-09-30 16:34:47 +10:00
ZappoMan
25b072cb22
first cut at new glowing pulsing select ui in editModels.js
2014-09-29 16:46:17 -07:00
David Rowe
c02cd66dcb
Don't calibrate avatar for Leap Motion if mounted on HMD
2014-09-28 17:19:47 -07:00
ZappoMan
cbc502553b
add rescale support to entity properties UI
2014-09-26 16:25:24 -07:00
ZappoMan
21b0e31ee1
Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites
2014-09-26 12:21:51 -07:00
ZappoMan
2d81d7c554
add support for ignore collisions and collisions will/wont move entities
2014-09-26 11:43:56 -07:00
Philip Rosedale
7c1333dcb0
Merge pull request #3486 from ZappoMan/moreWorkOnCollidingEntitites
...
Improvements to entity collisions (using shape collider)
2014-09-26 11:25:51 -07:00
Atlante45
a4a5d71caa
Merge branch 'fix_attachment_bug_with_recording' of github.com:Atlante45/hifi into radio_js
...
Conflicts:
libraries/audio/src/AudioInjector.cpp
2014-09-26 10:45:34 -07:00
Atlante45
cf925120ca
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording
2014-09-25 19:23:46 -07:00
Atlante45
3baa992bc3
Fixed radio model
2014-09-25 18:56:37 -07:00
Atlante45
11a5358a6e
Adapted radio.js to new funciton calls
2014-09-25 18:12:30 -07:00
