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

411 commits

Author SHA1 Message Date
Stephen Birarda
956c212db2 manage sets of potential connections in ice server 2014-10-02 15:24:23 -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
Stephen Birarda
e0a721209a add a Node superclass to handle P2P connection 2014-10-02 09:55:00 -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
Stephen Birarda
ac4a767d60 include memory for auto_ptr 2014-09-30 15:25:40 -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
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
Stephen Birarda
3cbfad69cd fix indentation issues for merged AddressBarDialog classes 2014-09-26 14:32:59 -07:00
stojce
c14bf84af8 layout fix 2014-09-24 00:14:00 +02:00
stojce
5a7b7cca44 Add finish lookup event 2014-09-23 11:32:16 +02:00
stojce
466dbdcee5 added address bar dialog 2014-09-22 20:51:19 +02:00
Stephen Birarda
a0675162b6 hook My Locations to data-web dialog 2014-09-18 09:35:33 -07:00
Stephen Birarda
e2c3b626b3 add a DataWebDialog for authenticated access to data-web html 2014-09-18 09:05:25 -07:00
Stephen Birarda
9ee063bdc1 remove the access token from API urls and put in Authorization header 2014-09-17 16:00:20 -07:00
Craig Hansen-Sturm
7b3f61ddc2 Merge pull request #3428 from ZappoMan/sendPositonOrientationInSilentPackets 
Send positon orientation in silent packets
 2014-09-16 13:39:06 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Stephen Birarda
885030a10c handle receipt of new public socket and propogation to data-server 2014-09-16 12:37:22 -07:00
Stephen Birarda
866f2005bd handle case where a location should be faced 2014-09-16 10:08:21 -07:00
Stephen Birarda
0033dfe5af use quat orientation to store locations and user locations 2014-09-16 09:57:21 -07:00
Stephen Birarda
4cef21aa4f don't prepend relative paths with hifi scheme 2014-09-16 09:14:06 -07:00
Stephen Birarda
3b21348a63 make sure AddressManager signal is connected to before file event 2014-09-12 15:22:51 -07:00
Stephen Birarda
29dae39ad7 handle location lookup for offline user or not found 2014-09-12 15:01:08 -07:00
Philip Rosedale
3fbe183196 Merge pull request #3402 from ZappoMan/stretchableEntities 
New Entities Features
 2014-09-12 13:57:45 -07:00
Stephen Birarda
f0ead98a2a put back LocationScriptingInterface so it works prior to replacement 2014-09-12 13:28:18 -07:00
Stephen Birarda
892e0e7cbf fix node auth url, NAN break on windows 2014-09-12 11:43:50 -07:00
Stephen Birarda
88a75a3585 fix for goToUser from ChatWindow 2014-09-12 11:27:54 -07:00
Stephen Birarda
1084483dd5 fix for default param of default constructed quat 2014-09-12 11:22:34 -07:00
Stephen Birarda
93ff34baaa force address bar lookup through handleLookupString 2014-09-12 11:21:38 -07:00
Stephen Birarda
ab7df8679d fix broken hifi linking 2014-09-12 11:19:22 -07:00
Stephen Birarda
1f2020d169 some url handling repairs, move existing error reply handlers to new format 2014-09-12 10:13:33 -07:00
Stephen Birarda
745edb8b0a fix error handling for location naming 2014-09-12 09:10:47 -07:00
ZappoMan
024f1b47c2 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 
Conflicts:
	interface/src/entities/RenderableBoxEntityItem.cpp
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/shared/src/Extents.h
 2014-09-12 08:18:09 -07:00
