Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-06 18:09:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6363 commits 69 branches 57 tags 1.2 GiB
Commit graph

998 commits

Author SHA1 Message Date
Mark Peng
4e641eed2f LookatIndicator now scales with the avatar's scale. 2013-07-22 17:11:11 -07:00
Mark Peng
0f1ac2b226 Fix eyePosition so that lookatVectors point directly to eyes, 
even when looking at someone from above.
 2013-07-22 16:46:06 -07:00
ZappoMan
c301b799c5 first cut at selecting audio sources 2013-07-22 13:54:47 -07:00
Jeffrey Ventrella
8a55db53ce merge 2013-07-22 10:42:18 -07:00
atlante45
13952a6f24 Merge with pie_menu 2013-07-21 15:22:43 -07:00
ZappoMan
c3fa37019e replaced old voxel stats with new voxel stats 2013-07-21 05:18:35 -07:00
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d additional stats items 2013-07-20 11:28:12 -07:00
Jeffrey Ventrella
ad0ca748bb added extra mode and improved particle system 2013-07-20 09:48:55 -07:00
Eric Johnston
0cdad1a313 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 19:48:52 -07:00
Jeffrey Ventrella
05039b4e3e adding rave glove modes and changing API of particle system to accommodate 2013-07-19 18:02:48 -07:00
ZappoMan
83290bc8b7 first cut at real voxel stats dialog box 2013-07-19 17:28:37 -07:00
atlante45
72774a5e20 First step toward pie menus 2013-07-19 17:01:38 -07:00
Jeffrey Ventrella
6e84481931 Merge remote-tracking branch 'upstream/master' into particles 2013-07-19 16:08:43 -07:00
Jeffrey Ventrella
7f3750f1f0 clean up 2013-07-19 16:08:19 -07:00
ZappoMan
2cc42f6773 support piggybacking voxel and voxel stats messages into single packet 2013-07-19 15:59:47 -07:00
Andrzej Kapolka
353f16b2d0 Style fixes. 2013-07-19 15:56:04 -07:00
Jeffrey Ventrella
d2d8019e73 Merge remote-tracking branch 'upstream/master' into particles 2013-07-19 15:51:14 -07:00
Jeffrey Ventrella
87d9aae328 improvements to particle system 2013-07-19 15:50:40 -07:00
Andrzej Kapolka
f70b4dcab2 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-19 15:49:07 -07:00
ZappoMan
d9c8a59929 send voxel scene stats from server to client 2013-07-19 15:09:38 -07:00
Eric Johnston
262851346c Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing) 
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
 2013-07-19 09:31:45 -07:00
Mark Peng
ceb743a65d Remove unncessary import math.h (for reals). 2013-07-19 00:56:12 -07:00
Mark Peng
fc22240525 Remove unnecessary import math.h. 2013-07-19 00:55:31 -07:00
Mark Peng
a84c1c9e21 Merge remote-tracking branch 'upstream/master' 2013-07-19 00:46:52 -07:00
Mark Peng
927aea8bb4 Bug fix on lookatVectors (fixed scale in head.cpp). Added bool 
isLookingAtOtherAvatar. Basic halo indicator in Application.cpp.
 2013-07-19 00:44:23 -07:00
Mark Peng
cfcb31172c Merge remote-tracking branch 'upstream/master' 2013-07-18 21:08:08 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
 2013-07-18 18:09:57 -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
Philip Rosedale
c74287160f merged 2013-07-18 16:52:56 -07:00
Philip Rosedale
4af92d46f3 Set lookAt to hovered voxel 2013-07-18 16:50:37 -07:00
Stephen Birarda
a00b95666a don't listen to VS packets not from current VS 2013-07-18 15:49:07 -07:00
Stephen Birarda
45d82dc97c correct reference to new hostname for Qt temp variable changes 2013-07-18 15:20:05 -07:00
Stephen Birarda
4dd6afc08f fix grabbing of domain server hostname from QString 2013-07-18 14:59:11 -07:00
Stephen Birarda
04a2dd3b86 clear environment data on domain server switch 2013-07-18 14:36:55 -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
Philip Rosedale
0b10169915 More audio collision on hover experiments 2013-07-18 11:13:16 -07:00
Philip Rosedale
e6cd90fa37 Merge pull request #704 from Ventrella/particles 
more code cleanup
 2013-07-18 11:08:18 -07:00
Stephen Birarda
2ad99f3129 point to stars file on non-SSL for easier RV redirect 2013-07-18 10:26:08 -07:00
Jeffrey Ventrella
f89b1fcd4c more clean up of particle system 2013-07-17 18:10:30 -07:00
Andrzej Kapolka
8863645dc9 Working on transmitting and receiving the face video. 2013-07-17 18:02:27 -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
Philip Rosedale
3111303c32 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-17 17:15:25 -07:00
Philip Rosedale
5f51464230 Start clicking on voxels makes sound 2013-07-17 17:15:19 -07:00
Jeffrey Ventrella
9c2ea6e7e4 more clean up 2013-07-17 17:07:53 -07:00
Jeffrey Ventrella
ea7e16660c Merge remote-tracking branch 'upstream/master' into particles 2013-07-17 16:43:57 -07:00
Jeffrey Ventrella
be5612711b clean up of particle system 2013-07-17 16:43:34 -07:00
Eric Johnston
57c2f16894 Merge branch 'master' of https://github.com/worklist/hifi into dev4 
Conflicts:
	interface/src/Hand.cpp
 2013-07-17 16:42:11 -07:00
