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

1730 commits

Author SHA1 Message Date
Philip Rosedale
7aebbe3047 Merge pull request #434 from ZappoMan/voxel_animation 
Improve "Delta Sending" mode..
 2013-05-26 09:45:54 -07:00
Andrzej Kapolka
70b25fd6c4 Sphere/box collisions for voxels, various utility functions. 2013-05-25 19:59:07 -07:00
ZappoMan
77e5fbb590 Merge pull request #427 from birarda/oculus 
go into oculus mode when connected, fix the yaw pull
 2013-05-25 15:38:20 -07:00
ZappoMan
1a2921e3e8 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-25 15:32:12 -07:00
ZappoMan
60f2b9a438 removed debug 2013-05-25 15:31:28 -07:00
ZappoMan
f6863081f9 Fix Delta Sending mode by not culling out of view voxels until we STOP moving 
- added isViewChanging() which determines if the view is currently changing
- made hasViewChanged() report false UNTIL we've stopped moving
- changed setupNewVoxelsForDrawing() to only call removeOutOfView() if we're not moving
 2013-05-25 15:29:23 -07:00
Jeffrey Ventrella
1e4771fe27 fix 2013-05-24 18:05:14 -07:00
Jeffrey Ventrella
8c24477a24 Merge remote-tracking branch 'upstream/master' 2013-05-24 18:01:47 -07:00
Jeffrey Ventrella
0c2c90b84d cleanup 2013-05-24 18:01:25 -07:00
Freddy
6a4bcf32fa Code review fixes 2013-05-24 17:58:31 -07:00
Freddy
30e951578e procedural voxel create/delete noises 2013-05-24 17:27:56 -07:00
Jeffrey Ventrella
28f3af4ea5 Merge remote-tracking branch 'upstream/master' 2013-05-24 17:13:10 -07:00
Jeffrey Ventrella
56438435c1 made mouth conform to the head sphere 2013-05-24 17:12:14 -07:00
birarda
82f5e0a3b1 Merge pull request #426 from PhilipRosedale/master 
big ground plane
 2013-05-24 16:37:53 -07:00
Jeffrey Ventrella
6634ad2ed2 thingy 2013-05-24 16:31:17 -07:00
Stephen Birarda
a8b08647d0 require that crotch grabbing be explicit, not implicit 2013-05-24 16:18:36 -07:00
Stephen Birarda
65168e6aec add a yaw offset to the oculus so it can pull body 2013-05-24 15:23:25 -07:00
Philip Rosedale
608a4f71bf ground surface is 20 meters across. play on! 2013-05-24 14:51:06 -07:00
Philip Rosedale
995fbcf4f9 mohawk also follows body pitch when accelerating 2013-05-24 14:46:26 -07:00
Philip Rosedale
d796956a96 fix per review 2013-05-24 14:32:56 -07:00
Philip Rosedale
9baf087c9a Avatar renders right arm in 1P mode 2013-05-24 14:29:26 -07:00
Philip Rosedale
31e41260c1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 14:17:44 -07:00
Philip Rosedale
f5c0f84d27 Mohawk is different/stable for each person, and rotates correctly with head 2013-05-24 14:15:53 -07:00
Stephen Birarda
d12bc85376 go directly into oculus mode when the oculus is connected 2013-05-24 14:05:22 -07:00
Philip Rosedale
cb7381fcd1 incremental fix rotation 2013-05-24 12:33:05 -07:00
Philip Rosedale
360c9c8ab1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 12:30:12 -07:00
Philip Rosedale
dc9b2e33b5 Fixing mohawk orientation 2013-05-24 12:30:05 -07:00
Stephen Birarda
81307939d4 Merge remote-tracking branch 'upstream/master' into owner-pointers 2013-05-24 12:23:12 -07:00
Stephen Birarda
59a6016f4b use a NULL default for owningAvatar to simplify constructors 2013-05-24 12:18:38 -07:00
ZappoMan
0a1a86ca94 Merge pull request #418 from PhilipRosedale/master 
More stable gyro averaging
 2013-05-24 12:18:02 -07:00
