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

82 commits

Author SHA1 Message Date
Stephen Birarda
d5b4e643c8 resolve conflicts on merge with upstream/master 2014-01-23 18:10:40 -08:00
Stephen Birarda
777e375761 Merge pull request #1670 from AndrewMeadows/zero-length-penetrations 
Zero length penetrations
 2014-01-23 18:09:41 -08:00
Stephen Birarda
10cfd628aa resolve conflicts on merge with upstream master 2014-01-23 17:52:30 -08:00
Philip Rosedale
2dee6426e9 Merge pull request #1672 from ZappoMan/bugfixes 
fix crash on shutdown of interface
 2014-01-23 17:27:07 -08:00
Stephen Birarda
8d2e9823de remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
ZappoMan
5560a0fb4d fix crash on shutdown of interface 2014-01-23 17:03:11 -08:00
Andrew Meadows
70c675e9be Adding comments and minor cleanup after tracking down some NaN's that were showing up in collision sound triggers. 2014-01-23 16:03:52 -08:00
Stephen Birarda
4ebd5795fc handle merge with nodelist-patches branch 2014-01-23 16:01:52 -08:00
Stephen Birarda
80106979a5 replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
Stephen Birarda
349c790cc7 NodeData cleanup thanks to separation from rendered avatars 2014-01-23 15:41:40 -08:00
ZappoMan
9de99ce6a8 removed commented out debug 2014-01-23 15:07:17 -08:00
ZappoMan
bdcca9cbf4 fix random crash on interface shutdown 2014-01-23 14:57:32 -08:00
Philip Rosedale
5e77f5643d Merge pull request #1630 from birarda/nodelist-set 
change node types of interest to a QSet
 2014-01-23 11:42:37 -08:00
ZappoMan
3d0d5f130a fix particle-server spinning out at 100% cpu% 2014-01-23 10:02:04 -08:00
Stephen Birarda
b965d850d5 move node interest add for JL to JL 2014-01-22 16:26:28 -08:00
Brad Hefta-Gaub
e0f68bedc1 fixed type 2014-01-22 15:25:05 -08:00
Brad Hefta-Gaub
b9ccd28428 removed some debug code 2014-01-22 14:35:38 -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
d831f9df5e first cut at using partial property info in particle edits 2014-01-20 16:34:45 -08:00
Stephen Birarda
9007a15381 comment out the JurisdictionListener's connection for now 2014-01-17 15:27:44 -08:00
Stephen Birarda
b24eca199a use new signal slot syntax in JurisdictionListener 2014-01-17 15:23:58 -08:00
Andrzej Kapolka
58ee527997 Fix GCC warning (string split across lines). 2014-01-16 14:24:19 -08:00
Andrew Meadows
b60b9776ae removal of unused OctreePersistThread::_loadCompleted 2014-01-16 09:23:47 -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
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
9efb391ecf repair crazy references to node ponter from old iterator style 2014-01-14 10:50:06 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
a290017746 more type mismatch warning fixes 2014-01-13 00:46:43 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
a94e371e5c fix more windows warnings 2014-01-12 21:27:25 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -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
b0f8e21d06 more windows build hackery 2014-01-10 20:36:37 -08:00
Brad Hefta-Gaub
e55e680e66 tweaks to some variable names since windows has a problem with them 2014-01-10 18:28:18 -08:00
Brad Hefta-Gaub
9bc4a3df41 switch from pthread mutex to QMutex 2014-01-10 18:01:36 -08:00
Brad Hefta-Gaub
5787d3d9e9 more cast coding standard fixes 2014-01-09 19:00:57 -08:00
Brad Hefta-Gaub
6e95c52444 make local voxel cache properly switch to different cache file when switching domains 2014-01-09 14:51:04 -08:00
Brad Hefta-Gaub
c181d0a849 first cut at local voxel cache 2014-01-09 12:05:09 -08:00
Brad Hefta-Gaub
207ea30c6d fix delete problem with voxels 2014-01-04 01:10:48 -08:00
ZappoMan
f1da6bf90b fix various compiler warnings on gcc 2014-01-02 15:58:03 -08:00
Andrew Meadows
6e661e05e5 minor cleanup and enforcement of coding standards 2013-12-31 09:30:01 -08:00
ZappoMan
d71bc248f4 support adjusting particles based on clockSkew 2013-12-19 14:49:58 -08:00
ZappoMan
72649f1ac9 adjust flight times correctly in stats tracking 2013-12-19 13:29:45 -08:00
ZappoMan
e2b7e08398 revert back to timestamps, fix a couple other bugs 2013-12-19 09:50:53 -08:00
ZappoMan
524a847aa5 fix spelling error 2013-12-17 08:39:23 -08:00