Jeffrey Ventrella
1f1259cec5 added particle life stages 2013-07-17 16:03:10 -07:00
Jeffrey Ventrella
d0dffb464b added emitter particle 2013-07-17 14:51:11 -07:00
Mark Peng
0bbea078b5 Merge remote-tracking branch 'upstream/master' 2013-07-17 13:52:46 -07:00
Mark Peng
5ffe3fa4b4 Rendering of indicator circle in 3D space. Spacing edits in util. 2013-07-17 13:52:05 -07:00
Jeffrey Ventrella
202fb95102 turned off setShowingEmitter 2013-07-17 13:51:00 -07:00
Jeffrey Ventrella
5a0fcb7f6c adding more behavior to the particle system 2013-07-17 13:47:18 -07:00
Jeffrey Ventrella
98dd83dde8 ahibfasubhdf 2013-07-17 10:02:23 -07:00
Jeffrey Ventrella
0be15231b9 ahibfasubhdf 2013-07-17 10:01:23 -07:00
Eric Johnston
39130aef58 Rave Glove demo: activation mode and stage (dark backdrop) drawing. 2013-07-16 18:10:54 -07:00
Stephen Birarda
7cec2f5ffd use fprintf instead of printf and flush for qDebug 2013-07-16 15:27:14 -07:00
Stephen Birarda
1e0f3e4d1c Merge pull request #686 from Atlante45/few_avatar_resizing_correction 
Few avatar resizing correction
 2013-07-16 14:31:27 -07:00
Stephen Birarda
8464a013fe fix format string warnings in Application 2013-07-16 13:39:24 -07:00
Stephen Birarda
c78759da16 cleanup printLogs reintroduce on merge with upstream master 2013-07-16 13:37:16 -07:00
Stephen Birarda
9d62e7f187 Merge remote-tracking branch 'upstream/master' into qdebug 2013-07-16 13:34:42 -07:00
Stephen Birarda
ce0c9e2e1a flush stdout in case non new-line output is received 2013-07-16 12:58:16 -07:00
Stephen Birarda
16d603e203 clean up extra new lines and LogDisplay line break 2013-07-16 12:53:43 -07:00
Andrzej Kapolka
fd1671a44f Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-16 12:48:24 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
atlante45
13762da7d8 Changed shortcuts to ALT+ +/- 2013-07-16 12:03: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
Stephen Birarda
3f9865759c Merge pull request #682 from ZappoMan/bug_fixes 
Import Voxels and Paste Bug fixes
 2013-07-16 10:11:11 -07:00
ZappoMan
440352c584 white space 2013-07-16 10:02:27 -07:00
ZappoMan
42e5440b7b CR feedback 2013-07-16 10:00:55 -07:00
Eric Johnston
802abade4f Fixed problem in idle(), causing events to stack up. 
The problem was that idle() was set on a zero-ms timer (using idleTimer->start(0)), and the time is then self-regulated by returning early if it's not time yet.
Because of this, Qt stays perpetually in the timer servicing, instead of processing events. This causes keys and menu items to be delayed if the user drags the mouse before activating them, especially at low frame rates. It also causes very-delayed multitouch response.

The fix I've applied is to reset the idle timer after servicing the idle. I've set it to 2ms because I noticed that 1ms didn't always clear out all of the events. We can tune it to whatever we need, or even calculate it based on the time it took us to service the idle.
 2013-07-15 18:16:50 -07:00
ZappoMan
e4b7ba7428 Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:58:45 -07:00
Jeffrey Ventrella
b765de6990 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 17:58:38 -07:00
Jeffrey Ventrella
0481a81ca7 moved finger particles over to hand.cpp 2013-07-15 17:58:17 -07:00
ZappoMan
a3009981d0 added Import Voxels to Clipboard 2013-07-15 17:54:50 -07:00
Stephen Birarda
9f9d8e59bd don't accept voxel packet if rendering is turned off, correct boolean for kill 2013-07-15 17:12:44 -07:00
Stephen Birarda
38d8041bfb kill local voxels when voxel rendering is turned off 2013-07-15 17:12:24 -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
Andrzej Kapolka
d8d9f5e315 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-15 16:54:29 -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
Andrzej Kapolka
d5abb3e6eb Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-15 16:15:12 -07:00
Andrzej Kapolka
fdeb63c121 More work on face points. 2013-07-15 16:09:49 -07:00
atlante45
bf328c8532 Improved import system copying to clipboard 2013-07-15 16:07:50 -07:00
Stephen Birarda
9fe1c7c63d lock the voxel server when receiving data to avoid race crash 2013-07-15 15:59:31 -07:00
Stephen Birarda
6c2682833e lock on the solo voxelServer before deleting local voxels 2013-07-15 15:53:25 -07:00
Stephen Birarda
6b83f95f9e conditionally set a new hostname on preferences save 2013-07-15 15:46:04 -07:00
Jeffrey Ventrella
56d0c7d7e4 added array of finger emitters for particle system 2013-07-15 15:45:31 -07:00
Stephen Birarda
d389dc6e3a add method to NodeList to set domain IP to local, move mutex lock to node 2013-07-15 15:17:10 -07:00
Jeffrey Ventrella
c0f319f077 merge 2013-07-15 14:36:11 -07:00
Jeffrey Ventrella
f75ce72aca Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 14:30:19 -07:00
Jeffrey Ventrella
7d5ade33a3 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 13:58:12 -07:00
Jeffrey Ventrella
84b6adf5b0 more work on particle emitter API 2013-07-15 13:57:39 -07:00
Eric Johnston
86faa33f83 Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times. 2013-07-15 13:56:37 -07:00
atlante45
423a0eaac8 Fixed typo 2013-07-15 12:28:22 -07:00
atlante45
bf3c4fa1f8 Avatar resizing final commit 2013-07-15 12:04:24 -07:00
Andrzej Kapolka
84bb2aa265 Started on C++ side of SSAO effect. 2013-07-14 18:21:18 -07:00
Jeffrey Ventrella
ae99ca5ec8 added more API for the particle system 2013-07-12 18:55:42 -07:00
atlante45
280afed7f0 added scale in avatar packets eand slots to change it from the menu 2013-07-12 17:51:47 -07:00
Jeffrey Ventrella
3649c89c12 more developing on the API for the particle system 2013-07-12 16:19:31 -07:00
atlante45
35c00c739c resizing avatar now handle the camera 2013-07-12 14:53:51 -07:00
Jeffrey Ventrella
e6b751e538 more work on particle system 2013-07-12 14:32:14 -07:00
atlante45
16647e3591 Resolve conflict 2013-07-12 13:27:46 -07:00
Jeffrey Ventrella
c348c5ec35 Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 12:12:25 -07:00
Jeffrey Ventrella
106d7c225a turned on particle system viewing for pull request 2013-07-12 12:11:51 -07:00
Philip Rosedale
4e9530f946 Body slowly turns to follow touch look 2013-07-11 22:31:31 -07:00
Philip Rosedale
4e89c679b9 Oculus will work with touch look (hopefully) 2013-07-11 21:51:13 -07:00
Philip Rosedale
6609a850eb Gyros and touch look now work at same time 2013-07-11 21:34:42 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
ZappoMan
57ce20d3ce add support for Low Res sending while moving 2013-07-11 12:43:43 -07:00
Stephen Birarda
b201d13e31 refactor ping packet sending to push past version byte 2013-07-11 12:42:45 -07:00
Stephen Birarda
64887f2a36 Merge branch 'master' of github.com:worklist/hifi into packet-versions 2013-07-11 11:02:49 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Mark Peng
9749e5edd6 Add const var to represent magic num in eyecontact code when gyros 
are on.
 2013-07-11 10:53:38 -07:00
