Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 17:20:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
37270 commits 72 branches 59 tags 1.2 GiB
Commit graph

1820 commits

Author SHA1 Message Date
Stephen Birarda
1fd4a1f0c3 resolve conflicts on merge with upstream master 2015-07-17 16:07:45 -07:00
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Stephen Birarda
1c98c5e02c remove unregisterListener that isn't needed anymore 2015-07-17 11:20:05 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -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
Atlante45
b60e358a68 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 15:30:00 -07:00
Stephen Birarda
29f91267d9 repairs to nack packet receiving for entity-server 2015-07-16 15:29:50 -07:00
Atlante45
56886e479d Use BulkAvatarData packet type for AvatarMixer upstrea 2015-07-16 15:28:53 -07:00
Stephen Birarda
010cbd9934 don't handle octree query while server shutting down 2015-07-16 14:42:16 -07:00
Stephen Birarda
8921f59e23 fix entity packet send from interface client 2015-07-16 12:09:35 -07:00
Atlante45
c6f6dbd845 Fix QByteArray from rqw data 2015-07-16 09:59:15 -07:00
Stephen Birarda
1752d5e7ca fix mix packet sample copy bug 2015-07-15 17:52:37 -07:00
Stephen Birarda
863cc3390a fix send of mixed audio stream packet from AM 2015-07-15 17:41:00 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Stephen Birarda
5a2d59c530 fix ScriptEngine cleanup for Agent 2015-07-15 15:07:34 -07:00
Stephen Birarda
e90ace6231 fix child assignment UUID, adjust for NLPacket after unpack 2015-07-15 12:37:30 -07:00
Stephen Birarda
432048addf use macro for AvatarMixer, show type for unknown 2015-07-15 11:55:50 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
0327a8d477 fix bytesAvailable, don't double seek in Packet 2015-07-14 20:47:16 -07:00
Stephen Birarda
3bf93063d7 remove the OctreeServerDatagramProcessor 2015-07-14 17:22:42 -07:00
Atlante45
bfb9166b8e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:07:47 -07:00
Stephen Birarda
3cb4be6c02 fix order of setup at startup 2015-07-14 17:04:45 -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
cb9e12f76a Fix using typeof when should be using sizeof 2015-07-14 16:20:36 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Ryan Huffman
e99df5b56d Fix size of statusPacket in AssignmentClient 2015-07-14 15:55:39 -07:00
Stephen Birarda
fb7cb7ff53 add the option for PacketReceiver to drop packets 2015-07-14 15:49:54 -07:00
Ryan Huffman
71866d52ed Update packet reading to use fromRawData for reading uuid 2015-07-14 15:43:00 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -07:00
Ryan Huffman
7e70e25db8 Update cast to dynamic_cast in AvatarMixer 2015-07-14 15:01:56 -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
dcb9c8d125 Fix AvatarMixer call to reinterpret_cast to use dynamic_cast 2015-07-14 14:51:37 -07:00
Ryan Huffman
24dddac6b2 Fix call to register for multiple packet types 2015-07-14 14:41:28 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Ryan Huffman
10c5589629 Update OctreeServer to use dynamic_cast 2015-07-14 14:26:06 -07:00
Ryan Huffman
921ee02414 Update EntityServer to use only 1 packet callback for all packet types 2015-07-14 14:25:09 -07:00
Ryan Huffman
f7c1eaf967 Update AssignmentFactory to use peekPrimitive 2015-07-14 14:24:08 -07:00
Ryan Huffman
1af01c9003 Fix style issue in AssignmentClientMonitor 2015-07-14 14:23:53 -07:00
Ryan Huffman
5cb8c1541a Update Agent to use peekPrimitive 2015-07-14 14:23:31 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -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
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Ryan Huffman
b45af742ef Remove datagram processing from OctreeServer 2015-07-14 09:37:09 -07:00
Ryan Huffman
c1f026802a Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-13 16:21:39 -07:00
Stephen Birarda
1c9f43e5aa compile fixes for AC status packet 2015-07-13 16:03:05 -07:00
Stephen Birarda
8d38cd5670 use a specific packet type for AC child status 2015-07-13 15:58:44 -07:00
Ryan Huffman
4668914fe2 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/octree/OctreeServerDatagramProcessor.cpp
 2015-07-13 15:48:52 -07:00