Stephen Birarda
b56ea5c936 centralize path creation from position and orientation to AddressManager 2014-09-11 17:17:47 -07:00
Stephen Birarda
23a0ef2de1 remove some spacing in AddressManager 2014-09-11 12:13:13 -07:00
Stephen Birarda
6d21c4bf0d make lookup for hostnames case insensitive 2014-09-11 11:07:42 -07:00
Stephen Birarda
684aa97b98 add port parsing for domain hostname in address bar 2014-09-11 11:00:24 -07:00
Stephen Birarda
aaabe6b1e1 handle domain changes via address bar 2014-09-11 10:45:45 -07:00
Stephen Birarda
71f2c0b542 initial addition of the AddressManager with location switch hooked up 2014-09-11 10:14:00 -07:00
Stephen Birarda
ee6a90dd54 allow domain to pass down its ID from config 2014-09-10 15:13:02 -07:00
wangyix
7a2897fb6b fixes/patches for win32/vs2013 startup and shutdown 2014-09-10 12:24:59 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
ZappoMan
f234dbf9a1 converting voxel files to new versioned format with buffer breaks 2014-09-05 10:51:08 -07:00
Stephen Birarda
e338c600c3 add debug to show that domain connection is being attempted 2014-09-04 09:29:29 -07:00
ZappoMan
0acbefb6a2 fix but in getMyChildContaining and performance improvement to moving entities 2014-09-03 08:06:42 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Andrzej Kapolka
2dfabdfe64 Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
Andrzej Kapolka
e9e3671710 Increment the version number. 2014-08-21 18:14:10 -07:00
ZappoMan
3a5a38c342 support chunk sizes in SVO file, allows for chunk based reading of SVO file and fixes issues with entities spanning chunks in file 2014-08-19 10:53:45 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
AndrewMeadows
4b7208ac53 Merge pull request #3280 from huffman/19907 
Code Review for Job #19907
 2014-08-18 10:20:01 -07:00
Stephen Birarda
c58bae9021 attempt to change buffers to 1MB only 2014-08-14 14:27:09 -07:00
Stephen Birarda
1e65a093f2 decouple audio-mixer packet receipt from main thread 2014-08-14 12:37:57 -07:00
Stephen Birarda
64c11ebf8f don't change the socket buffer sizes if it is already larger 2014-08-14 10:36:54 -07:00
Stephen Birarda
ec260dbab2 change both send and receive socket buffers 2014-08-13 15:50:11 -07:00
ZappoMan
49e616dd49 first cut at using erase entity message to delete entities 2014-08-13 14:11:56 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
184e4b8bde sestets added to jitter tester 2014-08-12 14:38:28 -07:00
Philip Rosedale
0e72c6a0b6 Merge pull request #3269 from ey6es/metavoxels 
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
 2014-08-12 00:40:14 -07:00
Ryan Huffman
cb76e3ead0 Merge branch 'master' of github.com:highfidelity/hifi into 19907 2014-08-11 18:44:31 -07:00
Ryan Huffman
d1672b510d Add DomainHandler::disconnectedFromDomain signal 2014-08-11 18:41:07 -07:00
AndrewMeadows
e5c2a099b8 Merge pull request #3268 from birarda/take-out-the-trash 
cmake (in)sanity
 2014-08-11 09:15:38 -07:00
ZappoMan
275a5c4a47 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-08 15:13:55 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
Andrzej Kapolka
468a3d4d67 Bump up the packet version. 2014-08-08 14:18:32 -07:00
wangyix
0dfe0b1f2a merged with master 2014-08-08 13:32:27 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
45afce48f7 remember old session UUID in AvatarHashMap to work around ghosting 2014-08-08 13:14:03 -07:00
Philip Rosedale
d552b7ca97 Merge pull request #3246 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats handling of out-of-sync seq nums
 2014-08-04 14:30:45 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
wangyix
d394c203b6 improved re-sync handling of SequenceNumberStats 
removed "duplicate" category since it's not 100% accurate
 2014-08-04 11:09:20 -07:00
Philip Rosedale
69558dc574 Merge pull request #3245 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats
 2014-08-04 07:49:31 -07:00
