Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 03:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8887 commits 75 branches 59 tags 1.2 GiB
Commit graph

57 commits

Author SHA1 Message Date
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
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Andrzej Kapolka
c163b513d2 Working on allowing visitors to modify, as well as read, data. 2014-01-13 18:09:28 -08:00
Andrzej Kapolka
3734aa4fe1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-13 16:31:45 -08:00
Brad Hefta-Gaub
2217d79200 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-13 15:57:52 -08:00
Andrzej Kapolka
f21436a29e Fix (hopefully) for warning on Windows build. 2014-01-13 15:02:46 -08:00
Brad Hefta-Gaub
483ac66518 more windows build tweaks, warnings and linking 2014-01-13 11:48:16 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
441da98063 define _Pragma for windows 2014-01-12 17:25:06 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Andrzej Kapolka
69ce7db072 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2014-01-08 11:58:41 -08:00
Andrzej Kapolka
3504cc6d5a More work on deltas. 2014-01-06 12:01:14 -08:00
Andrzej Kapolka
31443e4f4e Working on delta encoding. 2014-01-05 22:07:38 -08:00
Andrzej Kapolka
67ed045869 More work on delta streaming. 2014-01-03 11:10:21 -08:00
Andrzej Kapolka
a08afae319 More work on client/server communication. 2014-01-02 17:40:43 -08:00
Andrzej Kapolka
72b002ddc4 Allow streaming QVariantLists. 2013-12-31 17:30:41 -08:00
Andrzej Kapolka
839e5e085c Attempting to silence unused variable warning on Xcode. 2013-12-31 16:56:18 -08:00
Andrzej Kapolka
a8bb890187 Fixed a couple of Xcode warnings. 2013-12-31 16:27:54 -08:00
Andrzej Kapolka
d7d8cdce44 init -> commonInit, streaming tweaks. 2013-12-31 16:19:03 -08:00
Andrzej Kapolka
effd00a405 Basic "meta type compiler" for streaming, streaming fixes and test. 2013-12-31 15:30:15 -08:00
Andrzej Kapolka
f9043c3cb9 Working on streaming types. 2013-12-31 11:34:10 -08:00
Andrzej Kapolka
ecd9c9f41d Communication between client and server. 2013-12-30 18:28:30 -08:00
Andrzej Kapolka
f70670d0a9 Working on sessions. 2013-12-30 13:39:08 -08:00
Andrzej Kapolka
b986d91217 One more piece of the datagram sequencing puzzle. 2013-12-26 18:26:29 -08:00
Andrzej Kapolka
6357bd0019 More work on datagram sequencing. 2013-12-26 00:27:47 -08:00
Andrzej Kapolka
51d5a37613 More work on datagram streaming. 2013-12-24 18:19:35 -08:00
Andrzej Kapolka
71ce244a0a More work on datagram sequencing. 2013-12-23 13:15:14 -08:00
Andrzej Kapolka
7ab1a4b849 More work on datagrams. 2013-12-20 17:54:20 -08:00
Andrzej Kapolka
775f32b94c First pass at datagram sequencer. 2013-12-20 14:33:11 -08:00
Andrzej Kapolka
11e729c3cc Starting on delta encoding. 2013-12-19 18:03:49 -08:00
Andrzej Kapolka
b7f0057fe9 More streaming work. 2013-12-19 16:53:38 -08:00
Andrzej Kapolka
d19f32fefa Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	assignment-client/CMakeLists.txt
 2013-12-19 13:52:10 -08:00
Andrzej Kapolka
130ec7488a More work on streaming. 2013-12-18 17:10:53 -08:00
Andrzej Kapolka
8ddf6297a5 Fixed Xcode warnings. 2013-12-17 17:13:41 -08:00
Andrzej Kapolka
d535d3b115 More progress on getting values in and out of scripts. 2013-12-17 13:44:56 -08:00
Andrzej Kapolka
07ed688a8a A few more script bits. 2013-12-16 18:13:29 -08:00
Andrzej Kapolka
6385a73379 Working on scripty bits. 2013-12-16 17:53:53 -08:00
Andrzej Kapolka
0ca2320711 Working on guide/script support. 2013-12-16 13:44:24 -08:00
Andrzej Kapolka
5458e7a555 Working on polymorphic attributes, average -> merge. 2013-12-16 12:05:16 -08:00
Andrzej Kapolka
50e4691568 Pointer attributes, cleanup. 2013-12-13 14:33:18 -08:00
Andrzej Kapolka
a10aca59f3 Visitor cleanup. 2013-12-12 18:29:23 -08:00
Andrzej Kapolka
c003a55c37 Diffuse lighting. 2013-12-12 16:19:05 -08:00
Andrzej Kapolka
c1aec11b32 More work on rendering voxels. 2013-12-12 15:14:19 -08:00
Andrzej Kapolka
5ec9017d3b More metavoxel bits. 2013-12-11 18:00:17 -08:00
Andrzej Kapolka
dce9599201 More progress on generic attributes; color attributes. 2013-12-11 16:13:36 -08:00