Stephen Birarda
49ee35a41c remove call to processNodeData 2015-07-13 15:39:35 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Atlante45
81ad0056c3 Fix a few node deref 2015-07-13 15:34:37 -07:00
Atlante45
44c5d4a2bf Couple fixes SharedNodePointer > Node& 2015-07-13 15:29:41 -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
a4ff18d9ec Remove OctreeServerDatagramProcessor 2015-07-13 15:03:10 -07:00
Stephen Birarda
26be492475 use same listener for many packets in AudioMixer 2015-07-13 14:46:56 -07:00
Stephen Birarda
d242f5d5d9 repair AudioMixerClientData parseData 2015-07-13 14:35:03 -07:00
Stephen Birarda
601e8d6e68 fix AssignmentClientChildData parseData override 2015-07-13 14:28:46 -07:00
Stephen Birarda
775c1b7310 Merge branch 'receive_packets' of https://github.com/huffman/hifi into atp 2015-07-13 14:26:23 -07:00
Ryan Huffman
9de6828b03 Remove readPendingDatagram from AudioMixer 2015-07-13 14:24:06 -07:00
Ryan Huffman
591c5d4b60 Fix EntityServer compilation errors 2015-07-13 12:06:43 -07:00
Ryan Huffman
9a977149a4 Update AvatarMixer to use packetReceiver 2015-07-13 12:06:32 -07:00
Ryan Huffman
cdbcaf0f7f Fix AudioMixer compilation errors 2015-07-13 12:06:12 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
Ryan Huffman
582de14917 Fix compilation errors in AssignmentClientMonitor 2015-07-13 09:25:57 -07:00
Ryan Huffman
879b880254 Fix non-ref var to PacketReceiver 2015-07-13 08:30:13 -07:00
Ryan Huffman
ed3b8afbd9 Update AssignmentClientMonitor to use PacketReceiver 2015-07-10 18:09:08 -07:00
Ryan Huffman
c86e481d4f Update OctreeServer packet receive handling 2015-07-10 17:28:27 -07:00
Ryan Huffman
28f6c4021b Fix compilation errors in EntityServer 2015-07-10 17:27:56 -07:00
Ryan Huffman
bfb878210f Fix compilation errors in AudioMixer 2015-07-10 17:27:45 -07:00
Ryan Huffman
8c04aafe67 Update Agent to use PacketReceiver 2015-07-10 17:08:07 -07:00
Ryan Huffman
e0d165bdd8 Fix packet type in AssignmentClient for StopNode 2015-07-10 16:48:28 -07:00
Ryan Huffman
cc7bfd90f1 Move audio packet handling to listener in Agent 2015-07-10 16:27:42 -07:00
Ryan Huffman
910836fa5a Remove readPendingDatagrams from AudioMixer 2015-07-10 16:14:40 -07:00
Ryan Huffman
0d920c7b7c Update method name in AssignmentClient 2015-07-10 16:14:23 -07:00
Ryan Huffman
5c831efe64 Remove avatar packet processing from Agent 2015-07-10 16:13:57 -07:00
Ryan Huffman
1fb4c13b3c Update AssignmentClient to use PacketReceiver 2015-07-10 15:51:12 -07:00
Ryan Huffman
74afbd7de7 Fix AudioMixer packetReceiver calls 2015-07-10 14:22:46 -07:00
Ryan Huffman
09f978207b Add packet handling to OctreeServer 2015-07-10 12:23:58 -07:00
Ryan Huffman
1ee7a83927 Add EntityServer packet handling 2015-07-10 12:23:35 -07:00
Ryan Huffman
99121a3a20 Fix AudioMixer not using PacketReceiver correctly 2015-07-10 12:22:53 -07:00
Atlante45
6c591131ba Made Animations safe for resource reload 2015-07-10 12:01:51 -07:00
Ryan Huffman
c841867044 Update AudioMixer to use PacketReceiver 2015-07-10 09:37:24 -07:00
Seth Alves
2dc4922da3 bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00
Atlante45
c77310019d Some .get() cleanup 2015-07-09 14:03:32 -07:00
Atlante45
f90f3a05be Fail in Packet::create if size is invalid 2015-07-09 13:11:43 -07:00
Atlante45
e1fc242967 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 12:45:46 -07:00
Stephen Birarda
14b73ae00f remove qtimespan that isn't used anymore 2015-07-09 12:45:32 -07:00
Atlante45
2b6d79e030 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 12:33:23 -07:00
Atlante45
e4051f9e30 Remove unnecessary .get() 2015-07-09 12:32:18 -07:00
Stephen Birarda
a38cb56c1c fix an accidental comment add 2015-07-09 11:56:24 -07:00
Stephen Birarda
8e693bfee7 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-09 11:53:27 -07:00
Atlante45
94d2fce1dd Fix sendNackPackets logic 2015-07-09 11:52:57 -07:00
Stephen Birarda
806862fae9 pass existing SharedNodePointer from EntityServer 2015-07-09 11:50:39 -07:00
Stephen Birarda
a49b985dad fix call to packetSent from EntityServer 2015-07-09 11:37:20 -07:00
Stephen Birarda
d3d3b84a20 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-09 11:36:21 -07:00
Stephen Birarda
83cc4380a7 fix for sentPacketHistory dequeue 2015-07-09 11:36:12 -07:00
Atlante45
cc0e0e6a1f Compile fixes in assignment client 2015-07-09 11:35:36 -07:00
Stephen Birarda
7e07754773 fix octreePacketSent call with const NLPacket& 2015-07-09 11:35:12 -07:00
Stephen Birarda
659f6742c6 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-09 11:21:36 -07:00
Stephen Birarda
922d6413d5 change some const unique_ptr to const NLPacket 2015-07-09 11:21:27 -07:00
Atlante45
297d38d4eb Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 11:20:25 -07:00
Atlante45
605b004514 Assigment client compile fixes 2015-07-09 11:19:36 -07:00
Stephen Birarda
885068bd6b create billboard and identity packets of the right size 2015-07-09 11:15:45 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Stephen Birarda
5dc09692b4 more packet creation fixes for entitites 2015-07-08 18:13:06 -07:00
Stephen Birarda
04b3ca3efd fix a bad replacement in AvatarMixer 2015-07-08 10:43:05 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Andrew Meadows
a0a1b01ea9 coalesce dupe action data members: _id and _type 2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7 make some arguments const, cleanup some #includes 2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821 some ObjectAction methods should be const 2015-07-07 17:50:08 -07:00
Stephen Birarda
6c6143f21e remove NetworkPacket and replace with NodePacketPair 2015-07-07 16:56:05 -07:00
Stephen Birarda
ff487ee092 move the AudioClient mix packet 2015-07-07 16:30:50 -07:00
Stephen Birarda
2a69a89696 Merge remote-tracking branch 'huffman/atp' into atp 2015-07-07 16:27:18 -07:00
Ryan Huffman
60538d4a82 Merge branch 'atp' of github.com:birarda/hifi into atp 
Conflicts:
	libraries/audio-client/src/AudioIOStats.cpp
 2015-07-07 16:26:22 -07:00
