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

5633 commits

Author SHA1 Message Date
ZappoMan
c7d544cd58 wire up collision signals 2014-10-13 14:36:06 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -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
Stephen Birarda
21114d5f56 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 14:30:43 -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
Stephen Birarda
76d00f351d Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 09:28:14 -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
Stephen Birarda
f637f5a4a6 always allow connection from localhost user 2014-10-09 17:07:32 -07:00
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Stephen Birarda
b6a58925ed Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-09 15:29:54 -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
Stephen Birarda
b368e866fb change oauth request packet type to username request 2014-10-08 14:26:23 -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
Stephen Birarda
cb6e420392 fix for peer addition from ice-server 2014-10-03 09:50:58 -07:00
Stephen Birarda
55a7180838 re-send heartbeat to ICE server after max connection attempts 2014-10-03 09:47:15 -07:00
Stephen Birarda
d9e0c91e02 remove a peer in domain-server after max connection attempts 2014-10-03 09:45:44 -07:00
Stephen Birarda
63024663b2 don't require settings request for agent nodes 2014-10-03 09:37:13 -07:00
Stephen Birarda
c96e7f72f8 use the ice server sock addr returned for the domain 2014-10-03 09:31:38 -07:00
Stephen Birarda
720f8ecae8 handle case where access_token is empty 2014-10-03 09:08:27 -07:00
Stephen Birarda
49d081088a mode nodes to connected hash upon ping reply receipt 2014-10-03 08:58:03 -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
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
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
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
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
Leonardo Murillo
aa1af0e144 Merge pull request #3524 from birarda/master 
fix for domain-server script deployment with auth
 2014-10-02 12:50:21 -06:00
Stephen Birarda
4749fdb0ba allow calls to HTTPManager to skip the subHandler and ask for direct processing 2014-10-02 10:38:46 -07:00
Stephen Birarda
e0a721209a add a Node superclass to handle P2P connection 2014-10-02 09:55:00 -07:00
Andrzej Kapolka
42e95f2b38 Working on spanner metavoxel edits. 2014-10-01 18:46:23 -07:00
Stephen Birarda
15156519b3 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-01 16:19:16 -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
e65f383b25 add localRenderAlpha property to entities 2014-10-01 09:43:03 -07:00
Brad Hefta-Gaub
15ccec676c Merge pull request #3513 from Atlante45/recording_audio_offset 
Recording audio offset
 2014-10-01 09:07:06 -07:00
Atlante45
56acc86f4f Missed some qints 2014-09-30 21:20:37 -07:00
Andrzej Kapolka
4dbd2367f4 Working on shapes for metavoxel edits. 2014-09-30 17:34:01 -07:00
Stephen Birarda
ac4a767d60 include memory for auto_ptr 2014-09-30 15:25:40 -07:00
Andrzej Kapolka
5d2f6b98e2 Added erase buttons, initialize color editor on creation. 2014-09-30 15:20:24 -07:00
Stephen Birarda
cd9029bb92 add some debug to NodeList instance refresh 2014-09-30 14:59:12 -07:00
Stephen Birarda
9950ed9f9f use auto_ptr in NodeList and LimitedNodeList for cleaner mem management 2014-09-30 14:57:32 -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
Stephen Birarda
fed7dad2b6 use an auto_ptr to be able to reset the AccountManager 2014-09-30 14:36:32 -07:00
Atlante45
68c25e805a Switch int64 to int 2014-09-30 14:31:40 -07:00
Stephen Birarda
3969c8bfe0 don't allow a username and password for domain auth, require access token 2014-09-30 12:23:04 -07:00
Andrzej Kapolka
001af5f982 Simplify the message situation by removing color-only edits. 2014-09-30 12:17:35 -07:00
Atlante45
c599bed176 Merge branch 'master' of https://github.com/highfidelity/hifi into recording_audio_offset 2014-09-30 11:24:55 -07:00
Atlante45
5f95cbc101 JS hooks 2014-09-30 11:23:33 -07:00
Atlante45
1afdd34577 Added custom audio offset and volume to Player 2014-09-30 11:23:25 -07:00
Atlante45
dbc81fcdca Update audio injector volume every frame 2014-09-30 11:19:45 -07:00
Andrzej Kapolka
4cdfe87cf1 Merge pull request #3507 from Atlante45/recording_frames_interpolation 
Recording frames interpolation
 2014-09-29 19:46:11 -07:00
Stephen Birarda
c16ab0a19f remove definition for an unused method 2014-09-29 15:27:45 -07:00
Atlante45
c99047677f Members initialisation 2014-09-29 14:49:55 -07:00
Atlante45
6d15728283 frame interpolation for recordings 2014-09-29 12:30:10 -07:00
Stephen Birarda
bd4a32551b fix for settings save without organization 2014-09-29 10:09:33 -07:00
Stephen Birarda
5e2870ac5f require a distinction between master config and user config 2014-09-29 09:30:08 -07:00
Andrzej Kapolka
533d59becc Merge pull request #3499 from Atlante45/radio_js 
Stereo fix
 2014-09-26 20:04:55 -07:00
