Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-25 04:46:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17421 commits 28 branches 28 tags 1.2 GiB
Commit graph

9067 commits

Author SHA1 Message Date
AndrewMeadows
f284fc548f Merge pull request #3539 from ey6es/metavoxels 
Blend between directional textures on dual contour surfaces.
 2014-10-06 08:00:24 -07:00
AndrewMeadows
85a2d297d4 Merge pull request #3535 from stojce/20061 
CR for Job #20061 - Style our address bar / "go to" UI
 2014-10-06 07:57:00 -07:00
AndrewMeadows
a91d66d8bb Merge pull request #3533 from stojce/20091 
CR for Job #20091 - Windows : Popup to download update is unreadable on Windows (see attached screenshot)
 2014-10-06 07:53:44 -07:00
Andrzej Kapolka
1f10b1744f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-03 17:19:13 -07:00
Andrzej Kapolka
91942e6188 Reduce the size of the smoothing step. 2014-10-03 17:17:22 -07:00
Andrzej Kapolka
3d88463569 Blend between cube face textures. 2014-10-03 17:05:14 -07:00
Stephen Birarda
5203113b41 separate ICE ID and domain ID for reconnections to moved domains 2014-10-03 17:01:33 -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
stojce
a1d3e3289c close icon size fix 2014-10-03 14:51:29 +02:00
stojce
429ddd7115 address bar style fix 2014-10-03 14:30:03 +02:00
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
023916e7e5 Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements 2014-10-03 04:25:24 -07:00
stojce
e158185296 layout changes on update dialog 2014-10-03 13:20:02 +02: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
Andrzej Kapolka
bf1c7b17fe Fix for texture coordinate generation. 2014-10-02 18:09:47 -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