Ryan Huffman
3690ecc28f Add std::move to sendPacket calls 2015-07-07 16:24:11 -07:00
Stephen Birarda
631c745784 allow equal for piggyback check in OctreeSendThread 2015-07-07 16:21:14 -07:00
Stephen Birarda
6a76f858d8 close of PacketList not required to count last packet 2015-07-07 16:17:15 -07:00
Stephen Birarda
1f68ad892a replace PacketList usage with NLPacketList 2015-07-07 16:14:57 -07:00
Stephen Birarda
56880e8858 return fixes for NAK PacketLists 2015-07-07 15:33:03 -07:00
Stephen Birarda
ff18a05507 CR fixes for octree classes 2015-07-07 15:21:10 -07:00
Stephen Birarda
2944746629 add a TODO for reading NAK fix 2015-07-07 15:15:15 -07:00
Stephen Birarda
c8a03ebff8 cleanup NAK packets in OctreeInboundPacketProcessor 2015-07-07 15:14:27 -07:00
Stephen Birarda
adacf3fd89 CR fixes in AvatarMixer 2015-07-07 15:03:49 -07:00
Stephen Birarda
ffa6edc904 fix spaces created by xcode find/replace 2015-07-07 15:01:19 -07:00
Stephen Birarda
f6cd67f75e repairs to stats packet in AudioMixerClientData 2015-07-07 14:57:39 -07:00
Stephen Birarda
171ebf5437 fix for mix packet sizes in audio 2015-07-07 14:51:21 -07:00
Stephen Birarda
6760b048b6 fix for initialization of mute packet 2015-07-07 14:50:37 -07:00
Stephen Birarda
e7fee26d1a give specific packet size for audio env packet 2015-07-07 14:50:05 -07:00
Stephen Birarda
abfda21814 CR fixes in AssignmentClientMonitor 2015-07-07 14:47:36 -07:00
Stephen Birarda
e953b36f58 handle stats + data packet combination in OctreeSendThread 2015-07-07 12:56:20 -07:00
Stephen Birarda
01b1c46237 more networking API changes in octree classes 2015-07-07 12:31:22 -07:00
Stephen Birarda
fca23cc69b make SentPacketHistory use NLPacket 2015-07-07 12:14:40 -07:00
Stephen Birarda
74924bc5f1 initial changes to OctreeQueryNode for new APIs 2015-07-07 12:08:01 -07:00
Stephen Birarda
474b82e3bf fix nack packet sending in OctreeInboundPacketProcessor 2015-07-07 11:28:57 -07:00
Stephen Birarda
9a31b22243 use NLPacket and sendPacket for audio stream stats 2015-07-06 17:48:21 -07:00
Stephen Birarda
61c4e6d72e some network API reworking in AvatarMixer 2015-07-06 17:37:41 -07:00
Stephen Birarda
269bea65fb fix AssignmentClientMonitor and AudioMixer to use NLPacket 2015-07-06 17:20:08 -07:00
Stephen Birarda
37fd954066 remove used of PacketPayload in AudioMixer 2015-07-06 17:15:01 -07:00
Stephen Birarda
9a521fee47 change audio environment packet creation 2015-07-06 16:53:53 -07:00
Stephen Birarda
672c5a8414 use new packet creation for client audio 2015-07-06 16:49:48 -07:00
Stephen Birarda
5a57e9861c packet API changes in AssignmentClientMonitor 2015-07-06 16:38:33 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Stephen Birarda
b3c3e5a6c8 more PacketType to PacketType::Value replacements 2015-07-02 16:49:19 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
Seth Alves
246861221c rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready. 2015-07-01 20:17:21 -07:00
ZappoMan
24b4614703 add more detailed edit timing to entity server 2015-07-01 16:11:08 -07:00
ZappoMan
ce613d59fd add inbound edit packet queue depth to entity server 2015-07-01 14:46:37 -07:00
Seth Alves
5ab2c8d724 rename variable to be more descriptive 2015-07-01 12:24:50 -07:00
Seth Alves
e8a6acd65b responses to code review 2015-07-01 10:42:04 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Seth Alves
0970f010a4 provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are 2015-06-27 13:31:00 -07:00
Seth Alves
30be515a94 remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity 2015-06-27 08:53:27 -07:00
Seth Alves
005bd8bda5 merge from upstream 2015-06-26 12:33:35 -07:00
Stephen Birarda
a77cf4fb7f fix audio-mixer shutdown on UNIX/OS X 2015-06-25 16:34:38 -07:00
Seth Alves
f50ac9dcd5 remove debugging print 2015-06-22 13:12:05 -07:00
Seth Alves
5381e6e9bb entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion 2015-06-19 16:20:07 -07:00
Seth Alves
f9618ca2cb implicit cast 2015-06-18 10:07:12 -07:00
Seth Alves
7391aebf60 fix change that introduced interger division 2015-06-17 06:51:38 -07:00
Seth Alves
fdd5953e44 fix change that introduced interger division 2015-06-17 06:48:06 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Stephen Birarda
81460e48f4 fix for sticking windows audio-mixer 2015-06-11 17:25:27 -07:00
Seth Alves
32cc0eacfc improve a debug print 2015-05-22 15:21:26 -07:00
Seth Alves
53fe41ef4d improve a debug print 2015-05-22 15:11:56 -07:00
Seth Alves
945a84d24f adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum 2015-05-22 15:01:43 -07:00
Seth Alves
52ce26d80d Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-21 09:20:56 -07:00
Seth Alves
7ee2ff6777 Merge pull request #4922 from birarda/ac-ice-connect 
handle AC started before local assignment server
 2015-05-20 19:40:24 -07:00
