Jeffrey Ventrella
883d21a5e4
added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code
2013-05-26 15:17:58 -07:00
Jeffrey Ventrella
622863dbf1
Merge remote-tracking branch 'upstream/master'
2013-05-26 10:19:02 -07:00
Jeffrey Ventrella
9f7e05d407
integrated Philip's mohawk colors into my hair code and added a switch to test each version
2013-05-26 10:18:35 -07:00
Philip Rosedale
7aebbe3047
Merge pull request #434 from ZappoMan/voxel_animation
...
Improve "Delta Sending" mode..
2013-05-26 09:45:54 -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