Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 20:46:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17522 commits 25 branches 0 tags 1.1 GiB
Commit graph

17522 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
a358b4e2af repair another reference to NetworkAccessManager 2014-10-06 14:57:54 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Philip Rosedale
8084c5c77d Merge pull request #3552 from AndrewMeadows/inertia 
Tweak low velocity avatar keyboard control.
 2014-10-06 14:56:38 -07:00
Atlante45
c69aba36fc Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-06 14:55:17 -07:00
Stephen Birarda
78920234bb handle changed domain-server port on start 2014-10-06 14:49:15 -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
Stephen Birarda
14cd044359 handle custom local UDP port for domain-server from webpage 2014-10-06 14:41:16 -07:00
Brad Hefta-Gaub
2d06b150c4 Merge pull request #3548 from ctrlaltdavid/overlays_example_fix 
Fix property names used for text overlay colors
 2014-10-06 14:35:47 -07: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
Brad Hefta-Gaub
4e038687cf Merge pull request #3550 from murillodigital/master 
Missed one reference to the old bucket.
 2014-10-06 14:31:35 -07:00
Andrew Meadows
6aba2359ed Tweak low velocity avatar keyboard control. 2014-10-06 14:27:43 -07:00
Leonardo Murillo
65b559ca3d Missed one 2014-10-06 15:21:51 -06:00
ZappoMan
12deec928c add tick marks to planar ellipse/circle overlays 2014-10-06 14:15:22 -07:00
Atlante45
ace8b98064 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-06 14:12:57 -07:00
David Rowe
08147380c7 Fix property names used for text overlay colors 2014-10-06 14:09:23 -07:00
Stephen Birarda
499e748d54 rebind the node socket when switching to ThreadedAssignment 2014-10-06 13:45:11 -07:00
Brad Hefta-Gaub
e867b49701 Merge pull request #3546 from murillodigital/master 
Fixing globals var scopt
 2014-10-06 13:29:20 -07:00
Leonardo Murillo
1de473a013 Fixing globals var scopt 2014-10-06 14:27:25 -06:00
Stephen Birarda
0fd7ec34fc remove an unused const 2014-10-06 12:34:12 -07:00
Stephen Birarda
3cd71a33c9 disable ephemeral port for DS until ACs can discover 2014-10-06 12:28:44 -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
Andrzej Kapolka
0d5f81c062 Merge pull request #3540 from samcake/temp0 
replacing glutSolidSPhere by a cached Geometry
 2014-10-06 12:23:44 -07:00
Sam Gateau
ba2d072a65 fix syntax issues for constant names and the CmakeLists.txt useless change 2014-10-06 12:15:36 -07:00
Clément Brisset
b8c7a9263c Merge pull request #3544 from murillodigital/master 
Changing bucket name
 2014-10-06 11:39:52 -07:00
Sam Gateau
4f26c9e0fa fix formatting and syntax issues 2014-10-06 11:06:23 -07:00
Leonardo Murillo
0b7ff18970 Changes in non-Js code 2014-10-06 11:24:10 -06:00
Leonardo Murillo
f0852ba283 Using new variable in all references to S3 bucket 2014-10-06 11:21:35 -06:00
Brad Hefta-Gaub
644bbacfe3 Merge pull request #3541 from thoys/remember-selected-audio-device 
Remember the last selected audio device
 2014-10-06 10:05:00 -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
0459254e3f fix connection to slot for local addr update, refresh AcctManager after restart 2014-10-06 09:24:48 -07:00
Stephen Birarda
b61e659382 send an ICE heartbeat anytime the domain-server local socket changes 2014-10-06 09:18:50 -07:00
Stephen Birarda
f89b225da2 handle local socket changes by monitoring every so often 2014-10-06 09:17:25 -07:00
Ryan Huffman
e70c57cb95 Replace magic numbers wiht const values 2014-10-06 08:37:07 -07:00
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
Thijs Wenker
b7165cb353 store the last selected audio device 2014-10-05 21:11:42 +02:00
Atlante45
011e848c04 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/describe-settings.json
 2014-10-03 17:52:40 -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
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
Philip Rosedale
864dd0152d Merge pull request #3532 from birarda/master 
remove files for gh-pages that are no longer in use, enable auto reconnection to ICE domain-servers
 2014-10-03 17:11:26 -07:00
Stephen Birarda
aa15ef7f85 only have the ice-server respond if there was a matching conectee 2014-10-03 17:10:56 -07:00
Andrzej Kapolka
3d88463569 Blend between cube face textures. 2014-10-03 17:05:14 -07:00