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

938 commits

Author SHA1 Message Date
Mark Peng
a14768bb29 Remove more unnecessary additions. 2013-07-19 01:00:55 -07:00
Mark Peng
a84c1c9e21 Merge remote-tracking branch 'upstream/master' 2013-07-19 00:46:52 -07:00
Mark Peng
cfcb31172c Merge remote-tracking branch 'upstream/master' 2013-07-18 21:08:08 -07:00
Stephen Birarda
ef7dc4a39a if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME 2013-07-18 17:42:25 -07:00
Stephen Birarda
01e6891fd3 save custom domain server hostname to QSettings 2013-07-18 17:23:52 -07:00
Stephen Birarda
45d82dc97c correct reference to new hostname for Qt temp variable changes 2013-07-18 15:20:05 -07:00
Mark Peng
fe01067473 Merge remote-tracking branch 'upstream/master' 2013-07-18 14:35:41 -07:00
Mark Peng
7ee0d8da2e Render circle in 3D space for lookatIndicator. Still not normal to the screen. 2013-07-18 14:34:51 -07:00
Stephen Birarda
67e5a6409e don't not kill NODE_TYPE_VOXEL_SERVER in removeSilentNodes 2013-07-18 14:07:08 -07:00
ZappoMan
c41f5e27ef fixed crash 2013-07-18 11:25:01 -07:00
ZappoMan
1e421d222d cleaned up some compiler warnings and constants 2013-07-18 10:20:01 -07:00
Mark Peng
6006b8e96b Merge remote-tracking branch 'upstream/master' 2013-07-17 17:28:12 -07:00
Mark Peng
125bcc46f4 Circle drawn with camera orientation as its normal for lookatIndicator. 2013-07-17 17:27:15 -07:00
Eric Johnston
aa0cab2180 Code review issues addressed. 2013-07-17 16:09:24 -07:00
Eric Johnston
1a4a165c8b Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-17 15:55:20 -07:00
Eric Johnston
8ebf5fbd6b Rave & Leap: cleanup and move over to new hand/finger structures 2013-07-17 14:54:18 -07:00
Eric Johnston
e5fcd0b274 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-17 14:50:51 -07:00
ZappoMan
677e2580e1 make send only changed bits work better 2013-07-17 14:42:20 -07:00
Eric Johnston
46c5383d10 minor cleanup 2013-07-17 12:54:44 -07:00
ZappoMan
74eaf72d53 removed bogus code that related to server crash 2013-07-17 11:52:50 -07:00
ZappoMan
9e9b379d66 Fix crashing bug in voxel-server related to animation 
- added VoxelNodeDeleteHook mechanism that allows users of VoxelNode to register for delete
  notification call backs
- added call back to VoxelNodeBag to remove and nodes from bags when the nodes get deleted.
 2013-07-17 11:49:42 -07:00
Eric Johnston
f21d2a477d Rave Glove Demo: Restructuring palm and finger data structures 2013-07-17 08:29:50 -07:00
Stephen Birarda
5c279777b6 Merge pull request #694 from ZappoMan/voxel_animation 
Fixed issue of "delta sending" not sending changed/animated voxels
 2013-07-16 17:31:16 -07:00
ZappoMan
adc09cec68 some CR feedback 2013-07-16 17:21:28 -07:00
ZappoMan
bdb14fee33 cleanup 2013-07-16 16:53:15 -07:00
ZappoMan
5ee6910256 cleanup 2013-07-16 16:51:09 -07:00
ZappoMan
d54bae8e76 cleanup 2013-07-16 16:47:18 -07:00
ZappoMan
75d052b997 cleanup 2013-07-16 16:46:58 -07:00
Stephen Birarda
fa155adc8c register the shared message handler to fix voxel-server output 2013-07-16 15:50:37 -07:00
ZappoMan
fbc59de081 latest cut at dirty bit sending 2013-07-16 15:08:09 -07:00
ZappoMan
70e54f0350 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 13:52:07 -07:00
Stephen Birarda
9d62e7f187 Merge remote-tracking branch 'upstream/master' into qdebug 2013-07-16 13:34:42 -07:00
Stephen Birarda
e66c1ca552 link Qt to the shared library 2013-07-16 13:01:46 -07:00
Stephen Birarda
16d603e203 clean up extra new lines and LogDisplay line break 2013-07-16 12:53:43 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
ZappoMan
8626c95a20 whitespace fix 2013-07-16 12:01:09 -07:00
ZappoMan
c12ab63dc2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 12:00:07 -07:00
Stephen Birarda
51d1e6ae80 add a message handler to send messages over to LogDisplay 2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
ZappoMan
d71400a42a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 09:36:39 -07:00
ZappoMan
e4b7ba7428 Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:58:45 -07:00
ZappoMan
01b7f3868b Merge pull request #672 from birarda/domain-switch 
add an option in preferences to dynamically switch domain servers
 2013-07-15 17:10:18 -07:00
ZappoMan
31875abcab Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:05:10 -07:00
Stephen Birarda
c27cd7ae42 couple of type squishes in NodeList 2013-07-15 16:49:36 -07:00
ZappoMan
1fb1622beb added sleep to sendVoxelOperation() to keep from overwhelming server 2013-07-15 16:27:23 -07:00
Stephen Birarda
7f6009bb4a make randIntInRange inclusive on the max side 2013-07-15 16:25:09 -07:00
Stephen Birarda
081a44dbff only process new domain list if it comes from current DS 2013-07-15 16:05:23 -07:00
Stephen Birarda
6b83f95f9e conditionally set a new hostname on preferences save 2013-07-15 15:46:04 -07:00
Stephen Birarda
e3d1e5db5d correct reference to mutex to lock in Node 2013-07-15 15:45:27 -07:00