Seth Alves
38edc27cbb Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 18:24:40 -07:00
Brad Davis
079a7f2600 Fix assert caused by calling glm::perspective with nonsensical values 2015-05-20 18:11:14 -07:00
Stephen Birarda
b6f458eaf1 Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect 2015-05-20 17:59:40 -07:00
Stephen Birarda
45daabc86f remove unused AssignmentClient shared mem var 2015-05-20 17:14:27 -07:00
Stephen Birarda
bea387af7d extra debug for failed local AS port read 2015-05-20 17:13:18 -07:00
Stephen Birarda
7373bb6817 contain QSharedMemory for local server port to reader 2015-05-20 17:11:08 -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
Brad Davis
c94b8b6e30 Merge branch 'master' into dk1 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-05-13 21:25:56 -07:00
Stephen Birarda
ca87d64dc7 fix for audio-mixer shutdown hang, removing spaces 2015-05-13 12:03:21 -07:00
Brad Davis
41d587bd2e Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"" 
This reverts commit 6e8c067bcb.

Conflicts:
	interface/src/Camera.h
 2015-05-12 14:47:44 -07:00
samcake
6e8c067bcb Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff" 2015-05-12 14:34:43 -07:00
Brad Davis
464925ecc7 Fixing the assignment client 2015-05-12 01:15:30 -07:00
Seth Alves
866a6fba9b Merge pull request #4823 from birarda/master 
repairs to AC stop and clean shutdown
 2015-05-11 18:11:52 -07:00
