Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 07:29:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
30517 commits 74 branches 59 tags 1.2 GiB
Commit graph

749 commits

Author SHA1 Message Date
Brad Davis
8cd13cad00 Merge pull request #5661 from sethalves/linux-memory-debugger 
call setup_memory_debugger from common macros rather than from everywhere
 2015-08-26 15:43:08 -07:00
Andrew Meadows
0835b79e33 Merge pull request #5646 from birarda/ds-cleanup 
de-bloat the domain-server by adding a gatekeeper
 2015-08-26 15:42:43 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Stephen Birarda
e8772277de de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
ZappoMan
92ae3e758c restore DEFAULT_FAR_CLIP to 16km 2015-08-19 12:28:07 -07:00
ZappoMan
44fcf71f07 change domain to be 32k and still have origin centered at 0 2015-08-14 15:26:49 -07:00
ZappoMan
4fe8f49d4c move origin to center of domain 2015-08-11 23:47:40 -07:00
ericrius1
205a2d53b6 no longer returning early on NaN 2015-08-07 16:15:51 -07:00
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -07:00
Atlante45
3dc8bd47ae Fix warning and remove unused headers 2015-08-05 16:46:44 -07:00
Andrew Meadows
5be8583b7d Merge pull request #5494 from sethalves/gzip-json-entity-persist-files 
gzip json entity persist files
 2015-08-05 10:56:03 -07:00
Seth Alves
fcec6cb1f0 Merge pull request #5464 from nnesse/master 
Remove redundant code in getOrCreateChildElementAt()
 2015-08-04 15:54:14 -07:00
Seth Alves
5369f4c5eb adjust comments 2015-08-04 08:25:33 -07:00
Seth Alves
adcd91e3ff Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options. 2015-08-04 07:23:24 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
Niels Nesse
85f06639a5 Remove redundant code in getOrCreateChildElementAt() 2015-07-30 12:50:57 -07:00
Andrew Meadows
0a5ada3c09 remove legacy shapes 2015-07-29 09:02:24 -07:00
ericrius1
a44e5f949c Merge branch 'master' into polyLineInProgress 2015-07-17 15:01:40 -07:00
Stephen Birarda
8a2bb55231 add back a removed comment from jurisdiction map 2015-07-17 14:00:02 -07:00
Atlante45
d1c66751c4 emove unused method 2015-07-16 16:08:58 -07:00
Stephen Birarda
1bb3e1789a remove more PacketHeader methods 2015-07-16 16:05:27 -07:00
Stephen Birarda
61653bd88d remove old PacketHeader methods 2015-07-16 16:04:12 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
Stephen Birarda
05dd49a4c5 seek back after track of octree packet 2015-07-16 13:02:20 -07:00
Stephen Birarda
60ae02e4e9 some formatting changes in entities 2015-07-16 12:38:39 -07:00
Stephen Birarda
8921f59e23 fix entity packet send from interface client 2015-07-16 12:09:35 -07:00
Stephen Birarda
336967e580 fix edit packet sending from client 2015-07-16 11:17:49 -07:00
Stephen Birarda
039ef0750c set jurisdiction listener object name for thread identification 2015-07-15 18:52:59 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -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
ZappoMan
bc251de43c delete dead code 2015-07-14 16:49:22 -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
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
Stephen Birarda
ca47165d72 compare bytesAvailable to 0 2015-07-14 15:42:28 -07:00
Ryan Huffman
47f3aad437 Update use of sendingNode->getUUID() to use packet->getSourceID instead 2015-07-14 15:23:41 -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
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -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
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
Stephen Birarda
ede39515d8 update parseData for new network API 2015-07-13 14:26:10 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00