stojce
|
6d9091e35f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20091
|
2014-10-03 14:22:13 +02:00 |
|
stojce
|
420326b212
|
Layout changes
|
2014-10-03 14:21:05 +02:00 |
|
stojce
|
be5f348e22
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20061
|
2014-10-03 14:03:13 +02:00 |
|
stojce
|
f2095dacbd
|
more dialog fixes
|
2014-10-03 13:45:26 +02: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 |
|
stojce
|
e158185296
|
layout changes on update dialog
|
2014-10-03 13:20:02 +02: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
|
f59185c00b
|
allow 3d overlays to be ignored from ray intersection
|
2014-10-03 03:02:54 -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 |
|
Clément Brisset
|
89144c973d
|
Merge pull request #3527 from birarda/hydra-crash
final fix for hydra support in release installer
|
2014-10-02 18:29:59 -07:00 |
|
Andrzej Kapolka
|
bf1c7b17fe
|
Fix for texture coordinate generation.
|
2014-10-02 18:09:47 -07:00 |
|
ZappoMan
|
ab58a4e5b8
|
tweaks to translation, reduce redraws of selection handles
|
2014-10-02 17:58:18 -07:00 |
|
ZappoMan
|
a04941bcd5
|
removed some old debug
|
2014-10-02 17:56:31 -07:00 |
|
ZappoMan
|
729e40881d
|
removed some old debug
|
2014-10-02 17:55:55 -07:00 |
|
ZappoMan
|
aa634c8ff2
|
added new methods to Vec3 and Quat
|
2014-10-02 17:55:32 -07:00 |
|
Stephen Birarda
|
5786d828a0
|
pass ICE client ID through to domain-server for identification
|
2014-10-02 17:30:48 -07:00 |
|
Andrzej Kapolka
|
c67f421ea9
|
Generate additional vertices with different normals when normals differ by
"crease" angle.
|
2014-10-02 17:25:44 -07:00 |
|
Stephen Birarda
|
15cc08da97
|
initial handling of ping replies in domain-server
|
2014-10-02 17:21:11 -07:00 |
|
Stephen Birarda
|
0d4ef4aaca
|
ping connecting ICE peers from domain-server
|
2014-10-02 17:18:05 -07:00 |
|
Stephen Birarda
|
63877b0756
|
handle domain connection via ICE from NodeList
|
2014-10-02 16:51:12 -07:00 |
|
Stephen Birarda
|
c7aaf0ce4a
|
handle ping out from node requiring ice connection to domain
|
2014-10-02 16:24:46 -07:00 |
|
Stephen Birarda
|
c36774e85d
|
handle ice response packet in domain handler
|
2014-10-02 16:05:15 -07:00 |
|
Atlante45
|
a5108375b8
|
Table JSON data
|
2014-10-02 15:39:02 -07:00 |
|
Atlante45
|
61e38f545e
|
new table type
|
2014-10-02 15:38:36 -07:00 |
|
Stephen Birarda
|
956c212db2
|
manage sets of potential connections in ice server
|
2014-10-02 15:24:23 -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 |
|
Stephen Birarda
|
d26a94f84c
|
remove inactive peers from memory in IceServer
|
2014-10-02 15:00:59 -07:00 |
|
Stephen Birarda
|
970ba2296a
|
initial response from ice server to nodes
|
2014-10-02 14:50:48 -07:00 |
|
Stephen Birarda
|
8cb258e14c
|
don't use just filename when searching in application framework
|
2014-10-02 14:35:54 -07:00 |
|
Stephen Birarda
|
6425276eb0
|
have domain-server using full networking heartbeat with ice-server
|
2014-10-02 14:33:39 -07:00 |
|
Stephen Birarda
|
262054d0eb
|
handle ICE requirement in address manager response
|
2014-10-02 14:18:17 -07:00 |
|
Stephen Birarda
|
11659401ee
|
add an identifier for repeated requests to the ice server
|
2014-10-02 13:47:53 -07:00 |
|
Stephen Birarda
|
cca1c30207
|
build out more of the ice-server, make connect requests from NodeList
|
2014-10-02 13:39:58 -07:00 |
|
Andrzej Kapolka
|
27099f6dcd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-10-02 13:03:00 -07:00 |
|
Andrzej Kapolka
|
4e19cc21f6
|
Remove the "box edit" in favor of using the spanner edit.
|
2014-10-02 13:01:39 -07:00 |
|
Andrzej Kapolka
|
bce0147776
|
Added aspect fields to cuboids.
|
2014-10-02 12:51:56 -07:00 |
|
Andrzej Kapolka
|
d3761cd753
|
Cuboid shape implementation.
|
2014-10-02 12:25:19 -07:00 |
|
Ryan Huffman
|
d7f383f74a
|
Fix failure case when resizing a new model
|
2014-10-02 12:10:20 -07:00 |
|