Stephen Birarda
a6ce721586 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-05-11 16:20:16 -07:00
Stephen Birarda
7b903d29e7 fix missed conflict on merge with upstream/master 2015-05-11 12:58:00 -07:00
Seth Alves
83748096ef max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree 2015-05-11 11:37:53 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Stephen Birarda
2dc866755d fix OS comments, remove test call from Agent 2015-05-11 09:56:10 -07:00
Stephen Birarda
ebeba81233 make sure an ACM asks for PID in log 2015-05-08 17:37:48 -07:00
Stephen Birarda
be03a65dc7 remember the pid of previous child processes 2015-05-08 17:30:22 -07:00
Stephen Birarda
7b91dbfe07 wait on all children simultaneously 2015-05-08 17:24:20 -07:00
Stephen Birarda
2916596948 put back call to clearAccessCache 2015-05-08 16:54:35 -07:00
Stephen Birarda
83cd50c7ae use waitOnChildren again from checkSpares 2015-05-08 16:24:20 -07:00
Stephen Birarda
ba2ccc1e98 change waitOnChildren syntax in AC monitor 2015-05-08 16:23:44 -07:00
Stephen Birarda
b5d0a31ad4 remove clear access cache on Agent stop 2015-05-08 15:25:49 -07:00
Stephen Birarda
07d8a6a8ae remove debug for current state of ACM child process 2015-05-08 15:23:22 -07:00
Stephen Birarda
4c93e395ad ask QCoreApplication to quit when PacketTypeStopNode received 2015-05-08 15:22:58 -07:00
Stephen Birarda
fe2775ca94 print out state before wait 2015-05-08 15:10:37 -07:00
Stephen Birarda
15fdcb4fe0 fix non-block, add exit code debug 2015-05-08 15:09:11 -07:00
Stephen Birarda
e092b8c537 give each child one second to clean up 2015-05-08 15:04:54 -07:00
Stephen Birarda
78a1bcdcae add helpful debug for AC monitor cleanup 2015-05-08 15:01:03 -07:00
Stephen Birarda
897ed84cca remove debug calls used to find ACApp stall 2015-05-08 14:56:49 -07:00
Stephen Birarda
8307553d1b don't call exec from ACApp ctor 2015-05-08 14:53:30 -07:00
Stephen Birarda
692c3497cd return the actual exit code from the application 2015-05-08 14:45:46 -07:00
Stephen Birarda
aca71474d8 add debugging to AC monitor to capture hang 2015-05-08 14:43:31 -07:00
Stephen Birarda
0a295bada1 add debugging to catch AC kill hang 2015-05-08 14:32:16 -07:00
Stephen Birarda
99a9f2df90 don't allow an AC monitor to take over other local ACs 2015-05-08 14:02:19 -07:00
Stephen Birarda
df6ee4c7a5 immediately terminate instead of attempting network stop 2015-05-08 12:10:13 -07:00
Stephen Birarda
3d06a86670 drop packets on floor when shutting down 2015-05-08 11:57:25 -07:00
Stephen Birarda
fe1b8cc52b fix entity tree reset / add OST assert for myServer 2015-05-08 11:04:22 -07:00
Stephen Birarda
be58347aec consider assignment completed when worker thread is gone 2015-05-08 10:40:04 -07:00
Stephen Birarda
b080dfc1cf change comment for AC readyRead connect 2015-05-08 10:16:39 -07:00
Stephen Birarda
0f71e93c7f ensure no new OST creation on OctreeServer shutdown 2015-05-08 10:12:14 -07:00
Stephen Birarda
bab96a7711 more connect call fixes in AssignmentClient 2015-05-08 09:29:29 -07:00
Stephen Birarda
805250d1e1 don't double conditional to fire SN assert 2015-05-08 09:25:44 -07:00
Stephen Birarda
3e0029e6e6 use .data on QPointer for slot connection 2015-05-07 17:29:31 -07:00
Stephen Birarda
4c8c24eb00 remove an extra debug 2015-05-07 17:04:45 -07:00
Stephen Birarda
d75d204ff6 standardize cleanup of ThreadedAssignments 2015-05-07 17:03:43 -07:00
Stephen Birarda
bfccf02912 use lamdbas for linkedDataCreateCallback 2015-05-07 15:37:02 -07:00
Stephen Birarda
790f7a08cf clean up sequence numbers for killed sending nodes 2015-05-07 14:34:06 -07:00
Stephen Birarda
fe011e6752 keep track of out of order sends in AM 2015-05-07 14:13:27 -07:00
Stephen Birarda
b3f7ec1545 keep track of starves and skips on other avatars 2015-05-06 16:49:51 -07:00
Stephen Birarda
e540a6dbb3 fix packet sequence number unmarshal 2015-05-06 14:48:10 -07:00
Stephen Birarda
ff676958e8 fix hash replacement in PacketHeaders 2015-05-06 14:24:11 -07:00
Stephen Birarda
0d1c1bf8dd lock NodeData when attempting to read stats 2015-05-06 11:51:46 -07:00
Stephen Birarda
460abd85b9 don't double send data to a receiver 2015-05-06 11:35:45 -07:00
Stephen Birarda
3887467048 store last broadcasted sequence number 2015-05-06 10:41:24 -07:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Stephen Birarda
31bbf15a55 remove unused variable 2015-05-04 11:30:56 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Stephen Birarda
274e98974b Merge pull request #4734 from Atlante45/ac_fix 
Fix for bot_procedural
 2015-05-04 12:44:08 -04:00