Mark Peng
24d32bcdc8 Fix style mistakes according to code review for eyecontact code. 2013-07-11 10:40:57 -07:00
ZappoMan
9aed3d3cc6 enable delta sending by default 2013-07-11 10:37:28 -07:00
Mark Peng
083e0e9d06 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:20:41 -07:00
Mark Peng
f145a1eac4 Add condition to updateAvatar() where if another avatar's head is at 
the center of the screen, the lookAtPosition is set to the eye level
of that avatar.
 2013-07-11 10:17:45 -07:00
Stephen Birarda
211204e878 Merge remote-tracking branch 'upstream/master' into timestamps 2013-07-11 09:23:16 -07:00
Philip Rosedale
cf665e10b3 Merge pull request #644 from ZappoMan/occlusion_culling 
Latest Revision of Occlusion Culling & Delta Sending Work - now it's always better and never worse
 2013-07-11 09:05:03 -07:00
Philip Rosedale
8ea2b46264 Merge pull request #641 from ZappoMan/bug_fixes 
Two small bug fixes
 2013-07-11 07:46:57 -07:00
ZappoMan
dc70675c22 removed obsolete ResIn mode 2013-07-10 19:04:28 -07:00
Jeffrey Ventrella
6c3644a2fc merge 2013-07-10 18:32:59 -07:00
Jeffrey Ventrella
420ecddafb Merge remote-tracking branch 'upstream/master' into particles 2013-07-10 18:32:42 -07:00
ZappoMan
3d3eca9afa Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 17:45:04 -07:00
Andrzej Kapolka
d59b9ce955 Flip x when in mirror mode, rather than special-casing all the head rotations. 
Also fixed sideways leaning (was correct in mirror mode, incorrect in world).
 2013-07-10 17:31:21 -07:00
Mark Peng
3909217815 Remove unused #include for glm intersect in Application.cpp 2013-07-10 17:24:47 -07:00
ZappoMan
78611e30e7 make occlusion culling default 2013-07-10 17:21:40 -07:00
Mark Peng
c832662807 Remove random print statements from eyecontact code in Application.cpp 2013-07-10 17:20:46 -07:00
Jeffrey Ventrella
84a7a78b8d made a test particle system 2013-07-10 17:15:03 -07:00
ZappoMan
a48f353f2f whitespace cleaned up 2013-07-10 17:07:55 -07:00
ZappoMan
1831cc0de3 removed level param from recursion 2013-07-10 17:06:22 -07:00
Mark Peng
baf9edecc9 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:51:53 -07:00
Andrzej Kapolka
100f7c19c3 Merge pull request #636 from PhilipRosedale/master 
Touchlook tuned and always on!
 2013-07-10 16:36:10 -07:00
ZappoMan
4afda27ee0 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 16:28:51 -07:00
ZappoMan
78c62f29c3 lazy load stars file only if stars render enabled 2013-07-10 16:12:34 -07:00
ZappoMan
d8f368a50c lazy load stars file only if stars render enabled 2013-07-10 16:06:23 -07:00
Mark Peng
62570f0804 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:01:28 -07:00
Mark Peng
0b334f9e5d Make lookAtVectors lock on other avatar's eyes if the mouse is over 
the other avatar's head.

Add rayIntersectsSphere function to Util. glm::intersectRaySphere was buggy.
 2013-07-10 15:56:23 -07:00
ZappoMan
09f77279e2 add shortcut key to enable wants occlusion culling 2013-07-10 13:42:43 -07:00
Atlante45
7d94f65448 Linked ZLIB to voxels library 2013-07-10 13:00:16 -07:00
Philip Rosedale
dae79d8a55 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-10 12:20:45 -07:00
Philip Rosedale
2e854b5ed7 Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update() 2013-07-10 12:20:26 -07:00
Mark Peng
4b6e7f1079 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-10 11:57:08 -07:00
Mark Peng
e4e7966075 Add print statements to debug eyecontact code in Application.cpp. 2013-07-10 11:56:16 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
ZappoMan
a9b1aa727f added back stars file loading 2013-07-10 11:11:21 -07:00
Mark Peng
61ad33d9d0 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-09 16:29:56 -07:00
Mark Peng
2a25c97446 Change LookAtPosition of Head to the eye level of another avatar, 
if looking at another avatar in Application.cpp.

Add eyePosition to Head class and bool isLookingAtOther.. in Application.cpp.
 2013-07-09 16:22:41 -07:00
ZappoMan
44357fcfb9 add 'level' param to tree recursion 2013-07-09 13:17:21 -07:00
atlante45
2e036a0e46 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 17:56:18 +02:00
atlante45
dbdbd7a8c4 Incorporating comments for code review (minecraft import) 2013-07-09 17:55:55 +02:00
atlante45
3433cf5a98 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 16:34:12 +02:00
atlante45
2c438e8af3 Fixed broken shortcut (Turn on/off voxels is now Shift + V) 2013-07-09 16:20:55 +02:00
atlante45
b3c0f3fedb More code review for UI job 2013-07-09 15:29:12 +02:00
atlante45
c3b0be5c63 More consts for UI job 2013-07-09 14:49:01 +02:00
atlante45
3c4f8f5120 put hard coded numbers into variables for UI job 2013-07-09 14:17:42 +02:00
atlante45
5d4d0ba43e Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 12:56:27 +02:00
atlante45
5703a60797 Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 10:25:58 +02:00
atlante45
d38c1f081c Modified code according to review for UI job 2013-07-09 10:25:46 +02:00
Philip Rosedale
e9f8e50d49 Merge pull request #623 from machinelevel/dev4 
Added safety checks to processEvents(), which was causing problems. Also...
 2013-07-08 17:04:06 -07:00