Philip Rosedale
321b8de898 Merge pull request #3230 from Barnold1953/rockPaperScissors 
Rock Paper Scissors CA script
 2014-08-03 13:03:11 -07:00
wangyix
99df05f770 forgot member in reset() 2014-08-01 16:54:29 -07:00
wangyix
1d74ae8197 code cleanup 2014-08-01 16:49:21 -07:00
wangyix
fc670d9edb minor threshold change 2014-08-01 16:44:01 -07:00
wangyix
f9ec7b6c18 redesiged SequenceNumberStats child instance handling 2014-08-01 16:13:52 -07:00
wangyix
eba07b03e2 recursive SequenceNumberStats; untested 2014-08-01 12:00:41 -07:00
wangyix
e1f905cb36 fixed >100% loss rate bug in SequenceNumberStats 2014-08-01 10:27:51 -07:00
Stephen Birarda
6024b90932 remove extra debug line 2014-07-31 14:08:52 -07:00
Stephen Birarda
8986e62b8a add distinction between hard reset and soft reset for DomainHandler 2014-07-31 14:08:25 -07:00
Stephen Birarda
adcf45583e clear domain settings on NodeList reset 2014-07-31 14:06:43 -07:00
Stephen Birarda
3c459d8460 fix include of tgmath for windows 2014-07-31 11:12:41 -07:00
Stephen Birarda
e1ba076a71 complete redemption of signed transactions from octree server 2014-07-31 11:03:12 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
barnold1953
2c04963242 Merge branch 'master' of https://github.com/highfidelity/hifi into rockPaperScissors 2014-07-31 10:16:35 -07:00
Stephen Birarda
453c37f4b9 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 10:05:40 -07:00
Stephen Birarda
eadae8ed1a allow unauthenticated redemptions of signed transactions from octree server 2014-07-31 10:05:26 -07:00
Stephen Birarda
ce4336894a actually send signed transaction from PaymentManager 2014-07-31 09:26:18 -07:00
Stephen Birarda
363cef6d8a move satoshi costs to VoxelEditPacketSender 2014-07-30 17:33:37 -07:00
wangyix
af5eedb50e fixed sequenceNumberStats sender changed msgs 2014-07-30 11:39:29 -07:00
Stephen Birarda
2c8808e922 repairs to cost calculations for voxels 2014-07-30 09:45:33 -07:00
Stephen Birarda
9dbe74b02f parse voxel costs to the DomainHandler object 2014-07-29 17:22:17 -07:00
Stephen Birarda
85b8449e83 use two different signals for settings success and failure 2014-07-29 11:17:27 -07:00
wangyix
4825457f4d silent audio packet type generalized 2014-07-28 16:49:53 -07:00
Stephen Birarda
84b86c17b7 use common settings retreival code to block before run in AudioMixer 2014-07-28 15:16:59 -07:00
Stephen Birarda
dbf41c8a42 allow domain-server to serve settings publicly, fix retry in DomainHandler 2014-07-28 14:56:26 -07:00
ZappoMan
805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-28 13:39:35 -07:00
Stephen Birarda
6334116070 request domain settings after successful connection to domain 2014-07-28 12:07:19 -07:00
barnold1953
814dd0fcb6 Fixed another crash relating to undo stack. Made script support the 
VoxelViewer
 2014-07-18 11:37:13 -07:00
Stephen Birarda
5cad6edb38 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 14:06:11 -07:00
Brad Hefta-Gaub
437e3efbc2 Merge pull request #3179 from wangyix/quick_audio_PR 
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
 2014-07-17 11:44:05 -07:00
Stephen Birarda
45ae9f614d add dialog to Menu to insert wallet private key 2014-07-17 11:43:30 -07:00
Stephen Birarda
0c8c4a2cf9 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 11:08:35 -07:00
Stephen Birarda
cb9a2c615e use OpenSSL to create signed wallet transaction using hard-code key 2014-07-16 15:44:49 -07:00
wangyix
6764ace8eb droppable silent packets are added for dropped packets; 
_currentJitterBufferFrames replaced with moving average of frames
available.  Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
 2014-07-16 14:41:24 -07:00
