Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17733 commits 29 branches 0 tags 1.1 GiB
Commit graph

5529 commits

Author SHA1 Message Date
AndrewMeadows
240280b9ac Merge pull request #3591 from ey6es/metavoxels 
Basic metavoxel scripting commands.
 2014-10-14 09:47:24 -07:00
AndrewMeadows
3483497fab Merge pull request #3575 from Atlante45/attenuation_zones 
Audio zones and attenuation coefficients
 2014-10-14 09:39:06 -07:00
Andrzej Kapolka
fcbdf04c19 Apply alpha restrictions when we apply the edit. 2014-10-13 16:01:38 -07:00
Andrzej Kapolka
60576bdcbd Basic metavoxel scripting bits. 2014-10-13 15:05:16 -07:00
AndrewMeadows
d90d30ad9f Merge pull request #3585 from ZappoMan/editToolsImprovements 
various edit tool fixes
 2014-10-13 10:12:47 -07:00
Andrzej Kapolka
1d4d36444f Bumped the metavoxel version number. 2014-10-10 17:34:16 -07:00
Andrzej Kapolka
60da0f1567 Allow drawing cursor on dual contour surface, wired up material paint tool. 2014-10-10 17:18:52 -07:00
ZappoMan
82a9429414 add boundingBox.dimensions to entity properties 2014-10-10 17:10:27 -07:00
Atlante45
9a928a3d55 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-10 11:28:58 -07:00
ZappoMan
db881c0dc8 add boundBox gettable property to EntityItemProperties 2014-10-10 10:32:18 -07:00
Atlante45
fb751aec7c Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
 2014-10-10 10:24:28 -07:00
AndrewMeadows
2a8b002725 Merge pull request #3576 from ZappoMan/editToolsImprovements 
First cut at new rotation UI/UX
 2014-10-10 08:17:22 -07:00
Atlante45
15359bb5c9 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-09 17:45:23 -07:00
ZappoMan
b50e996ec8 added Vec3.orientedAngle() 2014-10-09 17:35:58 -07:00
Atlante45
0fa95ba61d Removed Unattenuated zones from mixer 2014-10-09 14:46:32 -07:00
Andrzej Kapolka
66b83d0ff9 Increment packet version to avoid crashes. 2014-10-09 14:31:41 -07:00
Andrzej Kapolka
f69184d8cb Adjustment of threshold multiplier for metavoxels. 2014-10-09 14:22:22 -07:00
Andrzej Kapolka
df49bf8dda Substantial betterification of Hermite data averaging. 2014-10-09 14:04:51 -07:00
Atlante45
4c3f32782a Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-09 12:22:57 -07:00
Atlante45
195186f726 Removed redundant TREE_SCALE declaration 2014-10-09 11:48:41 -07:00
Philip Rosedale
27a5042943 Merge pull request #3563 from ey6es/metavoxels 
Basic averaging for dual contour data, added option to display Hermite data.
 2014-10-08 17:04:24 -07:00
Andrzej Kapolka
b5b82ed387 Provide the option to display lower detail metavoxel data as points. 2014-10-08 14:05:14 -07:00
Andrzej Kapolka
049a00b85b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 11:51:10 -07:00
ZappoMan
48071bbdb3 don't collide with entities with unknown IDs 2014-10-08 11:48:30 -07:00
Stephen Birarda
d064919cb0 fix a missed reference to NetworkAccessManager 2014-10-08 10:41:16 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Andrzej Kapolka
04b628bede Added option to display Hermite data 2014-10-07 16:44:55 -07:00
Andrzej Kapolka
9fc0abe2b3 Working on metavoxel averaging. Still pretty rough. 2014-10-06 17:30:28 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Leonardo Murillo
7400104f87 Merge pull request #3551 from ZappoMan/fixHTTPSIncludes 
fix include for https relative urls
 2014-10-06 15:43:30 -06:00
Brad Hefta-Gaub
4b33cfe838 Merge pull request #3547 from birarda/new-qt 
fix for ThreadedAssignment readyRead on Qt 5.3.x
 2014-10-06 14:35:25 -07:00
ZappoMan
07832fdd68 fix include for https relative urls 2014-10-06 14:34:19 -07:00
Stephen Birarda
2d3f3edcad Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-06 14:31:39 -07:00
Stephen Birarda
499e748d54 rebind the node socket when switching to ThreadedAssignment 2014-10-06 13:45:11 -07:00
Stephen Birarda
319cf34b83 use an ephemeral port when using auto-networking for domain-server 2014-10-06 12:24:18 -07:00
Stephen Birarda
253fe53571 cleanup a couple of debug lines 2014-10-06 12:24:12 -07:00
Stephen Birarda
484c0d30cb don't require refresh of NetworkAccessManager, should handle restarts 2014-10-06 09:54:52 -07:00
Stephen Birarda
78f8aba504 fix for NetworkAccessManager getInstance return 2014-10-06 09:44:47 -07:00
Stephen Birarda
a441c5fb16 don't use an unecessary subclass of QNetworkAccessManager 2014-10-06 09:42:47 -07:00
Stephen Birarda
89cc7c7b0d add an optional forced reset of NetworkAccessManager 2014-10-06 09:35:44 -07:00
Stephen Birarda
f89b225da2 handle local socket changes by monitoring every so often 2014-10-06 09:17:25 -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
4e0bb94cdd fix for double ICE connect attempts from domain-server 2014-10-03 15:25:47 -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