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

101 commits

Author SHA1 Message Date
Andrzej Kapolka
b9a5b13f0a This should fix the remaining signed/unsigned warning on Windows. 2014-02-10 16:33:35 -08:00
Andrzej Kapolka
200a2d77c2 Incorporated fixes for warnings that Brad reported on Windows. 2014-02-10 10:13:52 -08:00
Andrzej Kapolka
c39f9f6271 Fix (hopefully) for Windows runtime error. 2014-02-10 00:59:51 -08:00
Andrzej Kapolka
e9579feef5 Reordering testing. 2014-02-10 00:41:15 -08:00
Andrzej Kapolka
ee2984ce6d Streaming fixes. 2014-02-09 23:38:33 -08:00
Andrzej Kapolka
f81a9d9fe8 Circular buffer work. 2014-02-09 22:29:23 -08:00
Andrzej Kapolka
8c9f06ceec Fix/tests for streaming. 2014-02-09 17:43:18 -08:00
Andrzej Kapolka
524ceb4ed2 Working on tests for datagram sequencing, added autogenerated ==/!= operators 
to mtc.
 2014-02-09 16:26:53 -08:00
Stephen Birarda
a1a4a3db8a HifiSockAddr to SharedNodePointer changes in MetavoxelServer 2014-02-07 14:27:10 -08:00
Andrzej Kapolka
d3b005112e Changes from Philip's code review. 2014-02-07 10:03:23 -08:00
Andrzej Kapolka
d7df4173e5 Cleaner component creation. 2014-02-06 18:58:36 -08:00
Andrzej Kapolka
0a6288bda4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-06 15:42:37 -08:00
Andrzej Kapolka
be21eee704 More work on parameterized scripts. 2014-02-06 15:41:21 -08:00
Andrzej Kapolka
f6320d3a81 I think this covers the basic bits necessary for the reliable streaming. Of 
course, I haven't tested it yet.
 2014-02-06 12:27:46 -08:00
Andrzej Kapolka
6b4c8b62c6 Back down the rabbit hole I go, weee! 2014-02-05 21:28:36 -08:00
Andrzej Kapolka
98a432d3e5 Punting on the span tracking thing for now. 2014-02-05 19:24:16 -08:00
Andrzej Kapolka
e77feb8efd More work on reliable transfer. 2014-02-05 16:19:16 -08:00
Brad Hefta-Gaub
a05e07460f fix windows build errors and warnings 2014-02-05 13:54:17 -08:00
Andrzej Kapolka
5e9916302b Working on clearing shared object references. 2014-02-05 13:28:19 -08:00
Andrzej Kapolka
3a378dbeaf Working on extending the concept of a shared object. 2014-02-05 12:20:02 -08:00
Andrzej Kapolka
be4f081465 More work on editing parameterized URLs. 2014-02-04 19:55:11 -08:00
Andrzej Kapolka
4f4c4c68d9 Streaming cleanup, streaming script strings as repeated values. 2014-02-04 18:31:18 -08:00
Andrzej Kapolka
ca52d67041 Basic script guides now working. 2014-02-04 15:40:17 -08:00
Andrzej Kapolka
3af86cb1a4 Working on script loading. 2014-02-04 14:07:01 -08:00
Andrzej Kapolka
fd31cc02ad Working on loading scripts. 2014-02-04 14:06:17 -08:00
Andrzej Kapolka
cfbe4de647 Progress on shared object attributes; basic "throbbing" guide working. 2014-02-03 19:46:22 -08:00
Andrzej Kapolka
3f529e37b5 Working on streaming objects. 2014-02-03 16:34:04 -08:00
Andrzej Kapolka
7dfb83b6cc Fix for obtaining values from editor. 2014-02-03 14:35:29 -08:00
Andrzej Kapolka
449cf1fbd3 Layout fix. 2014-02-03 12:45:45 -08:00
Andrzej Kapolka
f85542e0e7 Working on a test guide. 2014-01-31 11:39:16 -08:00
Andrzej Kapolka
5a194c4c01 Working on parameterizable URLs, etc. 2014-01-30 18:53:51 -08:00
Andrzej Kapolka
a9905cf870 Working on editing QObjects. 2014-01-29 19:35:43 -08:00
Andrzej Kapolka
64df9718f2 Working on object attributes. 2014-01-29 16:36:44 -08:00
Andrzej Kapolka
e99b7ea92c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-01-29 13:34:19 -08:00
Andrzej Kapolka
4c70af51e8 Expand data automatically to encompass edits. 2014-01-29 13:30:54 -08:00
Andrzej Kapolka
154deccbc6 Pass in the starting minimum/size. 2014-01-29 11:14:10 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
Andrzej Kapolka
decad39768 Handle the case of completely identical data. 2014-01-27 17:16:02 -08:00
Andrzej Kapolka
d5695395c4 Basic editing with delta streaming up and running. 2014-01-27 15:49:50 -08:00
Andrzej Kapolka
62e8cbedbd Proper detachment/reference counting for edits. 2014-01-27 13:51:20 -08:00
Andrzej Kapolka
adc747fa93 Streaming fix. 2014-01-26 16:06:11 -08:00
Andrzej Kapolka
1ef6f5f7b3 MetavoxelDataPointer -> MetavoxelData, grid spacing as power of 2. 2014-01-26 13:23:10 -08:00
Andrzej Kapolka
7f20750e80 Working on sending edits. 2014-01-24 16:03:25 -08:00
Andrzej Kapolka
4414c91f1e Working on streaming edits. 2014-01-23 18:05:04 -08:00
Andrzej Kapolka
e80eb03ba9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2014-01-23 16:13:42 -08:00
Andrzej Kapolka
4e3988f843 Have the drag-out box show up in the selected color. 2014-01-23 11:20:07 -08:00
Andrzej Kapolka
a3ffb1d8a3 Working on performing the actual edit. 2014-01-22 19:17:48 -08:00
Andrzej Kapolka
5b4447d0b9 More work on metavoxel editing. 2014-01-21 16:17:31 -08:00
Andrzej Kapolka
bf9fc65de4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-20 17:40:16 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00