Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 21:00:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62971 commits 72 branches 59 tags 1.2 GiB
Commit graph

373 commits

Author SHA1 Message Date
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash"" 
This reverts commit f274cdcc7f.
 2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f Revert "Fix ModelBlender crash" 2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
Atlante45
6a4b93a4e7 Proper fix for DiskCacheInfo 2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d Move all resource requests to the same thread 2016-03-01 12:00:43 -08:00
Ryan Huffman
eff02d3e3a Fix Agents bidding on simulation ownership 2016-02-02 10:47:51 -08:00
Seth Alves
b9fc368857 Merge pull request #6633 from huffman/agent-spatial-finder 
Add AssignmentParentFinder to Agent
 2015-12-14 09:35:27 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Ryan Huffman
66ed8dc053 Add AssignmentParentFinder to Agent 2015-12-11 14:51:14 -08:00
Ryan Huffman
4c8b7aa800 Fix EntityErase packets not being handled on agents 2015-12-10 16:26:16 -08:00
Leonardo Murillo
25494ec867 Merge pull request #6562 from Atlante45/baseball 
Baseball
 2015-12-07 14:11:21 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Ryan Huffman
ce882a9c11 Replace QSharedPointer ctor with ::create 2015-12-03 09:43:36 -08:00
Atlante45
083205916f Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-30 18:25:53 -08:00
Clément Brisset
e168966b87 Merge pull request #6409 from birarda/injector-hybrid 
more efficient threading of networked AudioInjector objects
 2015-11-30 15:36:41 -08:00
Stephen Birarda
4573e5c59e resolve conflicts on merge with upstream/master 2015-11-30 13:32:38 -08:00
Ryan Huffman
1b0413f8e3 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-30 10:23:40 -08:00
Andrew Meadows
49a6f63663 remove whitespace and fix warning (unused var) 2015-11-30 10:00:05 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
Stephen Birarda
7f7d05fc42 fix double initialization of AssetClient in Agent 2015-11-24 10:46:35 -06:00
Stephen Birarda
0997d3dcae resolve conflicts on merge with upstream/master 2015-11-23 16:15:15 -06:00
samcake
25654824a2 Copy pasting the code that Stephen did and also adding the AssetServer to the list of dependent nodes for the agent 2015-11-23 12:32:27 -08:00
samcake
301f0ba145 Trying to instenciate the AssetCLient in the Agent 2015-11-23 11:48:02 -08:00
Stephen Birarda
b24b095c90 add a missing space in Agent 2015-11-20 16:09:41 -08:00
Brad Hefta-Gaub
f56d2fba7f allow playbackAgents to auto-register 2015-11-20 16:00:43 -08:00
Stephen Birarda
9ddebc8d13 resolve conflicts on merge with upstream/master 2015-11-20 15:29:44 -08:00
Stephen Birarda
cf204ad5b0 cleanup executeScript comment in Agent 2015-11-20 11:44:58 -08:00
Stephen Birarda
aa836aa4b5 add a script request timeout 2015-11-20 11:44:04 -08:00
Stephen Birarda
3b40119992 use Agent session UUID to request script 2015-11-20 11:35:24 -08:00
Stephen Birarda
8f5212acac use destroy instead of accidental set 2015-11-19 17:26:10 -08:00
Ryan Huffman
07d21514c5 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-19 10:47:37 -08:00
samcake
74beeefe06 Merge pull request #6420 from jherico/dargo 
Make recording and playback work in interface, playback in agent
 2015-11-18 17:52:09 -08:00
Brad Davis
98cc7408b1 Fixing issues found in AC playback test 2015-11-18 17:17:20 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Stephen Birarda
cb708859fb resolve conflicts on merge with upstream master 2015-11-18 15:34:56 -08:00
Brad Davis
5b8047ded4 Make recording and playback work in interface, playback in agent 2015-11-18 14:04:45 -08:00
Brad Hefta-Gaub
35677d3a48 Merge pull request #6418 from birarda/test-ds-settings-fail 
move keepalive pings transparently to NL
 2015-11-18 11:12:16 -08:00
