Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 00:43:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30770 commits 25 branches 0 tags 1.1 GiB
Commit graph

30770 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
9ab46d696d Merge pull request #5601 from birarda/master 
fix for Packet read in AvatarHashMap
 2015-08-19 15:31:23 -07:00
Stephen Birarda
c8fbb64bbf fix AvatarHashMap read due to COW 2015-08-19 14:36:16 -07:00
Stephen Birarda
6860f3d126 add readWithoutCopy for clarity in Packet read 2015-08-19 14:32:26 -07:00
Brad Hefta-Gaub
4696fc961a Merge pull request #5599 from cozza13/20659 
CR for Job #20659 - change default.js
 2015-08-19 13:50:49 -07:00
Stephen Birarda
42a7262707 Merge pull request #5565 from murillodigital/node-version 
DO NOT MERGE - Node versioning
 2015-08-19 13:32:48 -07:00
Chris Collins
846ca3b86b removed mouselook 
removed mouselook
 2015-08-19 12:58:26 -07:00
Chris Collins
9605294ea8 Removed HMDcontrol.js from default scripts 
Removed HMDcontrol.js from default scripts. Will put back when
HMDcontrol is fixed
 2015-08-19 12:55:52 -07:00
ZappoMan
92ae3e758c restore DEFAULT_FAR_CLIP to 16km 2015-08-19 12:28:07 -07:00
Ryan Huffman
5884fcb17b Merge branch 'ordered-sending' into atp-server 2015-08-19 12:23:31 -07:00
Ryan Huffman
ebb4db134d Temporarily disable assert in ScriptCache 2015-08-19 12:18:01 -07:00
Ryan Huffman
330a6bb279 Update TextureCache to work with ResourceCache updates 2015-08-19 12:17:36 -07:00
Ryan Huffman
e1f8b6700c Update GeometryCache to work with ResourceCache updates 2015-08-19 12:17:19 -07:00
Ryan Huffman
7305135125 Update ResourceManager 2015-08-19 12:16:34 -07:00
Ryan Huffman
4827d326f4 Update ResourceCache to allow multiple downloads on the same resource 2015-08-19 12:11:47 -07:00
Ryan Huffman
51d4cf84da Fix AnimationReader to work with new ResourceCache updates 2015-08-19 12:10:47 -07:00
Ryan Huffman
a168a1058f Update filename regex in AssetServer to allow extensions 2015-08-19 12:09:46 -07:00
Ryan Huffman
d18ce5066f Fix error with Assignment::Type not being hashable 2015-08-19 11:55:06 -07:00
Ryan Huffman
121d3a77ad Fix iterator usage in SendQueue 2015-08-19 11:27:31 -07:00
Seiji Emery
6b5fb60fcf Merge remote-tracking branch 'highfidelity/master' into gputest 2015-08-19 11:24:15 -07:00
Thijs Wenker
fd7d186ffb Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-19 20:23:45 +02:00
ZappoMan
684ee3bdd0 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-19 11:20:15 -07:00
Thijs Wenker
ecd368fac3 new style qt connectors 2015-08-19 20:00:06 +02:00
Ryan Huffman
fc29297d87 Update SendQueue::queuePacketList to use splice 2015-08-19 10:55:26 -07:00
Seth Alves
537b690d60 Merge pull request #5566 from howard-stearns/recapitate 
Get rid of separate head/body avatar
 2015-08-19 10:46:05 -07:00
Ryan Huffman
df51069305 Rename getAllData to getMessage 2015-08-19 10:39:19 -07:00
Thijs Wenker
07ae00f207 Close WebSocket properly after ScriptEngine finished running 2015-08-19 19:33:48 +02:00
Andrew Meadows
990dce6795 Merge pull request #5578 from sethalves/polyvox 
Polyvox improvements
 2015-08-19 10:31:13 -07:00
Brad Hefta-Gaub
f8bdfbb271 Merge pull request #5598 from howard-stearns/kill-render-assert 
kill render assert
 2015-08-19 10:30:25 -07:00
Howard Stearns
0a8c1846e9 This assert causes dev builds to fail when starting interface. 2015-08-19 10:24:31 -07:00
Ryan Huffman
ebf112e200 Replace NLPacketList::getSourceID() with const& return 2015-08-19 10:03:52 -07:00
Ryan Huffman
da7c9198c5 Remove superfluous log message 2015-08-19 10:01:40 -07:00
Ryan Huffman
5ba3280975 Remove <list> include in NLPacketList 2015-08-19 10:01:16 -07:00
Brad Davis
9e54244101 Merge pull request #5597 from highfidelity/revert-5582-bart 
Revert "Updating to the new version of the sixense library"
 2015-08-19 09:45:15 -07:00
Brad Davis
aba7bebf6e Revert "Updating to the new version of the sixense library" 2015-08-19 09:44:51 -07:00
Ryan Huffman
f2b4c0e269 Merge listener signatures into intializer list in PacketListener 2015-08-19 09:03:31 -07:00
Ryan Huffman
f5aac5f086 Remove unused include 2015-08-19 09:02:17 -07:00
Ryan Huffman
3c5483a008 Fix style issue with const 2015-08-19 08:59:05 -07:00
Ryan Huffman
10cd315a10 Fix QMutexLocker in PacketReceiver 2015-08-19 08:58:53 -07:00
Ryan Huffman
c6a8ccd490 Replace usage of qDebug with qCDebug in PacketReceiver 2015-08-19 08:56:48 -07:00
Ryan Huffman
cda0aaf7cf Update PacketReceiver to use scoped locks 2015-08-19 08:54:24 -07:00
Thijs Wenker
9af7205672 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-19 16:49:39 +02:00
Ryan Huffman
92dadb437c Replace magic number '30' for number of bits in message number 2015-08-18 23:15:47 -07:00
Ryan Huffman
74547777df Add basic test to send packetList in udt-test 2015-08-18 23:12:09 -07:00
Ryan Huffman
97bb36add4 Add constant for message line size 2015-08-18 23:11:47 -07:00
Ryan Huffman
63d0205d1e Move domain settings retrieval to UDT 2015-08-18 23:11:33 -07:00
Ryan Huffman
62eaaed9e5 Add PacketList support to LimitedNodeList 2015-08-18 23:10:05 -07:00
Ryan Huffman
0b3986ef9b Replace NLPacket unique_ptr ctor with && ctor 2015-08-18 23:09:02 -07:00
Ryan Huffman
9154067cfb Add PacketList interface to PacketReceiver 2015-08-18 23:08:25 -07:00
Ryan Huffman
69a2d0b5b0 Add 32-bit message data to packet header 2015-08-18 23:07:54 -07:00
Ryan Huffman
46d5f73e4e Add support for creating NLPacketList from PacketList 2015-08-18 23:07:08 -07:00