Stephen Birarda
74a107f9f4 initial rev of SignedWalletTransaction that creates a message 2014-07-16 12:26:24 -07:00
Atlante45
5dca794322 On/Off for activity logger 2014-07-16 12:22:27 -07:00
ZappoMan
1eb472c43a Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:05:06 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
Leonardo Murillo
6bf06989db Adding place/user go to logging 2014-07-14 15:24:47 -06:00
wangyix
25f4f63a1e added window PacketStreamStats to AudioStreamStats 2014-07-10 16:42:23 -07:00
wangyix
01f10024ae all stats added, needs testing; created PacketStreamStats struct 2014-07-09 18:13:33 -07:00
wangyix
81e168f657 added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg 2014-07-09 15:38:03 -07:00
wangyix
d03d3ef817 new auidostreamstats displayed in interface, domain page stats updated 2014-07-09 11:59:50 -07:00
ZappoMan
e800d5457b Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-08 13:02:31 -07:00
Atlante45
8382f764cd Got rid of unneccessary Q_DISABLE_COPY() 2014-07-07 12:15:55 -07:00
Atlante45
982a50dbcf Remove multithread access from NetworkAccessManager for the time being 2014-07-07 11:33:54 -07:00
Atlante45
b0e83c32ff Hopeful fix to ACs crash 2014-07-03 18:17:01 -07:00
Atlante45
8e1b8334a1 Fixed invokeMethod unable to find method + fixed children in different thread 2014-07-03 14:46:17 -07:00
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -07:00
Brad Hefta-Gaub
dbdce32b68 Merge pull request #3107 from wangyix/master 
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
 2014-07-03 13:32:31 -07:00
wangyix
a2451a9651 moved and updated a comment in SequenceNumberStats 2014-07-03 10:41:54 -07:00
wangyix
059628c26a fixed bug in SequenceNumberStats and its unit test; test passes now 2014-07-03 10:37:09 -07:00
Brad Hefta-Gaub
1b29b7c120 Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback 
Removed json callback
 2014-07-02 21:45:19 -07:00
Atlante45
1815472c6b Modified recently added case to AccountManager 2014-07-02 16:12:39 -07:00
Atlante45
106e5b578b Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 16:06:41 -07:00
Atlante45
90a27bb118 Removed json callback 2014-07-02 15:18:56 -07:00
Atlante45
84ea9833bb Added forgotten sendCustomRequest Method + comments 2014-07-02 14:30:40 -07:00
Atlante45
bf520d0eff Added thread safe implementation of NetworkAccessManager main methods 2014-07-02 14:05:46 -07:00
Atlante45
15b37ec3d1 Switched ResourceCache to NetworkAccessManager 2014-07-02 11:21:07 -07:00
Ryan Huffman
70121357be Update JSONCallbackParameters to take params in constructor 2014-07-02 11:12:06 -07:00
Ryan Huffman
ccc638d8c1 Merge branch 'master' of git://github.com/highfidelity/hifi into 19800 2014-07-01 20:03:54 -07:00
Atlante45
7c3292a41b Switched AccountManager to NetworkAccessManager 2014-07-01 17:47:31 -07:00
Atlante45
29976d7861 Created base for wrapper singleton class NetworkAccessManager 2014-07-01 17:17:34 -07:00
ZappoMan
fe30d3807c more renaming to entity from model where we're really talking about an entity 2014-07-01 17:07:16 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -07:00
Atlante45
e9826250cb CR 2014-07-01 12:57:39 -07:00
Atlante45
958367f579 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 
Conflicts:
	interface/src/devices/OculusManager.cpp
 2014-07-01 12:45:42 -07:00
wangyix
fd051310da prune missing set before constructing nack packets; 
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
 2014-07-01 12:01:51 -07:00