Stephen Birarda
d90c073102 leverage NL keep alive pings in Agent 2015-11-18 10:25:18 -08:00
samcake
368f19b4e2 Merging with todays upstream and checking 2015-11-17 18:58:10 -08:00
samcake
d2f3b48637 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-17 17:36:38 -08:00
Stephen Birarda
5dc48dc9dc resolve conflicts on merge with upstream/master 2015-11-17 17:04:12 -08:00
Stephen Birarda
8e4d7c69ce handle AudioInjectorManager for scripted ACs 2015-11-17 17:01:11 -08:00
Brad Hefta-Gaub
32bf81ef0d move MessagesClient to agent 2015-11-17 12:59:12 -08:00
Sam Gateau
5b92929833 Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client 2015-11-17 09:32:22 -08:00
samcake
8553033d59 Refactoring the mess for the Agent 2015-11-16 19:27:28 -08:00
Stephen Birarda
aa77c4894c add an AudioInjectorManager for more efficient threading 2015-11-16 16:04:10 -08:00
Brad Hefta-Gaub
d42a1a721f first cut at messages-mixer 2015-11-16 15:26:17 -08:00
Stephen Birarda
3fa0bcbcd9 ping the AssetClient from the agent 2015-11-16 10:38:59 -08:00
Stephen Birarda
5908f2d398 put Agent AssetClient on sep thread, cleanup 2015-11-16 10:38:45 -08:00
Stephen Birarda
d941be8d0b allow assignment client to use AssetClient for ATP downloads 2015-11-16 10:38:33 -08:00
Atlante45
55c6706f76 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-06 13:31:39 -08:00
Howard Stearns
aa1289bd7c Update agent's outgoing avatar data packet with sequenceNumber as is now used in interface's MyAvatar. 2015-11-05 15:53:46 -08:00
Stephen Birarda
3fa4f7138a add more sounds to the crowd, ping AssetServer from Agent 2015-10-27 10:58:31 -07:00
Stephen Birarda
f275d2678d ping the AssetClient from the agent 2015-10-26 16:06:12 -07:00
Stephen Birarda
ca60ce59f1 put Agent AssetClient on sep thread, cleanup 2015-10-26 12:06:28 -07:00
Stephen Birarda
014e62e25a allow assignment client to use AssetClient for ATP downloads 2015-10-20 17:11:37 -07:00
Ryan Huffman
9ddcfdf94d Cleanup PacketReceier and ReceivedMessage 2015-10-16 09:21:10 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Brad Hefta-Gaub
c01077a0d7 real fix 2015-09-30 17:30:34 -07:00
Brad Hefta-Gaub
42d9045770 possible fix for crashing agents acting like avatars 2015-09-30 16:02:33 -07:00
Brad Hefta-Gaub
34dc8bdbcb fix possible crash in agent 2015-09-30 15:34:35 -07:00
Stephen Birarda
229e73f88c protect the agent from null timers in avatar stop 2015-09-16 11:52:05 -07:00
Stephen Birarda
bca00db4a8 use unique_ptr for Agent ScriptEngine 2015-09-16 11:48:15 -07:00
Stephen Birarda
5df7ce7424 fix for missing jurisdiction listener in Agent 2015-09-16 11:43:54 -07:00
Brad Hefta-Gaub
bdae3e420b fix crash in AC 2015-09-15 11:24:04 -07:00
Brad Hefta-Gaub
56118e4204 migrate Agent to use standard APIs of ScriptEngine 2015-09-11 22:12:42 -07:00
Brad Hefta-Gaub
54c56a92f1 move agent specific code out of ScriptEngine 2015-09-11 21:56:00 -07:00
Brad Hefta-Gaub
f85cb2c888 first cut at cleaning up ScriptEngine class 2015-09-11 19:12:09 -07:00
Thijs Wenker
f512205f6f add ability to include scripts from a relative path in assignment-client (for persistent scripts only) 2015-08-22 01:30:07 +02:00
Thijs Wenker
d89ecc1e42 Move WebSocketServer to be accessable from Assignment-Client:Agent only. 2015-08-21 22:43:49 +02:00
Seth Alves
bbee001366 Merge pull request #5470 from birarda/master 
fix for unique_ptr<char> allocations
 2015-07-31 15:09:18 -07:00
