Atlante45
|
e246b979f7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus
|
2014-12-03 17:50:17 -08:00 |
|
Brad Hefta-Gaub
|
c901b8d1eb
|
Merge pull request #3895 from AndrewMeadows/thermonuclear
fix for non-animating models
|
2014-12-03 17:26:00 -08:00 |
|
Atlante45
|
8d814ab07b
|
Updated Oculus pickray
|
2014-12-03 17:05:42 -08:00 |
|
Atlante45
|
bd39688c62
|
Magnifiy window tweaks
|
2014-12-03 17:04:26 -08:00 |
|
Andrew Meadows
|
ab011d5b30
|
fix for non-animating models
|
2014-12-03 16:49:49 -08:00 |
|
Andrzej Kapolka
|
6764f29cd2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-12-03 16:49:10 -08:00 |
|
Andrzej Kapolka
|
8fb766a5d0
|
Only recreate the renderers for nodes that have changed.
|
2014-12-03 16:44:13 -08:00 |
|
Atlante45
|
0624ab7c72
|
Fixed aspect ratio and cropped overlay texture
|
2014-12-03 16:04:23 -08:00 |
|
ZappoMan
|
cd92185c5b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork
Conflicts:
examples/newEditEntities.js
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
libraries/entities/src/EntityTree.h
|
2014-12-03 15:07:47 -08:00 |
|
Philip Rosedale
|
abd54a4d7b
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-12-03 15:06:29 -08:00 |
|
Ryan
|
f2952b2fef
|
Merge remote-tracking branch 'hifi/master'
|
2014-12-03 15:05:32 -08:00 |
|
Atlante45
|
73004d1bee
|
Decoupled reticules from Overlays view
|
2014-12-03 14:40:47 -08:00 |
|
Brad Hefta-Gaub
|
96c3bfceef
|
Merge pull request #3889 from huffman/entity-tools-polish-2
Entity tools polish - round 2
|
2014-12-03 14:31:27 -08:00 |
|
Brad Hefta-Gaub
|
f10b656877
|
Merge pull request #3870 from AndrewMeadows/thermonuclear
pull entity simulation out of EntityTree
|
2014-12-03 14:30:44 -08:00 |
|
Andrzej Kapolka
|
7a81e6c9e1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-12-03 14:30:31 -08:00 |
|
Sam Gateau
|
322dd38322
|
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
|
2014-12-03 14:23:49 -08:00 |
|
Andrzej Kapolka
|
f76ff6a70a
|
Merge pull request #3894 from ey6es/master
Bump up the glyph texture size so that we don't spill over into another
|
2014-12-03 14:19:55 -08:00 |
|
Andrzej Kapolka
|
df23a84cc2
|
Bump up the glyph texture size so that we don't spill over into another
texture.
|
2014-12-03 14:18:47 -08:00 |
|
Sam Gateau
|
913007939b
|
Trying to read the light attribute
|
2014-12-03 14:12:50 -08:00 |
|
Philip Rosedale
|
5c59fc786d
|
Merge pull request #3893 from ey6es/master
Fixes for erroneous download percentages (resources and metavoxels); warning fix, metavoxel edit fix.
|
2014-12-03 14:03:07 -08:00 |
|
Ryan Huffman
|
d08337326c
|
Update selection box color to red
|
2014-12-03 12:59:51 -08:00 |
|
Andrzej Kapolka
|
fecb225a06
|
Prevent erroneous resource download percentages; Qt reports the total bytes as
-1 before the actual size is available.
|
2014-12-03 12:55:58 -08:00 |
|
Andrzej Kapolka
|
88048e8599
|
Make sure the position of the heightfield/voxel brush is valid before acting.
|
2014-12-03 12:47:32 -08:00 |
|
Andrzej Kapolka
|
d975e3f0ce
|
Fixed signed/unsigned warnign.
|
2014-12-03 12:38:10 -08:00 |
|
Andrzej Kapolka
|
1e93137e6b
|
Fix for overflow when computing metavoxel stats.
|
2014-12-03 12:24:58 -08:00 |
|
Andrzej Kapolka
|
e32c214e4d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-12-03 12:08:06 -08:00 |
|
Ryan
|
556e9477c8
|
Merge remote-tracking branch 'hifi/master'
|
2014-12-03 11:14:49 -08:00 |
|
Stephen Birarda
|
f0b0c5fe0b
|
change warp button to button face right
|
2014-12-03 11:08:41 -08:00 |
|
Philip Rosedale
|
d34bf8ccd3
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-12-03 10:55:43 -08:00 |
|
Ryan
|
623af78f88
|
Merge remote-tracking branch 'hifi/master'
|
2014-12-03 10:54:59 -08:00 |
|
Brad Hefta-Gaub
|
f70f07e694
|
Merge pull request #3890 from PhilipRosedale/master
When in HMD, arrow keys make jump turns
|
2014-12-03 10:54:22 -08:00 |
|
Philip Rosedale
|
f897e2290d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-12-03 10:54:09 -08:00 |
|
Ryan
|
b3eccf1ced
|
Merge remote-tracking branch 'hifi/master'
|
2014-12-03 10:53:14 -08:00 |
|
Philip Rosedale
|
790d3c1cc6
|
Merge pull request #3892 from birarda/master
fix filename/URL discrepancy for local scripts
|
2014-12-03 10:51:35 -08:00 |
|
ZappoMan
|
5f9c1c490b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork
|
2014-12-03 10:44:56 -08:00 |
|
Stephen Birarda
|
98f56aaa0c
|
fix URL/filename discrepancy for local scripts
|
2014-12-03 09:55:55 -08:00 |
|
Sam Gateau
|
fc9dfd8d14
|
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
|
2014-12-03 09:16:43 -08:00 |
|
Ryan Huffman
|
5c5c66b265
|
Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-polish-2
|
2014-12-03 08:40:38 -08:00 |
|
Philip Rosedale
|
a549b4b152
|
Merge pull request #3891 from birarda/master
fix for delayed domain-server heartbeats
|
2014-12-03 08:40:10 -08:00 |
|
Stephen Birarda
|
49a087018f
|
fix for delayed heartbeats, late socket lookup
|
2014-12-03 08:22:50 -08:00 |
|
Stephen Birarda
|
b346813250
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-12-03 08:03:23 -08:00 |
|
Philip Rosedale
|
d63ace9f61
|
fix angular velocity from oculus, tweak hair
|
2014-12-02 23:53:46 -08:00 |
|
Philip Rosedale
|
57e2f71bb7
|
remove unused body delta pitch, roll
|
2014-12-02 23:24:47 -08:00 |
|
Philip Rosedale
|
3ca20a7eee
|
Add jump/warp turning when in HMD
|
2014-12-02 23:08:34 -08:00 |
|
Andrzej Kapolka
|
94d0612804
|
Fix for Hermite display.
|
2014-12-02 20:17:18 -08:00 |
|
Andrzej Kapolka
|
1a1b1ca3f3
|
Fix for voxelizing heightfields.
|
2014-12-02 19:49:27 -08:00 |
|
Andrzej Kapolka
|
8669398048
|
Voxelization bits.
|
2014-12-02 19:14:33 -08:00 |
|
Ryan Huffman
|
4e78003520
|
Fix issue with selection boxes not being hidden
|
2014-12-02 18:03:00 -08:00 |
|
Ryan Huffman
|
f25d509363
|
Remove unused lastPlaneIntersection
|
2014-12-02 17:50:34 -08:00 |
|
Ryan Huffman
|
aa067bc153
|
Update UpDown translation to follow the mouse as other tools do
|
2014-12-02 17:49:25 -08:00 |
|