Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 10:28:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4723 commits 76 branches 59 tags 1.2 GiB
Commit graph

2579 commits

Author SHA1 Message Date
Jeffrey Ventrella
915cb1e5bd Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 18:56:37 -07:00
Jeffrey Ventrella
ae99ca5ec8 added more API for the particle system 2013-07-12 18:55:42 -07:00
atlante45
34cbe317fa Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Webcam.cpp
 2013-07-12 17:57:20 -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
Philip Rosedale
832e81b45f Less skeleton averaging, can see first person arms 2013-07-12 17:00: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
48bf26fb28 Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 14:41:48 -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
Stephen Birarda
5044139374 Merge pull request #662 from birarda/master 
revert linking of STK to interface
 2013-07-12 13:16:30 -07:00
ZappoMan
006929e45b Merge pull request #660 from PhilipRosedale/master 
Add speed brakes for better flying/walking
 2013-07-12 13:15:22 -07:00
Stephen Birarda
93b122bc76 Revert "link STK to interface" 
This reverts commit d55387f727.
 2013-07-12 13:12:52 -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
Stephen Birarda
d55387f727 link STK to interface 2013-07-12 11:18:15 -07:00
Philip Rosedale
e756fdbee6 Add speed brakes for better flying/walking 2013-07-12 08:28:50 -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
d2dd41ba0f make thrust be in direction of head/view 2013-07-11 21:46:13 -07:00
Philip Rosedale
6609a850eb Gyros and touch look now work at same time 2013-07-11 21:34:42 -07:00
Philip Rosedale
670de73384 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 19:52:39 -07:00
Philip Rosedale
4b95f2bae5 Better thrust values and no jittering when standing 2013-07-11 19:10:34 -07:00
Atlante45
08b0afd466 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 18:17:06 -07:00
Atlante45
d84963040e avatar resized + physic adapted 2013-07-11 18:16:55 -07:00
Stephen Birarda
76dc01e84e fix audio silence on receive bail 2013-07-11 17:55:59 -07:00
Atlante45
12bbec66af Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 17:22:36 -07:00
Eric Johnston
58b50067ad Some Leap finger fixes, but also temporarily disable Leap data sending, due to a crash. 
Will resolve the crash before re-enabling.
 2013-07-11 16:06:31 -07:00
Philip Rosedale
678b30f494 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 15:53:19 -07:00
Philip Rosedale
79b2703e1c Improve avatar movement, added Physics.cpp for routines to help with physics calculations 2013-07-11 15:53:07 -07:00
Atlante45
7f0ab0289e Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 14:10:40 -07:00
Andrzej Kapolka
c3242598f5 Merge pull request #655 from ZappoMan/occlusion_culling 
Make Delta Sending Default, Added option for "Low Res" mode while moving
 2013-07-11 14:08:22 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
Atlante45
beefd57b54 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 13:25:42 -07:00
Andrzej Kapolka
08d2c70db5 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 13:19:07 -07:00
ZappoMan
cb59df4b9e Merge pull request #653 from birarda/master 
refactor sendDomainServerCheckIn to avoid static variable threading issue
 2013-07-11 13:08:15 -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
Andrzej Kapolka
ee77f59f48 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 12:25:51 -07:00
Andrzej Kapolka
4e524d7125 Compass tweaks: better initial extents, scale extents to compensate for 
anisotropy, converge more quickly on compass heading.
 2013-07-11 12:10:15 -07:00
Atlante45
a335eb2552 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 11:34:07 -07:00
Andrzej Kapolka
aa3f4c6f2c Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 11:21:59 -07:00
Andrzej Kapolka
baca4353a8 Removed stray block. 2013-07-11 11:19:28 -07:00
Andrzej Kapolka
c6d01e0acc Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 11:16:09 -07:00
Stephen Birarda
38a33e0283 couple more type squishes 2013-07-11 11:11:39 -07:00
Andrzej Kapolka
b23875a952 Make sure we shutdown before quitting. 2013-07-11 11:10:14 -07:00
Stephen Birarda
430f255730 type squish in Audio class 2013-07-11 11:10:03 -07:00
Atlante45
409728d665 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 11:04: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
Andrzej Kapolka
cf7408505f Shut down the webcam when it's turned off, but don't delete the grabber (since 
it has expensive-to-init state like the face cascade).
 2013-07-11 10:53:51 -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
