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

57 commits

Author SHA1 Message Date
Stephen Birarda
8d2e9823de remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
Stephen Birarda
349c790cc7 NodeData cleanup thanks to separation from rendered avatars 2014-01-23 15:41:40 -08:00
Stephen Birarda
6979135fe3 move some of the node interest additions to correct spots 2014-01-22 16:23:24 -08:00
Stephen Birarda
ec04d5450b Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set 2014-01-22 16:16:47 -08:00
Stephen Birarda
e9e2557576 change node types of interest to a QSet 2014-01-22 14:47:04 -08:00
Brad Hefta-Gaub
85363f6603 Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements 2014-01-22 14:23:00 -08:00
Brad Hefta-Gaub
6e9e21051d first cut at move JurisdicionListener and JuridictionSender into non-mulitply derived classes 2014-01-22 14:05:31 -08:00
Brad Hefta-Gaub
278ca02595 remove debug code 2014-01-21 14:06:55 -08:00
Brad Hefta-Gaub
97b0ed2cc5 implemented support for PACKET_TYPE_PARTICLE_ERASE 2014-01-21 13:24:35 -08:00
Brad Hefta-Gaub
cd0e8e742c particle edit checkpoint 2014-01-21 02:12:31 -08:00
Andrzej Kapolka
520f7a78a8 Compile fixes (perhaps just for my version of Qt/GCC). 2014-01-20 11:41:04 -08:00
Stephen Birarda
5fdf310a45 hook OctreeServer up to embedded-webserver 2014-01-17 14:21:15 -08:00
Brad Hefta-Gaub
f97ab1dafe fixes leak of GenericThread and also fixes crash in octree servers on client disconnect 2014-01-16 12:53:32 -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
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
ed0ed96029 properly emit signal on silent node removal 2014-01-14 10:28:41 -08:00
Stephen Birarda
57f977668f replace the Node mutex with a QMutex 2014-01-14 10:15:31 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
cb828d330a more windows build fixes 2014-01-11 00:43:47 -08:00
Brad Hefta-Gaub
7234b9ca4a try to get this to work 2014-01-10 22:58:32 -08:00
Brad Hefta-Gaub
908b5e1de7 hack test externals 2014-01-10 22:38:16 -08:00
Brad Hefta-Gaub
6bde55898d handle NOMINMAX in cmake 2014-01-10 21:58:55 -08:00
Brad Hefta-Gaub
ef60aec81e removed persit file load time to help windows build 2014-01-10 21:32:44 -08:00
Brad Hefta-Gaub
7848d065bc added NOMINMAX before things that possibly include windows.h 2014-01-10 21:01:43 -08:00
Brad Hefta-Gaub
731209d8cb remove unused PerfStats class more missing header changes 2014-01-10 19:47:23 -08:00
Brad Hefta-Gaub
e908121bcd fix bug in Octree server that wasn't properly surpressing duplicate packets 2014-01-09 19:13:17 -08:00
Brad Hefta-Gaub
c181d0a849 first cut at local voxel cache 2014-01-09 12:05:09 -08:00
Brad Hefta-Gaub
e97e211bc4 quiet down some debugging 2014-01-03 18:10:30 -08:00
Brad Hefta-Gaub
5144a91d1f cleanup spacing and comments 2014-01-03 17:28:06 -08:00
Brad Hefta-Gaub
9aa3d31876 cleanup spacing 2014-01-03 17:24:55 -08:00
Brad Hefta-Gaub
b72dfbd3a4 fix tabs 2014-01-03 17:20:54 -08:00
Brad Hefta-Gaub
8abd76c055 fixed issue with voxels not always showing up when changed between clients 2014-01-03 17:10:35 -08:00
ZappoMan
1a67d946d8 more warnings fixes 2014-01-02 16:33:58 -08:00
ZappoMan
ce81b95eaa more warnings fixes 2014-01-02 16:21:58 -08:00
ZappoMan
696afd7875 more warnings fixes 2014-01-02 16:18:49 -08:00
ZappoMan
5b36953e81 cleanup clockSkew debug options and remove some chatty logs 2013-12-18 19:33:52 -08:00
ZappoMan
1badc8dc5d first pass at removing timestamps from particles removed _lastUpdated/getLastUpdated() 2013-12-18 16:59:36 -08:00
ZappoMan
18cbb2d00f particle tree pruning on update 2013-12-12 15:09:30 -08:00
ZappoMan
bc80862825 removed some debugging 2013-12-12 11:07:13 -08:00
ZappoMan
4acadabaa5 adding better support for ParticleEditHandle to allow access to particles after being created 2013-12-11 17:46:18 -08:00
ZappoMan
03c72134cb first cut at creatorTokenIDs for creating particles 2013-12-11 15:38:52 -08:00
ZappoMan
7a828794be more work with particles added javascript support to particle update 2013-12-10 11:27:18 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
ZappoMan
3d2a00b732 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 
Conflicts:
	animation-server/src/main.cpp
 2013-12-06 16:03:02 -08:00
ZappoMan
91ffb5b167 added node type to jurisdiction messages and more work on particle editing 2013-12-06 15:56:51 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -08:00
Stephen Birarda
baae2a3e41 fix reference to NodeList in OctreeServer destructor 2013-12-05 11:44:11 -08:00
Stephen Birarda
5b6c2531a4 use correct cleanup calls in OctreeServer destructor 2013-12-05 11:43:48 -08:00
Stephen Birarda
aac01ee70d rename in OctreeServer destructor debug 2013-12-05 11:42:34 -08:00