Stephen Birarda
49b483ef53 maintain a pointer to owning avatar from HeadData 2013-05-24 12:17:48 -07:00
Stephen Birarda
36892da488 keep a pointer to owning agent in AgentData 2013-05-24 12:17:34 -07:00
ZappoMan
8560e42357 fix issue with duplicate VBO slots 2013-05-24 12:08:25 -07:00
Philip Rosedale
8b5901d904 simplified per stephens code review 2013-05-24 12:04:17 -07:00
Jeffrey Ventrella
51ddf40ffe cleaned up hair code 2013-05-24 11:54:55 -07:00
Philip Rosedale
17c898c151 Long term averaging of the gyros for better stability 2013-05-24 11:33:00 -07:00
Philip Rosedale
59ac5ebd66 Head will always render when body does - no decapitation 2013-05-24 11:07:19 -07:00
Philip Rosedale
f961a40d1c Chat message height doubled to clear mohawk 2013-05-24 10:55:26 -07:00
birarda
05ad7309a1 Merge pull request #411 from ey6es/master 
Fix for starfield rendering on Oculus.
 2013-05-24 10:14:31 -07:00
Philip Rosedale
bf94c88bcc Fixes per review 2013-05-24 10:12:50 -07:00
Philip Rosedale
95e73afc78 Added the avatar mohawk 2013-05-24 00:16:52 -07:00
Jeffrey Ventrella
b74ceae61a added avatar hair 2013-05-23 22:52:43 -07:00
Andrzej Kapolka
add84b2f39 Hide the cursor when in fullscreen Oculus mode. 2013-05-23 17:58:04 -07:00
Andrzej Kapolka
9be4f06e9a Disable voxel textures by default. 2013-05-23 17:32:43 -07:00
Andrzej Kapolka
514c12c7fc Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-05-23 15:39:04 -07:00
Andrzej Kapolka
9b433c974c Fix for starfield rendering on Oculus: put inter-pupil translation in 
modelview matrix where it belongs, don't reset perspective projection for
starfield.
 2013-05-23 15:35:41 -07:00
Stephen Birarda
b673715aa2 remove the no longer in use AvatarRenderer 2013-05-23 15:18:32 -07:00
Philip Rosedale
37cb914891 You can reset start location with 'G' 2013-05-23 15:02:32 -07:00
Philip Rosedale
235cfc8ab2 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 12:33:39 -07:00
Philip Rosedale
32d2418b7a Added display head mouse option (default off) and all camera modes follow head gyros the same way. 2013-05-23 12:33:26 -07:00
ZappoMan
089d8d525e Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-23 12:20:34 -07:00
ZappoMan
6ec61996c9 Merge pull request #405 from PhilipRosedale/master 
Chat in right place above head, not body, tweaks to sensors, reset behavior, gyro pitch back.
 2013-05-23 12:19:43 -07:00
Philip Rosedale
eb15aa602c Added amplification of gyro rates when applying to head, for more sensitivity, and to allow easily looking to one side and another 2013-05-23 12:17:24 -07:00
ZappoMan
473665fb4a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-23 12:16:29 -07:00
ZappoMan
6e5ed6435b added shortcut key to log menu 2013-05-23 12:06:59 -07:00
Philip Rosedale
7a0ea8bd59 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 11:48:18 -07:00
Philip Rosedale
8fec96319c Merge pull request #403 from Ventrella/master 
added effect of avatars floating above the ground with knees bent slightly
 2013-05-23 11:48:00 -07:00
Philip Rosedale
be1fae5958 Move head back to center when moving 2013-05-23 11:37:27 -07:00
Philip Rosedale
85ea48e43a Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 11:26:26 -07:00
Philip Rosedale
86e3e25663 removed commented line, formatting 2013-05-23 11:26:14 -07:00
Andrzej Kapolka
672f4de496 Avoid colliding with gravityless environments. 2013-05-23 10:36:28 -07:00
Andrzej Kapolka
34b526f15c Restore the original floor behavior. 2013-05-23 10:32:12 -07:00
Jeffrey Ventrella
649fb72556 Merge remote-tracking branch 'upstream/master' 2013-05-23 10:15:18 -07:00
Jeffrey Ventrella
77324ebb46 made avatars appear to float above the ground 2013-05-23 10:14:46 -07:00
Philip Rosedale
c56509e5a2 Re-enabled pitch gyro look in first person, start location is now not reset on sensor reset 2013-05-23 09:30:36 -07:00
Philip Rosedale
6b3f35ef19 Merge pull request #393 from ey6es/master 
Put all environment data in the same packet and only send it off about once a second.
 2013-05-22 21:11:22 -07:00