Atlante45
b3f8711f95 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:53:27 -07:00
ZappoMan
04cd340f0b add back in correct isViewChanging() 2013-07-11 10:50:17 -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
Atlante45
5608a0a3b2 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:33:55 -07:00
Mark Peng
29d1e08f48 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:33:21 -07:00
Andrzej Kapolka
d4abceba2b Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 10:28:26 -07:00
Andrzej Kapolka
b62d2d85c3 Let's try actually releasing the camera when we turn it off. 2013-07-11 10:28:09 -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
Atlante45
6e2422a547 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:13:29 -07:00
Stephen Birarda
beb89e3d2b change some timing types from int to uint64_t to avoid costly assumptions 2013-07-11 10:09:00 -07:00
Stephen Birarda
4ed231670f put back the missing voxels 2013-07-11 10:04:27 -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
Jeffrey Ventrella
980a5b7980 cleanup 2013-07-10 18:32:17 -07:00
ZappoMan
8adf713caa Merge pull request #643 from ey6es/kinected 
Flip x when in mirror mode, rather than special-casing all the head rotations; also, fix for sideways leaning.
 2013-07-10 18:12:13 -07:00
Atlante45
4108bb135b Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-10 18:11:04 -07:00
ZappoMan
9e83de7fbf Merge pull request #634 from machinelevel/dev4 
Added a readme with instructions on installing the Leap libraries.
 2013-07-10 18:05:03 -07:00
Jeffrey Ventrella
171c10dabe raised home position 2013-07-10 18:04:19 -07:00
Jeffrey Ventrella
8ae10a6614 added emitter 2013-07-10 17:55: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
Atlante45
5ae24fc660 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Head.cpp
 2013-07-10 17:39:31 -07:00
Atlante45
906fc04e35 first step toward resizing avatars 2013-07-10 17:35:39 -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
a03a46ad16 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 16:36:21 -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
6694ef3869 fixed some compiler warnings 2013-07-10 16:33:27 -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
Eric Johnston
38fe6201a8 Added content to read me 2013-07-10 15:33:28 -07:00
Andrzej Kapolka
67afc61fd8 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 15:16:38 -07:00
Andrzej Kapolka
559dc4bb5d Flush the queue so that we don't get any funny data on the initial read. 2013-07-10 15:07:39 -07:00
Andrzej Kapolka
2ffd151a1f Ryan likes the eyelids starting at forty degrees. 2013-07-10 14:40:45 -07:00
Andrzej Kapolka
6a5fb4f535 Removed unused variables, added motion driver library for OS X. 2013-07-10 14:28:06 -07:00
Andrzej Kapolka
53eb5ed0bb No clock_gettime on OS X; must use gettimeofday. 2013-07-10 14:21:23 -07:00
Andrzej Kapolka
0aa1b396db Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 14:08:03 -07:00
Andrzej Kapolka
6fe9a71868 Basic compass fusion. 2013-07-10 14:06:12 -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
Atlante45
d79acea6a7 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-10 12:46:50 -07:00
Stephen Birarda
70ccef0733 remove avatar data read and write to file 2013-07-10 12:37:23 -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
Eric Johnston
c1080bca1a Added a read me with instructions on installing the Leap libraries. 2013-07-10 11:32:18 -07:00
ZappoMan
a9b1aa727f added back stars file loading 2013-07-10 11:11:21 -07:00
ZappoMan
abd7dfde8b added vector math timing test 2013-07-10 11:10:03 -07:00
Stephen Birarda
488a4affd3 fix member variable initialization order to remove warnings 2013-07-10 09:59:14 -07:00
Andrzej Kapolka
a116f5a636 Use InvenSense code to handle the rather complicated business of talking the 
sensor into giving us the compass reading.  We're getting it now, but I still
have to figure out how to incorporate it.
 2013-07-09 17:28:23 -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
185d5bb0a2 use packet version helpers for PACKET_TYPE_TRANSMITTER_DATA 2013-07-08 15:01:57 -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
Stephen Birarda
b816761a74 use packet version helpers for PACKET_TYPE_MICROPHONE 2013-07-08 14:24:08 -07:00
Andrzej Kapolka
b1050c633b Suppress warnings for OpenNI. 2013-07-08 14:17:03 -07:00
Stephen Birarda
81e6bccd08 use packet version helpers in parseData methods 2013-07-08 14:13:36 -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
c64a961a38 packet version handling in VoxelSystem parseData 2013-07-08 14:01:10 -07:00
Andrzej Kapolka
c5c9debed5 Fix for combined gyro/depth camera. 2013-07-08 13:03:53 -07:00
Andrzej Kapolka
c43994fe03 Orientation -> rotation. 2013-07-08 12:54:27 -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