Philip Rosedale
4936676cc1 Merge pull request #627 from ey6es/kinected 
Basic depth camera support (only built in when OpenNI is available).
 2013-07-08 16:57:10 -07:00
Eric Johnston
c298f78ae9 Fixed multi-touch event loop problems by selectively processing just the touch events. 2013-07-08 16:31:28 -07:00
Eric Johnston
7de2281226 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-08 16:29:51 -07:00
Stephen Birarda
c2ad02def2 Merge pull request #625 from PhilipRosedale/master 
Tuned smooth gyro look to feel better
 2013-07-08 15:55:52 -07:00
Eric Johnston
14374fb0df Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-08 15:31:11 -07:00
Stephen Birarda
aaaba9c42e more packet version refactoring 2013-07-08 15:14:18 -07:00
Stephen Birarda
202d446f07 use packet version helpers for PACKET_TYPE_AVATAR_VOXEL_URL 2013-07-08 14:59:00 -07:00
Stephen Birarda
374fffb151 use packet version helpers for PACKET_TYPE_SET_VOXEL commands 2013-07-08 14:40:15 -07:00
Andrzej Kapolka
5f3a37139f Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-08 14:04:42 -07:00
Stephen Birarda
8a684244cc packet versioning for HEAD_DATA packets 2013-07-08 12:53:07 -07:00
Stephen Birarda
5faad80e12 remove ping unknown thread, version for ping reply 2013-07-08 11:58:19 -07:00
Stephen Birarda
5062ae8965 rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning 2013-07-08 11:37:39 -07:00
Stephen Birarda
047d5b5cab add packet version handling for DS packets 2013-07-08 11:17:29 -07:00
Stephen Birarda
d112edab64 resolve conflicts on merge with upstream master 2013-07-08 11:07:42 -07:00
atlante45
013aabc65c Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-08 15:54:37 +02:00
atlante45
1f78c6461d Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-08 13:37:55 +02:00
atlante45
6c840a9ec3 Functionnal version of minecraft import 2013-07-08 13:37:47 +02:00
Eric Johnston
4341e8596f Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-07 22:19:13 -07:00
Andrzej Kapolka
f9f2c66115 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Application.cpp
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	libraries/avatars/src/AvatarData.h
 2013-07-05 22:52:42 -07:00
tosh
c2e2ff0ffe changes broadcast function in Application to use a different name but the same signature as in NodeList 2013-07-05 14:16:50 +02:00
tosh
2da132be65 upstream merge 2013-07-04 21:21:11 +02:00
tosh
689794259d Merge branch 'master' of git://github.com/worklist/hifi into 19376 
Conflicts:
	interface/src/Application.cpp
 2013-07-04 21:20:36 +02:00
Philip Rosedale
d70eb38542 Properly make the goHome() function in slot group 2013-07-03 23:43:53 -07:00
Philip Rosedale
92cec4cfa0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 22:55:09 -07:00
Philip Rosedale
2de6d3eb6a Make 'Go Home' an option from the options because it conflicts with 'G' for gravity on/off 2013-07-03 22:55:01 -07:00
ZappoMan
c0d14d2bd4 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-03 15:36:41 -07:00
Eric Johnston
3ea100e595 Added safety checks to processEvents(), which was causing problems. Also narrowed the scope of the events processed. 
It can now be disabled in the interface by un-checking touch-look, which most people don't use yet.
Also, the event processing time should be limited to 1 ms.
 2013-07-03 15:33:18 -07:00
Stephen Birarda
0be42698b5 resolve conflicts on merge with upstream master 2013-07-03 15:12:50 -07:00
Stephen Birarda
8a4dc8446b what is July 3rdg 2013-07-03 15:05:51 -07:00
Stephen Birarda
e85e49ef3b add a comment to disable of processEvents 2013-07-03 14:31:28 -07:00
Stephen Birarda
0e68942674 comment out processEvents to remove event receipt bug 2013-07-03 14:27:07 -07:00
Philip Rosedale
3388fccc86 Fixes per code review 2013-07-03 13:09:55 -07:00
Philip Rosedale
c309774e3c Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 13:01:21 -07:00
Eric Johnston
acef2bc669 Fixed two-finger touch delay, and all other hidden event-pile-up. 
Added a processEvents() call in the idle, because otherwise calling idle updates starves the event handlers.
 2013-07-03 11:37:38 -07:00
Philip Rosedale
7880c74304 smooth gyro look on by default if not in settings 2013-07-03 11:17:06 -07:00
Philip Rosedale
bf4bc22fbf Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 11:11:00 -07:00
Philip Rosedale
1868717520 Improve gyro look to smoothly follow the head and not move for small movements 2013-07-03 11:10:40 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Andrzej Kapolka
e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Avatar.cpp
 2013-07-03 10:15:11 -07:00
Eric Johnston
fd2009738b Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-03 09:56:00 -07:00
Stephen Birarda
00fa688aba Merge pull request #614 from machinelevel/dev4 
(changed per requests and re-merged) Two Leap-related crashes fixed, plu...
 2013-07-03 09:53:40 -07:00
Stephen Birarda
4a804a9960 Merge pull request #615 from ey6es/master 
Fixes for gyros/webcam: restore rotation amplification, don't bother with gyro position or fusing webcam roll, blink faster.
 2013-07-02 17:33:11 -07:00