Seth Alves
9f1cb2a4e5 fix kill/terminate order 2015-05-01 16:56:39 -07:00
Seth Alves
23c44500d8 no magic numbers 2015-05-01 16:45:04 -07:00
Stephen Birarda
83d6569aa1 reference QTimer member variable for AvatarMixer 2015-05-01 16:34:50 -07:00
Seth Alves
4eac60b463 try harder to make sure all the assignment-client children stop 2015-05-01 16:34:44 -07:00
Stephen Birarda
475861c4be move KILO_PER_MEGA to numerical constants 2015-05-01 16:30:25 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Stephen Birarda
d602c71346 cleanup audio-mixer stats, add username interpolation 2015-05-01 16:12:46 -07:00
Stephen Birarda
99bddcc102 insert usernames to JSONBreakableMarshal interpolate map 2015-05-01 15:45:53 -07:00
Stephen Birarda
8037d383b1 remove extra debugging from AvatarMixer 2015-05-01 15:20:07 -07:00
Stephen Birarda
a7bff474e3 use JSONBreakableMarshal in AC monitor to get QJsonObject 2015-05-01 15:18:49 -07:00
Stephen Birarda
532bcc9376 complete initial algorithm for AM throttle 2015-05-01 14:56:40 -07:00
Stephen Birarda
67efa7796f use only AD rate for FRD adjustment 2015-05-01 10:38:32 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Stephen Birarda
744d026e81 initial pass at tailoring the FRD for send rate 2015-04-30 17:16:31 -07:00
Stephen Birarda
5b55a52a04 add check in AvatarMixer for next adjustment 2015-04-30 15:36:31 -07:00
Atlante45
95b4c75f9f Add missing DM::set<>() calls 2015-05-01 00:21:29 +02:00
Stephen Birarda
3e842d7e34 add debug for result values from DS settings 2015-04-30 14:59:03 -07:00
Stephen Birarda
5936073425 get avatar-mixer settings from domain-server 2015-04-30 14:55:53 -07:00
Stephen Birarda
17142a532f add stats for max FRD and num avatars last frame 2015-04-30 10:09:23 -07:00
Stephen Birarda
3a10da688f switch the avatar stat to kbps 2015-04-30 08:56:08 -07:00
Stephen Birarda
2c0604afd1 fix string JSON unmarshal, add basic avatar values 2015-04-30 08:55:08 -07:00
Seth Alves
09eea83461 don't give timers owners while also keeping track of them in as class instance variables 2015-04-29 19:18:58 -07:00
Stephen Birarda
842886d0fc add back read_pending_datagrams stats 2015-04-29 16:28:47 -07:00
Seth Alves
b041fd1b7f AssignmentClientMonitor now waits() on children 2015-04-29 15:58:56 -07:00
Seth Alves
69766f6e59 cleanups 2015-04-29 15:34:31 -07:00
Seth Alves
e985f56b12 cleanups 2015-04-29 15:30:13 -07:00
Seth Alves
009bb9dc71 all 4 types of assignment-client appear to exit cleanly, now 2015-04-29 15:16:00 -07:00
Seth Alves
e7d8bccd5d cleanups 2015-04-29 12:03:54 -07:00
Seth Alves
d2cd4fc405 types 0 and 1 exit cleanly, type 6 crashes 2015-04-29 11:56:45 -07:00
Seth Alves
02fd9987c7 rework audio mixer so it can exit cleanly 2015-04-28 18:38:41 -07:00
Stephen Birarda
68998f4423 cleanup AudioMixer stats to be properly nested 2015-04-28 18:19:16 -07:00
Stephen Birarda
77be0012cf cleanup stats packaging in AudioMixer 2015-04-28 15:35:51 -07:00
Stephen Birarda
85a3b5597c use a distance per avatar for conditional avatar data broadcast 2015-04-28 15:01:06 -07:00
Atlante45
604a13f8ad Only editor can mute environment 2015-04-15 17:04:59 +02:00
Stephen Birarda
1d5f1807f7 Merge pull request #4562 from sethalves/editors-are-rezzers 
add a bool value to Node which indicates if it is allowed to rez new ent...
 2015-03-31 18:53:29 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