Stephen Birarda
b0afdb21ad correct the unique_ptr char allocations 2015-07-31 14:29:05 -07:00
Thijs Wenker
7325e6a7b7 Send ping requests to the nodes (AvatarMixer, AudioMixer, EntityServer) that the Assignment agent connected with to keep the connections alive. 2015-07-29 14:57:06 +02:00
Stephen Birarda
1c98c5e02c remove unregisterListener that isn't needed anymore 2015-07-17 11:20:05 -07:00
Stephen Birarda
e7249594e1 unregister the AvatarHashMap packet registrations 2015-07-16 17:55:29 -07:00
Stephen Birarda
040c7557da fix double register for Agent avatar packets 2015-07-16 17:51:06 -07:00
Stephen Birarda
49f5a5ffcb remove double declaration of PacketReceiver 2015-07-16 17:46:46 -07:00
Stephen Birarda
ce6585ccc8 fix AC monitor and AM double register 2015-07-16 17:44:43 -07:00
Stephen Birarda
5a2d59c530 fix ScriptEngine cleanup for Agent 2015-07-15 15:07:34 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Ryan Huffman
9d9ac6eefc Rename packetSizeWithHeader to be more descriptive 2015-07-14 15:00:36 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Ryan Huffman
5cb8c1541a Update Agent to use peekPrimitive 2015-07-14 14:23:31 -07:00
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Stephen Birarda
e3b5972344 use initializer list for packetReceiver register call 2015-07-14 11:21:02 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Stephen Birarda
f06636d45e repairs for other ThreadedAssignment subclasses 2015-07-13 15:16:55 -07:00
Ryan Huffman
cdbcaf0f7f Fix AudioMixer compilation errors 2015-07-13 12:06:12 -07:00
Ryan Huffman
8c04aafe67 Update Agent to use PacketReceiver 2015-07-10 17:08:07 -07:00
Ryan Huffman
cc7bfd90f1 Move audio packet handling to listener in Agent 2015-07-10 16:27:42 -07:00
Ryan Huffman
5c831efe64 Remove avatar packet processing from Agent 2015-07-10 16:13:57 -07:00
Stephen Birarda
14b73ae00f remove qtimespan that isn't used anymore 2015-07-09 12:45:32 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Stephen Birarda
2dc866755d fix OS comments, remove test call from Agent 2015-05-11 09:56:10 -07:00
Stephen Birarda
2916596948 put back call to clearAccessCache 2015-05-08 16:54:35 -07:00
Stephen Birarda
b5d0a31ad4 remove clear access cache on Agent stop 2015-05-08 15:25:49 -07:00
Stephen Birarda
0a295bada1 add debugging to catch AC kill hang 2015-05-08 14:32:16 -07:00
Stephen Birarda
fe1b8cc52b fix entity tree reset / add OST assert for myServer 2015-05-08 11:04:22 -07:00
David Rowe
154dacf791 Fix typo 2015-03-31 14:21:56 -07:00
ZappoMan
e87e0a1e0b some cleanup of dead code related to timers 2015-03-11 16:27:04 -07:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
Andrew Meadows
0455ccf7be Merge pull request #4313 from ctrlaltdavid/20355 
CR for 20355 - Initial Integration with DDE
 2015-02-23 09:47:19 -08:00
David Rowe
d704af21ac Generalize "faceshift" data handling to "facetracker" 
DDE face tracking data is now broadcast to other avatars.
 2015-02-18 12:41:54 -08:00
Stephen Birarda
758a552267 make sure the Agent has a SoundCache available 2015-02-18 09:59:33 -08:00
ZappoMan
1fc0225939 change ScriptCache and SoundCache to derive from Dependency 2015-02-13 15:33:41 -08:00
Brad Hefta-Gaub
390d2be48f Merge pull request #4189 from birarda/android 
add the gvr-interface target for GearVR
 2015-02-06 14:07:28 -08:00
Ryan Huffman
490f119d85 Initialize ResouceCacheSharedItems in Agent 2015-02-06 11:30:57 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Atlante45
4fce5113dd Use DM to access AvatarHashMap/Manager 2015-01-23 11:50:27 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Philip Rosedale
285e588266 Merge pull request #4072 from Atlante45/network_replies_cleanup 
Windows crash fix
 2015-01-09 07:42:36 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
e1d8022409 working on removing voxels 2014-12-30 14:11:31 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Stephen Birarda
4077a76e46 remove AudioRingBuffer include where not needed 2014-12-16 11:58:12 -08:00
Stephen Birarda
bb77986f1a use new AudioConstants in AudioMixer classes 2014-12-16 11:56:56 -08:00
Stephen Birarda
8a03738c83 give a Sound cache to the assignment-client 2014-11-13 14:48:18 -08:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
ZappoMan
a555eeda23 CR feedback and warning fixes 2014-09-02 18:43:16 -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
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
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -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
wangyix
1153a76ab1 new option knobs added, no new behavior yet 2014-08-07 16:37:36 -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
Brad Hefta-Gaub
d6e6cfd585 Merge pull request #3216 from wangyix/inbound_audio_stream 
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
 2014-07-30 18:00:17 -07:00
wangyix
8d6896a1da forgot an arg in Agent.cpp 2014-07-30 17:26:58 -07:00
wangyix
7281eca5a4 fixed inj crash; added statcDesired to MixedAudioStream 2014-07-30 17:20:05 -07:00
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
wangyix
a3b44a6a73 downstream silent packets seem to be working 2014-07-29 10:08:55 -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
wangyix
6fc5c74c0b renamed ringbuffer variables to audiostream 2014-07-28 13:08:53 -07:00
Atlante45
844e5d7e47 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-07-28 10:11:39 -07:00
wangyix
e17556384d added code to clear agent audiostream frames to prevent buildup 2014-07-25 15:51:34 -07:00
wangyix
fd9d7baa06 updated Agent with audiostream; added initial packets discard to audiostream 2014-07-25 15:14:10 -07:00
barnold1953
aba031a125 Proper blendshape JS api. 2014-07-23 16:25:45 -07:00
barnold1953
6aa9e6b736 Revert "Ability to modify AC avatar blendshapes from JS" 
This reverts commit 512034fd7c.
 2014-07-23 15:54:40 -07:00
barnold1953
512034fd7c Ability to modify AC avatar blendshapes from JS 2014-07-23 15:23:27 -07:00