Eric Johnston
5d59bcbec7 (changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements 
1. Fixed thread-crash at terminate() time by terminating the LeapManager properly
2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener
3. Added fingerRoot positions to display and data packet
4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers
5. My avatar's fingers are different color from others
 2013-07-02 17:03:32 -07:00
Andrzej Kapolka
b660336b2a Fix for camera movement with webcam enabled; don't bother using roll from 
webcam if we have the gyros; reinstate head orientation scaling; don't bother
using gyro position.
 2013-07-02 16:59:03 -07:00
ZappoMan
af1de263a4 fixed FOV preference to work with view frustum code properly 2013-07-02 16:58:31 -07:00
ZappoMan
f45f0610f5 fixed FOV preference with projection matrix 2013-07-02 16:54:55 -07:00
ZappoMan
1e19748a1a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-02 15:52:49 -07:00
ZappoMan
c7ff073686 more progress on merging 2013-07-02 15:50:40 -07:00
Andrzej Kapolka
4f01db6dc7 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 14:52:22 -07:00
Andrzej Kapolka
bf4757663c Merge pull request #609 from birarda/domain-stats 
rework Logstash to handle various stat types, add domain server node count stat
 2013-07-02 14:52:08 -07:00
Andrzej Kapolka
c4deeed121 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 14:51:45 -07:00
Andrzej Kapolka
52e7ff9a68 Working on filling in missing joint data. 2013-07-02 14:51:27 -07:00
Stephen Birarda
f7f321663a DRY up multiple stat type sending 2013-07-02 14:42:31 -07:00
ZappoMan
147f090d56 Merge pull request #599 from PhilipRosedale/master 
3P transition turned off, field of view now in preferences
 2013-07-02 14:19:09 -07:00
Tomáš Horáček
6f6f0423a0 Merge remote-tracking branch 'worklist/master' into 19385 2013-07-02 23:05:50 +02:00
Stephen Birarda
64f3b55aaa split logstash stash methods to stat types 2013-07-02 12:10:46 -07:00
Andrzej Kapolka
2a0d3310de Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 09:46:07 -07:00
atlante45
b062295ecb Merge with master 2013-07-02 16:22:39 +02:00
atlante45
78aa3ac9f9 Added UI responsivness 2013-07-02 16:17:25 +02:00
tosh
f3ab3b6c83 prevents voxel data from being sent or received (read: requested) when voxel rendering is disabled 
also adds a menu option under "Tools" to enable/disable the Oscilloscope
 2013-07-02 12:41:34 +02:00
Philip Rosedale
e7113d26f8 Add field of view as an option in preferences 2013-07-01 23:00:39 -07:00
Philip Rosedale
6fbab462f0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-01 22:30:06 -07:00
ZappoMan
015ff85cea good progress on merging polygons 2013-07-01 21:39:56 -07:00
tosh
f062319c2b introduces named constants for bandwidth meter channel indices / max. drag length 2013-07-02 03:53:49 +02:00
Tomáš Horáček
66de431d67 re #19385: add hot-fix to allow import of big PNGs 
sendVoxelsOperation() is sending data too fast, printf slows it down.
Better fix is required.
 2013-07-02 02:57:55 +02:00
Andrzej Kapolka
095782af45 Smooth the joints, get the head position/orientation from there. 2013-07-01 17:46:05 -07:00
Tomáš Horáček
b5e5806988 re #19385: fill gaps between neighbourhood voxels 2013-07-02 01:16:20 +02:00
Tomáš Horáček
c4c2d46847 re #19385: first version of PNG import 
works for size <= 128px
 2013-07-02 01:16:20 +02:00
atlante45
8cc3f202ab Merge with upstream master 2013-07-01 17:12:05 +02:00
atlante45
45e13fda15 More UI improvements 2013-07-01 16:34:43 +02:00
Grayson Stebbins
60bea894d8 UI improvements 2013-07-01 10:32:36 -07:00
tosh
639858dfc9 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-01 10:29:56 +02:00
Philip Rosedale
d464ae4158 Merge pull request #578 from birarda/fervor 
add an autoupdater for release OS X builds
 2013-06-30 23:25:42 -07:00
tosh
f1e5a56347 adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars 2013-06-30 17:08:01 +02:00
tosh
46f8136f2e combined bandwidth display at automatic scale 2013-06-29 20:30:12 +02:00
tosh
c18400f8b7 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-06-29 15:41:56 +02:00
ZappoMan
c7e691a010 cleaned up CoverageMapV2 recursion code, fixes crazy false occlusion 2013-06-29 00:15:57 -07:00
ZappoMan
73ad854235 latest version of quadtree coverage map 2013-06-28 22:05:32 -07:00
Philip Rosedale
5025e89c25 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-28 16:36:08 -07:00
Philip Rosedale
c2ef960a9e Changed horizontal field of view to a constant, made it 90 degrees 2013-06-28 16:31:59 -07:00
Stephen Birarda
3349419c68 inital changes to add a version byte to packets 2013-06-28 16:23:35 -07:00
Philip Rosedale
8bac3b6a2b Merge branch 'master' of https://github.com/worklist/hifi 2013-06-28 16:20:23 -07:00
Mark Peng
be2e6518a1 Fixed if statement formatting in displayStats() and timer() in Application.cpp 2013-06-28 16:20:05 -07:00
Mark Peng
53543c26fe Added menu toggle for displaying ping 2013-06-28 16:02:49 -07:00
Mark Peng
745dc03c72 Fixed AGENT_TYPE typo in Application::displayStats() 2013-06-28 15:42:27 -07:00
Mark Peng
a5c6cee433 Renamed getPingTime() to getPingMs() in Agent.h, etc. 2013-06-28 15:33:08 -07:00
Mark Peng
0aa3227228 Merge remote-tracking branch 'upstream/master' 2013-06-28 15:26:34 -07:00
Mark Peng
293031de6f ping reporter added to interface take 3 2013-06-28 13:03:30 -07:00
Philip Rosedale
a0e6c2869d merge fix 2013-06-28 11:54:25 -07:00
Mark Peng
ee005f19d9 ping reporter added to interface take 2 2013-06-28 11:17:52 -07:00
Mark Peng
c5fe8b078e ping reporter added to interface 2013-06-28 11:07:01 -07:00
Eric Johnston
1c797405da Hand rework in preparation for adding send/receive hand data 
- Added Hand.cpp, Hand.h, HandData.cpp, HandData.h, roughly matching the equivalent Head files
- Cleaned up Avatar by moving hand work into Hand files
- Added fixed-point data packing, for use in sending hand offsets
 2013-06-28 07:57:02 -07:00
Philip Rosedale
27266ee3b2 Third person camera transition doesn't happen on movement. 2013-06-27 17:11:25 -07:00
Stephen Birarda
73a8882a9e resolve conflicts on merge with upstream master 2013-06-27 15:22:21 -07:00
Eric Johnston
b4f5df17ab (re-commit) Added support for Leap finger-sensing device. 
Note that the actual Leap SDK can't be in the repo for IP reasons, so there's a stub-version of the header. When the actual SDK is put into the Leap folder, cake will find it automatically and switch over.
 2013-06-27 10:54:36 -07:00
Philip Rosedale
6cd25294b4 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-26 18:22:16 -07:00
Philip Rosedale
4a241d6220 turned off voxel grabbing 2013-06-26 18:21:40 -07:00
Stephen Birarda
1c0b256f92 remove echo cancellation from audio code 2013-06-26 16:22:54 -07:00
Stephen Birarda
383b6ecec2 use correct future appcast URL 2013-06-26 11:27:55 -07:00
Stephen Birarda
949395348f switch to silent update checking 2013-06-26 10:42:07 -07:00
Stephen Birarda
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
atlante45
ee15739e7e few fixes on the job 19368 2013-06-25 01:28:31 +02:00
atlante45
52d62185ee Merge branch 'master' of https://github.com/worklist/hifi into 19368 2013-06-25 00:24:54 +02:00
atlante45
d6c70ea6ca #19368 - Improve editing/building workflow in Interface 2013-06-25 00:24:21 +02:00
tosh
7690ace2c3 Merge branch 'master' of git://github.com/worklist/hifi into 19377 
Conflicts:
	interface/src/Audio.cpp
 2013-06-22 05:35:31 +02:00
tosh
4f692aeb56 improves bandwidth meter layout / simplifies & fixes rendering 2013-06-22 05:07:01 +02:00
tosh
290c20bfc7 introduces bandwidth meter / dialog 2013-06-22 04:22:10 +02:00
birarda
bd0d820fc7 Merge pull request #556 from PhilipRosedale/master 
Dynamic jitter buffer for less stuttering, fixes to stereo
 2013-06-21 14:29:45 -07:00
Philip Rosedale
12ef87e073 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 14:23:49 -07:00
Andrzej Kapolka
483407a3f2 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:09:38 -07:00
Andrzej Kapolka
0000eac95f Implementation parameter name should match interface parameter name. 2013-06-21 14:02:35 -07:00
Eric Johnston
6825274b65 Re-issue of change which adds two-finger touch look to avatar. 
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
 2013-06-21 13:43:23 -07:00
Philip Rosedale
6eafd6582e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 11:42:29 -07:00
Philip Rosedale
1f6fd31b52 Merge pull request #568 from ey6es/opencv 
Head roll, lean from webcam data.
 2013-06-21 11:41:21 -07:00
Andrzej Kapolka
0e223b90d9 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 11:35:23 -07:00
Andrzej Kapolka
00eba63e4e Added various options to test for voxel avatars, manual third person mode 
(also, cleaned up the camera switching a little).
 2013-06-21 11:33:38 -07:00
Philip Rosedale
13b729d9b4 Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar. 2013-06-20 18:49:05 -07:00
Stephen Birarda
8b7b0d542a send the interface startup time to log stash 2013-06-20 15:34:17 -07:00
Andrzej Kapolka
b0dd5223e1 Avatar head roll/lean based on webcam data. 2013-06-20 14:20:03 -07:00
Andrzej Kapolka
b14a0c1554 Reset webcam along with other sensors on spacebar, added settings config for 
non-Apple.
 2013-06-20 11:44:47 -07:00
Philip Rosedale
c740400224 Merge fixes plus auto jitter buffer 2013-06-20 10:54:58 -07:00
Philip Rosedale
2c8c34f9bd set jitter buffer on application start to 1/2 of a packet 2013-06-20 09:08:37 -07:00
ZappoMan
517ff0f3cf Merge pull request #565 from tschw/19371 
Code Review for Job #19371
 2013-06-19 21:08:55 -07:00
Philip Rosedale
5dae92d610 Merge pull request #560 from ZappoMan/occlusion_culling 
Occlusion culling optimizations
 2013-06-19 19:26:56 -07:00
tosh
72a29979d0 Merge branch 'master' of git://github.com/worklist/hifi into 19371 
Conflicts:
	interface/CMakeLists.txt
 2013-06-20 03:46:25 +02:00
ZappoMan
cadd596508 implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares 2013-06-19 17:52:01 -07:00
Philip Rosedale
3304f0eb2e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-19 16:03:20 -07:00
Philip Rosedale
bc374d0183 More audio tweaks 2013-06-19 16:02:56 -07:00
tosh
651dc19427 separates echo cancellation from loopback test (intermediate commit) 2013-06-19 23:55:15 +02:00
Andrzej Kapolka
68371f8c3f Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-19 11:04:12 -07:00
Andrzej Kapolka
352f7ca3cf Provide option to enable/disable webcam (disabled by default). 2013-06-19 10:46:54 -07:00
Andrzej Kapolka
dbde66cbd5 Use trigger to change the state of the menu actions; that way, we get the 
callbacks.
 2013-06-19 10:32:55 -07:00
tosh
7342b7a774 Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-19 16:15:38 +02:00
Andrzej Kapolka
9e92ea03da Rather than copying to a QImage, just send the pointer. Also, put the render 
code in Webcam itself.
 2013-06-18 12:13:40 -07:00
ZappoMan
46d7ada753 code cleanup 2013-06-18 10:21:47 -07:00
ZappoMan
8331fc1acb removed some old debug code 2013-06-18 10:19:49 -07:00
ZappoMan
7fe6c0e3b3 added occlusion culling menu option 2013-06-18 09:34:12 -07:00
Philip Rosedale
002f8c736f Added adjustable audio jitter buffer (in preferences), and simple lowPassFilter (for pert testing compared to LPF) 2013-06-17 18:30:02 -07:00
Andrzej Kapolka
a771f53df3 Read the webcam frames in a separate thread, since the call blocks. 2013-06-17 18:07:53 -07:00
Andrzej Kapolka
3c58f0c0a7 Must init webcam after OpenGL. 2013-06-17 16:24:47 -07:00
Andrzej Kapolka
c7ddc89803 Basic frame grab from camera; not currently working yet, but let's try on 
OS X!
 2013-06-17 15:06:40 -07:00
tosh
e3da925e46 Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-17 07:18:19 +02:00
tosh
66f350d846 echo cancellation: ui, calibration, visualization 2013-06-17 07:16:29 +02:00
ZappoMan
c9e1c898c2 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-14 19:50:38 -07:00
Philip Rosedale
04736fefb5 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-13 15:04:41 -07:00
Philip Rosedale
f6e6ceddfe Head camera scaling always one if gyros off so that mouse look works. 2013-06-13 14:53:10 -07:00
Philip Rosedale
1556886a64 fixing reversed lookat, rendering for all avatars 2013-06-13 14:33:09 -07:00
Philip Rosedale
687966c486 Other people's avatar's look where they are mousing 2013-06-13 14:04:51 -07:00
Philip Rosedale
e32f9f387a Basic random eye movements added, and fixation on camera in mirror mode. 2013-06-13 13:50:56 -07:00
ZappoMan
40c2cf2d44 removed some dead code 2013-06-13 13:31:26 -07:00
ZappoMan
8320925add Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 13:30:18 -07:00
Andrzej Kapolka
78072fbde0 Merge pull request #523 from PhilipRosedale/master 
Better physics, first person to third person transition
 2013-06-13 12:07:06 -07:00
Philip Rosedale
b85f91a7d4 fixes per code review 2013-06-13 12:05:06 -07:00
Philip Rosedale
61b1a2f995 First person to third person transition driven by velocity, changes to make moving and flying physics more fun. 2013-06-13 11:31:41 -07:00
Andrzej Kapolka
db729a04aa Converted double timestamps to long long (64 bit integers), fixed bug with 
updating agent timestamps.
 2013-06-13 11:11:59 -07:00
ZappoMan
72b2845178 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 09:40:45 -07:00
Philip Rosedale
c0ba2aeebe Added jumping, tuned friction model, tuned thrust 2013-06-12 23:45:59 -07:00
ZappoMan
0f234d739e remove Camera menu from frustum debugging, because its obsolete and only causes problems 2013-06-12 21:44:49 -07:00
Philip Rosedale
a5a0df09cb removed grab voxel rendering 2013-06-12 16:36:55 -07:00
Philip Rosedale
3d1ddf047e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-12 16:27:53 -07:00
Andrzej Kapolka
ccd61ee5a2 Found the problem we were having: the domain server was reporting back all 
kinds of things as our ID.
 2013-06-12 16:13:44 -07:00
Andrzej Kapolka
19180ad900 Put the debugging back in. 2013-06-12 15:56:28 -07:00
Andrzej Kapolka
e4ed9162b9 This should help, as well as fix another annoyance: bind to an ephemeral port, 
rather than a fixed one.
 2013-06-12 15:52:29 -07:00
Philip Rosedale
311b09eee0 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-12 14:30:48 -07:00
Andrzej Kapolka
f197b4cd62 Some debugging to use on the other machine. 2013-06-12 14:20:28 -07:00
Andrzej Kapolka
b28df17207 Slight tweak: we need to call trigger in order to get the full toggle 
behavior.
 2013-06-12 13:51:16 -07:00
Andrzej Kapolka
178996bb8b Make sure first person mode and mirror mode are mutually exclusive. 2013-06-12 13:30:41 -07:00
Philip Rosedale
6cffb16279 merge fixes 2013-06-12 13:29:17 -07:00
Andrzej Kapolka
52c616b688 Added configurable lean scale, fixed loadSetting. 2013-06-12 13:06:28 -07:00
Philip Rosedale
26ca1a9a1d Remove shortcut on ground plane 'G', was conflicting with turning gravity on/off 2013-06-12 12:58:45 -07:00
ZappoMan
627f61badb some debug changes for testing occlusion culling 2013-06-12 12:36:28 -07:00
Philip Rosedale
3546bcc101 Avatar can set velocity, velocity set to zero on reset 2013-06-12 11:36:28 -07:00
ZappoMan
636030b0bb Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-12 01:17:03 -07:00
ZappoMan
e2d22a8e21 latest cut at occlusion culling 2013-06-12 01:16:46 -07:00
Philip Rosedale
750d210f0a Merge branch 'master' of https://github.com/worklist/hifi 2013-06-11 21:20:39 -07:00
Philip Rosedale
ad58d0aa23 Adding voxel thrust on grabbing/dragging to move avatar 2013-06-11 21:19:58 -07:00
Andrzej Kapolka
648aacb53d Let's use a fixed vector for the camera position so that the target doesn't 
move with lean.
 2013-06-11 17:26:41 -07:00
ZappoMan
ac7fbc6320 added occlusion tests to debug menu 2013-06-11 13:29:01 -07:00
ZappoMan
ab365202c8 added some debugging routines to visualize occlusion 2013-06-11 12:36:15 -07:00
Philip Rosedale
57fcaceec2 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-11 11:10:41 -07:00
Philip Rosedale
b1e3a0984b Improved mouse look behavior to be smoother, removed transmitter debug. 2013-06-11 11:10:09 -07:00
ZappoMan
74d63cdd1d Merge pull request #522 from birarda/conditional-ds 
allow agents to specify which agent types they want to hear about
 2013-06-11 00:47:36 -07:00
ZappoMan
27f8f5dcb8 fix CR feedback 2013-06-10 14:50:04 -07:00
Stephen Birarda
a8075e44ca Merge remote-tracking branch 'upstream/master' into conditional-ds 2013-06-10 14:01:54 -07:00
Stephen Birarda
7fb42dcb8a fix bug with sent and received agent interest packets 2013-06-10 13:48:34 -07:00
ZappoMan
fc3fb7d3f0 fixed bug with loading of corrupt settings file where NaN returned for avatar position details 2013-06-10 11:46:06 -07:00
Philip Rosedale
fb97d3e04b Merge pull request #520 from tschw/19367 
Code Review for Job #19367
 2013-06-10 08:04:16 -07:00
atlante45
c96e01ef51 Fixed merge conflict 2013-06-09 23:15:49 +02:00
atlante45
b1aabc2c1f Added shortcup for gravity use 2013-06-09 23:02:45 +02:00
Geenz
8dea00052d Merge branch 'master' of https://github.com/worklist/hifi into 19361 2013-06-09 02:08:29 -04:00
ZappoMan
b60df9ce89 Merge pull request #512 from ey6es/gyroquat 
Fixes for preferences: store avatar voxel URL along with other avatar settings, use QAction rather than separate boolean for autosave.
 2013-06-08 21:36:07 -07:00
ZappoMan
b69cfd4e06 fixed CR spacing issue 2013-06-08 17:27:48 -07:00
tosh
9ca0b5e7a7 removes blank lines that slipped in 2013-06-08 02:35:55 +02:00
tosh
d39b25a17b adds menu option to set whether ground plane gets rendered 2013-06-08 02:31:23 +02:00
ZappoMan
46c66c39e5 implement keyhole frustum 2013-06-07 17:23:23 -07:00
atlante45
5c07638ce2 19369 - Added "Use Gravity" option 2013-06-08 02:05:54 +02:00
Andrzej Kapolka
ac2b7d7f48 Fix for initial camera transition. 2013-06-07 15:20:26 -07:00
Stephen Birarda
1e05936aea unthread DS check in, allow agents to tell DS who they want to hear about 2013-06-07 15:19:12 -07:00
Stephen Birarda
fc27c2c7bb more renaming for AGENT_TYPE_VOXEL_SERVER 2013-06-07 14:14:13 -07:00
Andrzej Kapolka
75c89f2c22 OK, I found the problem: duplication of state for the "autosave" option. 
Let's just use the QAction, as does everything else.
 2013-06-07 13:42:49 -07:00
Geenz
89ef026ce8 Remove seemingly unnecessary coordinate space conversion. 2013-06-07 16:42:22 -04:00
Geenz
65ec02044e Add a distance check for selected voxels. 2013-06-07 16:34:10 -04:00
Geenz
1c8d4f7717 Get the average velocity of the avatar. 2013-06-07 16:20:51 -04:00
Andrzej Kapolka
9da10df9f2 We need to set these before initMenu, as that's where we create the QSettings. 2013-06-07 13:12:59 -07:00
Geenz
82db388552 Real max velocity stuff. 2013-06-07 16:08:27 -04:00
Geenz
c79bd71fe7 Merge branch 'master' of https://github.com/worklist/hifi into 19361 2013-06-07 16:00:33 -04:00
Geenz
86316bc674 Don't render the voxel selection when we're moving over a maximum velocity. 2013-06-07 16:00:13 -04:00
Andrzej Kapolka
953aec35e6 Use the default QSettings constructor and let it get the application info 
from the QCoreApplication properties.
 2013-06-07 11:48:29 -07:00
Andrzej Kapolka
a5c24b5333 OK, we don't need this sync. Clearly the problem I was seeing on OS X lies 
elsewhere.
 2013-06-07 11:32:26 -07:00
Andrzej Kapolka
dc8a6c2725 Store the avatar voxel URL along with the rest of the avatar settings. 2013-06-07 11:30:41 -07:00
ZappoMan
ba7863605c fix several delete/delete[] mismatches 2013-06-07 10:49:43 -07:00
ZappoMan
479e8c7811 add shortcut key for Kill Local Voxels to help debugging of LOD 2013-06-07 10:29:05 -07:00
ZappoMan
887e3428c2 cleaned up menus slightly 2013-06-07 09:39:24 -07:00
Philip Rosedale
dd0fa021a0 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-07 09:19:54 -07:00
Philip Rosedale
f0c9bd45bb Fixed merge 2013-06-07 09:19:49 -07:00
ZappoMan
ece117e0b0 Merge pull request #502 from ey6es/gyroquat 
Increase YAW_DECAY, remove roll from head camera, provide option for pitch/yaw scale (zero by default).
 2013-06-07 09:17:11 -07:00
atlante45
2a1730af72 #19365 - Frustum menu moved inside the Debug menu 2013-06-07 16:35:43 +02:00
Andrzej Kapolka
26de3028fa We need to sync in order to ensure that the settings are saved. 2013-06-06 18:25:16 -07:00
Andrzej Kapolka
acc8efa026 One more "one more try." 2013-06-06 18:10:21 -07:00
Andrzej Kapolka
1b698b24e2 OK, one more try. 2013-06-06 18:05:39 -07:00
Andrzej Kapolka
ce68c1a6a4 Think this needs to be a double. 2013-06-06 18:03:38 -07:00
Andrzej Kapolka
e0e94481c9 Add pitch/yaw scale preference to control degree of view rotation. 2013-06-06 17:53:00 -07:00
Philip Rosedale
b5e63fb446 Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp 2013-06-06 17:52:19 -07:00
Andrzej Kapolka
ffc1c33455 Removed double negation for coordinates, world aligned orientation -> camera 
orientation, removed roll.
 2013-06-06 17:25:52 -07:00
Geenz
7cefa3fe7b Check if our main window is our application window within Application's event handling functions. 2013-06-06 19:58:33 -04:00
Geenz
51340452df Use _mouseX and _mouseY for mouse look instead of the global mouse position when idle (prevents mouse look from accidentally triggering when the window is inactive). 2013-06-06 19:47:01 -04:00
Geenz
151a6edfb4 Check if our canvas has focus. If not, then ignore events passed to it. 2013-06-06 19:31:55 -04:00
Philip Rosedale
b08fe8f915 merge fixes 2013-06-06 10:07:50 -07:00
Philip Rosedale
24dcd14371 Added sensor fusion for more stable gyro roll, pitch. 2013-06-05 23:53:01 -07:00
Philip Rosedale
1b20b016dd Fixed acceleration checking bug that was limiting angular rotation, changed mouselook to work correctly/stable. 2013-06-05 20:04:30 -07:00
Stephen Birarda
30d6c7f68a Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 18:26:12 -07:00
Philip Rosedale
1f0e321980 removed Oculus Manager from camera object, using _tightness = 0.0 to shutoff camera movement smoothing 2013-06-05 17:54:14 -07:00