Stephen Birarda
61806935bb add a networking constants class with metaverse URL 2015-03-31 16:40:21 -07:00
David Rowe
154dacf791 Fix typo 2015-03-31 14:21:56 -07:00
Seth Alves
9428857194 quiet compiler, remove extra-assignment/typo 2015-03-28 17:10:16 -07:00
Brad Davis
bf607e4c9c Fixing indentation and usage 2015-03-19 15:53:16 -07:00
Brad Davis
72957670ba Some commentary 2015-03-19 09:55:03 -07:00
Brad Davis
160f666d89 Merge branch 'master' into avatar 2015-03-18 12:55:56 -07:00
Brad Davis
6415ff99f6 Work in progress 2015-03-17 12:04:04 -07:00
Brad Davis
d7b1852164 Creating eachMatchingNode and using it in avatar mixer 2015-03-16 15:25:44 -07:00
Seth Alves
3bc85c2531 instead of a json checkbox, a dropdown to chose the file type 2015-03-12 09:34:01 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
ZappoMan
e87e0a1e0b some cleanup of dead code related to timers 2015-03-11 16:27:04 -07:00
Brad Hefta-Gaub
00b731a868 Merge pull request #4372 from sethalves/fix-assignment-client-monitor 
pass -t to children even if run in parent mode.  monitor (parent) only i...
 2015-03-06 12:08:32 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
Seth Alves
8affca6120 pass -t to children even if run in parent mode. monitor (parent) only interacts with its own children 2015-03-03 14:58:53 -08:00
Brad Hefta-Gaub
b88d52a310 Merge pull request #4363 from huffman/block-restricted-users 
Add permission-checking to edit entities
 2015-03-03 11:04:46 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
Seth Alves
fb4f2fe89c Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-27 10:19:06 -08:00
Seth Alves
b8322556a6 address code-review comments 2015-02-26 17:34:24 -08:00
Seth Alves
c80995170a -n and -t are okay together 2015-02-26 17:17:19 -08:00
Seth Alves
7c7d727b55 mv ShutdownEventListener into class which is a child of QCoreApplication 2015-02-26 10:07:48 -08:00
Seth Alves
0918d4989b mv ShutdownEventListener into class which is a child of QCoreApplication 2015-02-26 09:53:23 -08:00
Seth Alves
f157c5c60d Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-26 09:13:49 -08:00
Seth Alves
128a38100f Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x 2015-02-25 14:13:55 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Seth Alves
1a4808857e put local domain server's http port into shared memeory 2015-02-25 11:30:54 -08:00
Seth Alves
0ce49888ff AssignmentClientApp is QCoreApplication, other classes aren't. If --min is set and all the assignment clients exit (probably due to domain server restarting), respawn until --min is statisfied. 2015-02-25 09:20:34 -08:00
Seth Alves
5c5ffc07ab allow client count to drift as needed if the user doesn't specify --min or --max 2015-02-24 17:43:08 -08:00
Seth Alves
c9d6a44c3a fix up command-line parsing 2015-02-24 16:56:13 -08:00
Stephen Birarda
09ffcbb2e8 Revert "Merge pull request #4324 from sethalves/assignment-client-keep-a-spare" 
This reverts commit 087e2babde, reversing
changes made to 5202d2136a.
 2015-02-24 12:30:40 -08:00
Stephen Birarda
087e2babde Merge pull request #4324 from sethalves/assignment-client-keep-a-spare 
Assignment client keep a spare
 2015-02-24 11:40:43 -08:00
Seth Alves
0b9b7f06cc address various comments from code review 2015-02-23 11:12:19 -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
Seth Alves
270d509a12 cleanups 2015-02-20 14:29:12 -08:00
Seth Alves
8cee88acb4 network chatter between Monitor and AssignmentClients is expected to be localhost only 2015-02-20 14:25:43 -08:00
Seth Alves
4bba4fc387 cleanups 2015-02-20 13:44:37 -08:00
Seth Alves
907be67135 cleanups 2015-02-20 13:34:51 -08:00
Seth Alves
bd3d7124e2 cleanups 2015-02-20 13:31:58 -08:00
Seth Alves
56d237ae8b cleanups 2015-02-20 13:28:24 -08:00
Seth Alves
feb0e7ac31 AssignmentClientMonitor doesn't keep a list of its children. Instead it knows about active children due to their entries in the NodeList. Every few seconds, if 2 or more children are idle, the Monitor will ask one to exit 2015-02-20 13:26:59 -08:00
Stephen Birarda
a85cb2eeaa don't log glm install so it is shown in log 2015-02-20 12:18:14 -08:00
Seth Alves
4b3183d820 AssignmentClients accept an id on the command-line. 
AssignmentClientMonitor now has a NodeList.  It stores its local port
in shared memory, like the DomainServer does.  As it spawns children,
it addes Nodes to the NodeList for each one.  The children send status
updates to the Monitor.  The Monitor will notice if there are no
spares and fork another child.
 2015-02-19 17:44:06 -08:00
Stephen Birarda
31b136f807 resolve conflicts on merge with upstream/master 2015-02-18 16:19:15 -08:00
Philip Rosedale
f6f54809d0 Merge pull request #4291 from Atlante45/reverb_smoothing 
Reverb smoothing
 2015-02-18 15:34:14 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -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
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Stephen Birarda
68c19866c4 call dll copy after project deps are setup 2015-02-17 17:17:30 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Andrew Meadows
53855c89e9 Merge pull request #4289 from birarda/dependencies 
add gverb and glm as cmake external projects
 2015-02-17 10:00:29 -08:00
