Sam Gateau
ba2d072a65
fix syntax issues for constant names and the CmakeLists.txt useless change
2014-10-06 12:15:36 -07:00
Sam Gateau
4f26c9e0fa
fix formatting and syntax issues
2014-10-06 11:06:23 -07: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
Stephen Birarda
5203113b41
separate ICE ID and domain ID for reconnections to moved domains
2014-10-03 17:01:33 -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
Stephen Birarda
e32de3208d
Merge pull request #3538 from birarda/hydra-crash
...
fix for path for hydras in installer release
2014-10-03 15:34:25 -07:00
Stephen Birarda
2ce2c9e953
add a missing slash in path for release hydra support
2014-10-03 15:33:51 -07:00
Andrzej Kapolka
7c942e1010
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-03 13:53:11 -07:00
Andrzej Kapolka
78825f0c4d
Fix for normalization crash.
2014-10-03 13:52:50 -07:00
Stephen Birarda
52ec949aac
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-03 11:26:23 -07:00
Stephen Birarda
ea0a1a4fb6
don't store domain hostname, leverage AddressManager only
2014-10-03 10:46:05 -07:00
Stephen Birarda
96aacab8ab
load Address from settings to get back to domain and path
2014-10-03 10:42:15 -07:00
Stephen Birarda
f27105100a
have AddressManager know its current domain and current path
2014-10-03 10:29:02 -07:00
Philip Rosedale
56c71b667b
Merge pull request #3530 from ZappoMan/editToolsImprovements
...
Experimental Version of new Entity Editing UI/UX
2014-10-03 10:26:09 -07:00
ZappoMan
6846426f23
CR feedback
2014-10-03 10:13:56 -07:00
ZappoMan
cd6adb8f28
CR feedback
2014-10-03 10:13:09 -07:00
ZappoMan
f6b8a51074
CR feedback
2014-10-03 10:03:54 -07:00
ZappoMan
46d96c22fa
CR feedback
2014-10-03 10:01:58 -07:00
ZappoMan
602404c569
CR feedback
2014-10-03 09:55:29 -07:00
ZappoMan
4ab0a8e13d
CR feedback
2014-10-03 09:49:54 -07:00
ZappoMan
00799e39e1
CR feedback
2014-10-03 09:48:54 -07:00
ZappoMan
467e9b1831
CR feedback
2014-10-03 09:47:17 -07:00
ZappoMan
515789927b
fix float defines from CR feedback
2014-10-03 09:43:46 -07:00
Philip Rosedale
84b2bc14c0
Merge pull request #3526 from ey6es/metavoxels
...
Tweaks to the way dual contour edits are performed, added cuboid shape and made snapping to grid optional for boxes.
2014-10-03 09:08:18 -07:00
ZappoMan
023916e7e5
Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements
2014-10-03 04:25:24 -07:00
ZappoMan
f59185c00b
allow 3d overlays to be ignored from ray intersection
2014-10-03 03:02:54 -07:00
ZappoMan
175e5d5f79
add ray picking to 3D overlays
2014-10-02 20:44:49 -07:00
ZappoMan
a04941bcd5
removed some old debug
2014-10-02 17:56:31 -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
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
Stephen Birarda
8cb258e14c
don't use just filename when searching in application framework
2014-10-02 14:35:54 -07:00
Stephen Birarda
262054d0eb
handle ICE requirement in address manager response
2014-10-02 14:18:17 -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
Stephen Birarda
138e57bcd8
don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD
2014-10-02 11:16:25 -07:00
ZappoMan
5bcbfe96b8
add alpha color support to billboard overlay
2014-10-02 10:19:08 -07:00
ZappoMan
b2e725c964
add dashed line support to cube overlay
2014-10-02 10:18:42 -07:00
Stephen Birarda
172ee3d7dc
add failsafe for hydra load, look in app frameworks folder
2014-10-02 09:06:29 -07:00
Andrzej Kapolka
42e95f2b38
Working on spanner metavoxel edits.
2014-10-01 18:46:23 -07:00
Andrzej Kapolka
1ca212f43d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-01 11:55:27 -07:00
ZappoMan
94c2540db0
add dashed line drawing to Base3DOverlay and 3d line and rectangle overlays
2014-10-01 09:45:20 -07:00
ZappoMan
7a9be9e5b9
implement support for localRenderAlpha property in the rendering portion of entities
2014-10-01 09:43:59 -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
Andrzej Kapolka
14267e3902
Layout tweak.
2014-09-30 15:42:33 -07:00
Andrzej Kapolka
add7ad4d4e
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-30 15:21:27 -07:00
Andrzej Kapolka
5d2f6b98e2
Added erase buttons, initialize color editor on creation.
2014-09-30 15:20:24 -07:00
Andrzej Kapolka
70847ff3f9
Allow painting boxes that aren't grid-aligned; merged color and material
...
tools.
2014-09-30 14:53:19 -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
fd21d100f6
line indention fixes
2014-09-30 22:37:29 +02:00
