Commit graph

149 commits

Author SHA1 Message Date
ZappoMan
5d1ba857c5 Optimize View Frustum wire format.
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -07:00
Jeffrey Ventrella
8c24477a24 Merge remote-tracking branch 'upstream/master' 2013-05-24 18:01:47 -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
6634ad2ed2 thingy 2013-05-24 16:31:17 -07:00
Philip Rosedale
608a4f71bf ground surface is 20 meters across. play on! 2013-05-24 14:51:06 -07:00
Stephen Birarda
d12bc85376 go directly into oculus mode when the oculus is connected 2013-05-24 14:05:22 -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
Stephen Birarda
36892da488 keep a pointer to owning agent in AgentData 2013-05-24 12:17:34 -07:00
Philip Rosedale
17c898c151 Long term averaging of the gyros for better stability 2013-05-24 11:33:00 -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
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
6e5ed6435b added shortcut key to log menu 2013-05-23 12:06:59 -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
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
22b534cd8e Fixed headmouse 2013-05-22 19:39:37 -07:00
Stephen Birarda
3e192cda9b correct rendering for first-person for oculus 2013-05-22 19:15:52 -07:00
Stephen Birarda
997a10c981 correct the sign of yaw for oculus 2013-05-22 18:56:38 -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
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
Jeffrey Ventrella
0b014c5635 cleaned up some stuff 2013-05-22 15:50:36 -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
Philip Rosedale
6b854531aa Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 14:31:46 -07:00
Philip Rosedale
f8c39a8617 Merge pull request #382 from ey6es/master
Support for multiple environments, each with their own gravity (and currently, collision spheres).
2013-05-22 14:04:28 -07:00
Philip Rosedale
ad8246a0f5 Turned log off by default 2013-05-22 13:46:39 -07:00
Philip Rosedale
a03d6f8d80 moved pair to own menu 2013-05-22 12:55:46 -07:00
Geenz
fb553fce80 Refactor startup timing a little by getting the current time the moment the application enters its main function, then passing that to Application's constructor. Also fix the titlebar bug by setting the title bar at the end of initializeGL() instead of at the end of the first frame (which would actually further the inaccuracy of the startup time). 2013-05-22 10:53:35 -04:00
Andrzej Kapolka
8b1362636e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75 Merge pull request #352 from tschw/master
refactors logging, adds comments, and revises names & formatting in all submitted code
2013-05-21 22:10:10 -07:00
Andrzej Kapolka
a864a6f8c6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6 Support for multiple environments, collisions with notional planet surfaces. 2013-05-21 21:33:08 -07:00
birarda
63fcb2eeef Merge pull request #367 from ZappoMan/voxel_animation
Fixes "Delete" voxel behavior
2013-05-21 17:43:36 -07:00
Stephen Birarda
3ac20849d6 remove old menu code and glew implemenation file 2013-05-21 16:21:33 -07:00
Jeffrey Ventrella
ef95b13723 Merge remote-tracking branch 'upstream/master' 2013-05-21 14:21:14 -07:00
Jeffrey Ventrella
d21b48ad6e cleaned up a lot of pitch/yaw/roll confusion in Head and made new versions of eyes, eyebrows and mouth (Head still needs work) 2013-05-21 14:20:44 -07:00
tosh
ba4f4b9809 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 22:49:39 +02:00