Atlante45
b59aaf8a0f Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 
Conflicts:
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-02-16 16:14:49 +01:00
Andrew Meadows
76b10a60ba Merge pull request #4285 from ZappoMan/editLogging 
added logging of edit commands in the server
 2015-02-13 17:02:05 -08:00
ZappoMan
1fc0225939 change ScriptCache and SoundCache to derive from Dependency 2015-02-13 15:33:41 -08:00
ZappoMan
bc5a1477e6 added logging of edit commands in the server 2015-02-13 14:59:57 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
9136154cd5 fix double subdir include, clear up build guide 2015-02-13 10:48:27 -08:00
Stephen Birarda
df8e51f835 use external project glm in more targets 2015-02-13 10:21:21 -08:00
Seth Alves
b9882e6488 if a MetavoxelEditMessage is received from a node which is not an editer of this domain, ignore it 2015-02-11 16:53:32 -08:00
Atlante45
e79e1a547f Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 
Conflicts:
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-02-10 16:08:34 +01: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
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-01-28 13:13:32 -08:00
Atlante45
98fc1836d8 Revert "Use QDickCache for every QNAM" 
This reverts commit 2f39b93823.
 2015-01-27 18:09:22 -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
2f39b93823 Use QDickCache for every QNAM 2015-01-21 11:12:11 -08:00
Atlante45
e1725d1eee Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 17:41:08 -08:00
Andrzej Kapolka
f8f9c25d38 Back to JPG compression for heightfield colors. 2015-01-19 14:59:28 -08:00
Atlante45
43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
 2015-01-19 14:18:22 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Atlante45
bd9668b9fa Change WetLevel modulation 2015-01-15 18:23:43 -08:00
Atlante45
46db3277eb Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 2015-01-14 17:41:14 -08:00
Atlante45
692d9d060e Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/ModelUploader.cpp
 2015-01-14 17:14:18 -08:00
Atlante45
7b5babb02a Set AddressManager before NodeList 2015-01-14 15:46:33 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
ZappoMan
60aec8ac00 add support for multiple backup rules 2015-01-13 13:41:32 -08:00
Atlante45
d8170516ff Remove VoxelServer.cpp kept during merge 2015-01-13 11:05:51 -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
Andrzej Kapolka
cad8313e56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-12 12:00:20 -08:00
Andrew Meadows
58b965c9a2 lock Octree higher when extracting things from bag 2015-01-09 16:12:43 -08:00
Andrzej Kapolka
e3074d726b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/metavoxels/src/Spanner.cpp
 2015-01-09 11:52:05 -08:00
Philip Rosedale
336378679f Merge pull request #4068 from ctrlaltdavid/type-definitions 
Fix miscellaneous types and casts
 2015-01-09 08:40:08 -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
Andrzej Kapolka
c99e2c3ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-01-08 14:57:03 -08:00
David Rowe
07b30da2ac Fix miscellaneous types and casts 2015-01-08 13:44:51 -08:00
Philip Rosedale
413cbacbc1 Merge pull request #4043 from ZappoMan/voxelEctomy 
more voxel-ectomy cleaning up some remaining references to voxels
 2015-01-06 10:07:38 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -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
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
e1d8022409 working on removing voxels 2014-12-30 14:11:31 -08:00
Andrzej Kapolka
c78d38b925 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-29 14:38:17 -08:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Clement
6f52cf6ee9 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 
Conflicts:
	interface/src/Audio.cpp
 2014-12-29 09:48:38 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
Sam Gateau
4c670ac17a merging with upstream master and origin temp0 2014-12-22 10:38:11 -08:00
Sam Gateau
967c6dbc4b Add the Model library 2014-12-19 16:19:06 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Atlante45
990362b8ff Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-18 14:18:21 -08:00
Stephen Birarda
d38c78f2c3 remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
Andrzej Kapolka
ab52f434c9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-16 17:07:16 -08:00
Atlante45
c40e83c9e4 Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-16 15:42:40 -08:00
Stephen Birarda
1db12453d4 move audio stats into member of Audio 2014-12-16 14:47:24 -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
ZappoMan
660bf2720e convert AnimationCache to DependencyManager 2014-12-15 19:48:15 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
Andrzej Kapolka
828813dd07 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-11 14:57:36 -08:00
Atlante45
1f35e130ef Smooth reverb wet level on room edges 2014-12-11 12:33:40 -08:00
Stephen Birarda
f58d21d6f0 have ShutdownEventListener handle WM_CLOSE or SIGTERM 2014-12-11 10:21:11 -08:00
Andrzej Kapolka
c96be3fe3d Removed unused functions, stubbing out "stack" layer. 2014-12-05 17:46:28 -08:00
Andrzej Kapolka
6764f29cd2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 16:49:10 -08:00