Stephen Birarda
120c835004 fix head mouse 2013-05-22 19:46:33 -07:00
Philip Rosedale
5b3ac504c4 Updated merge conflicts 2013-05-22 19:43:11 -07:00
Philip Rosedale
f39fade4c7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 19:40:13 -07:00
Philip Rosedale
22b534cd8e Fixed headmouse 2013-05-22 19:39:37 -07:00
Stephen Birarda
d7a1cc6ea8 correct the sign for yaw and roll for invensense serial data 2013-05-22 19:38:17 -07:00
Stephen Birarda
3e192cda9b correct rendering for first-person for oculus 2013-05-22 19:15:52 -07:00
birarda
3e16e6a36c Merge pull request #398 from birarda/master 
correct sign of yaw for oculus
 2013-05-22 18:57:06 -07:00
Stephen Birarda
997a10c981 correct the sign of yaw for oculus 2013-05-22 18:56:38 -07:00
Jeffrey Ventrella
83c12ae9af etc 2013-05-22 18:31:22 -07:00
Jeffrey Ventrella
b7613497eb fixed pitch yaw (not roll) 2013-05-22 18:14:18 -07:00
Jeffrey Ventrella
2f943b697a cleanup 2013-05-22 17:27:48 -07:00
Jeffrey Ventrella
549d3a3671 Merge remote-tracking branch 'upstream/master' 2013-05-22 17:25:06 -07:00
Jeffrey Ventrella
8b49cfbf93 added back transitions to first person 2013-05-22 17:24:46 -07:00
Andrzej Kapolka
a68c8c6389 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 17:11:03 -07:00
Andrzej Kapolka
629c7b0146 Send all environment data in the same packet and only send it about once a 
second.
 2013-05-22 17:09:35 -07:00
ZappoMan
da39f28211 Merge pull request #392 from birarda/oculus 
fix broken head rotation set based on copy return
 2013-05-22 16:51:13 -07:00
Stephen Birarda
9657265c24 remove a debug line from setHeadFromGyros 2013-05-22 16:50:17 -07:00
Stephen Birarda
a1b556d6a2 space out if 2013-05-22 16:49:26 -07:00
Stephen Birarda
4738fc888b return Avatar Head by reference so setters actually do something 2013-05-22 16:43:41 -07:00
Andrzej Kapolka
b6e78064d8 Disable the righting for now, as well as the "floor" (whose presence makes us 
slide, since the gravity vector isn't pointing straight down).
 2013-05-22 16:29:13 -07:00
Andrzej Kapolka
96fdc015c5 Fix for OS X; the structure wasn't being zero-initialized as I expected. 2013-05-22 16:12:14 -07:00
Jeffrey Ventrella
4940a6ae9a Merge remote-tracking branch 'upstream/master' 2013-05-22 15:51:03 -07:00
Jeffrey Ventrella
0b014c5635 cleaned up some stuff 2013-05-22 15:50:36 -07:00
Philip Rosedale
56a0471e5f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 15:45:21 -07:00
Philip Rosedale
5bee5f07e3 Don't render body if looking in mirror, don't render test sphere over and over again for everyone. 2013-05-22 15:45:15 -07:00
Philip Rosedale
803c41d636 Chat text floats above head, not torso. 2013-05-22 15:28:24 -07:00
Andrzej Kapolka
d89939e0bd Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 15:17:13 -07:00
ZappoMan
f3855e54f9 Merge pull request #388 from birarda/master 
DRY up the resource copying
 2013-05-22 15:04:45 -07:00
Andrzej Kapolka
7a8aa7c04f Restore "floor." 2013-05-22 14:50:11 -07:00
Andrzej Kapolka
53ae8235f3 Fixed threading issue with Environment, more work on avatar righting. 2013-05-22 14:43:25 -07:00
Jeffrey Ventrella
7cae808d29 Merge remote-tracking branch 'upstream/master' 2013-05-22 14:42:25 -07:00
Jeffrey Ventrella
83e2bf2534 added menu option for setting display of lookat vectors 2013-05-22 14:42:03 -07:00
Stephen Birarda
200d81e0eb DRY up resource subdir copying for OS X bundle 2013-05-22 14:40:01 -07:00
Andrzej Kapolka
dd101b393d Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 14:33:31 -07:00