Atlante45
5a8b9082b2 Check _currentSendPosition instead of overriding 2014-09-26 19:47:26 -07:00
Atlante45
dfe70ed2e3 Initialize InjectedAudioStream with correct stereo value 2014-09-26 19:23:36 -07:00
Stephen Birarda
7c738edbd8 Merge pull request #3488 from PhilipRosedale/master 
Correct eye contact for Oculus users
 2014-09-26 15:42:03 -07:00
Philip Rosedale
2f609bb711 Merge pull request #3492 from birarda/domain-wizard 
initial re-tooling of domain-server settings for metaverse setup
 2014-09-26 15:40:44 -07:00
Philip Rosedale
3ea9923240 Merge pull request #3493 from ZappoMan/moreWorkOnCollidingEntitites 
handled multiple collisions correctly, and don't collide if fully enclosed
 2014-09-26 15:33:54 -07:00
Atlante45
6df430660d Uninitialized member 2014-09-26 15:23:17 -07:00
ZappoMan
7bea4b3123 also honor ignore collisions for voxels and avatars 2014-09-26 15:12:59 -07:00
ZappoMan
bbd476d564 handled multiple collisions correctly, and don't collide if fully enclosed 2014-09-26 14:55:05 -07:00
Stephen Birarda
3cbfad69cd fix indentation issues for merged AddressBarDialog classes 2014-09-26 14:32:59 -07:00
Stephen Birarda
e75a2d355e Merge branch 'master' of https://github.com/highfidelity/hifi into domain-wizard 2014-09-26 14:31:52 -07:00
Stephen Birarda
5b2b0c47c0 Merge pull request #3483 from stojce/20061 
Code Review for Job #20061
 2014-09-26 14:24:44 -07:00
ZappoMan
21b0e31ee1 Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites 2014-09-26 12:21:51 -07:00
Stephen Birarda
94f30fe4d9 handle password setting by not converting to double 2014-09-26 12:20:12 -07:00
Stephen Birarda
21809cc9df fix http username with no password 2014-09-26 12:09:29 -07:00
ZappoMan
2d81d7c554 add support for ignore collisions and collisions will/wont move entities 2014-09-26 11:43:56 -07:00
Philip Rosedale
7c1333dcb0 Merge pull request #3486 from ZappoMan/moreWorkOnCollidingEntitites 
Improvements to entity collisions (using shape collider)
 2014-09-26 11:25:51 -07:00
Atlante45
83ad0e4eb0 Fix mono injection 2014-09-26 11:14:27 -07:00
Stephen Birarda
e6449da890 repair a crash while overriding a config map 2014-09-26 11:10:56 -07:00
Stephen Birarda
954fbc2017 use DomainServerSettingsManager to handle simulation settings and config 2014-09-26 11:06:05 -07:00
Atlante45
a4a5d71caa Merge branch 'fix_attachment_bug_with_recording' of github.com:Atlante45/hifi into radio_js 
Conflicts:
	libraries/audio/src/AudioInjector.cpp
 2014-09-26 10:45:34 -07:00
Stephen Birarda
f47cc176b5 resolve conflicts on merge with upstream master 2014-09-26 08:33:34 -07:00
Atlante45
cf453a8953 removed _isPaused 2014-09-25 19:32:57 -07:00
Atlante45
cf925120ca Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-25 19:23:46 -07:00
Atlante45
72f5b9b77b code cleanup 2014-09-25 19:19:03 -07:00
Atlante45
f50b42fd16 Read new Sound() arg 2014-09-25 19:15:16 -07:00
Philip Rosedale
f66f565f53 update stDev (standard deviation) class to coding standard 2014-09-25 18:14:02 -07:00
Atlante45
453869c8e9 Stereo flag + specific resample in Sound class 2014-09-25 18:12:11 -07:00
Atlante45
7f4ece2be1 Resize ringbuffer of injected stereo stream 2014-09-25 17:54:53 -07:00
Atlante45
7dc07a1c51 Compute correct number of bytes to send when stereo 2014-09-25 17:54:11 -07:00
ZappoMan
fa8c5b85ff allow you to edit mass 2014-09-25 17:00:35 -07:00
stojce
6a3bc8f255 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-25 23:57:19 +02:00
ZappoMan
c880f00a14 make sure to scale default octree shape collision to meters 2014-09-25 14:54:06 -07:00
ZappoMan
ddf7e5604a Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites 2014-09-25 14:51:43 -07:00
Stephen Birarda
a684191cf1 change the default config path to system config path 2014-09-25 14:50:07 -07:00
ZappoMan
2f0a9b517f make sphere entities use sphere shape for better collisions 2014-09-25 14:49:52 -07:00
ZappoMan
9cd76983a2 swith to using shape collider instead of spheres 2014-09-25 14:35:20 -07:00
Andrzej Kapolka
7de108f493 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-25 11:22:19 -07:00
AndrewMeadows
697c7f6a61 Merge pull request #3481 from ZappoMan/collidingEntities 
First cut at colliding entities
 2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
9878cdd476 Merge pull request #3477 from Atlante45/removed_recording_compressed_data 
Changed recording file format
 2014-09-25 09:26:02 -07:00