ZappoMan
0ff88b882b
tweaks to default Camera near clip, and camera positions in interface
2013-04-16 14:06:48 -07:00
Stephen Birarda
f8ab33ccc7
add missing packet header for broadcast head data
2013-04-16 12:48:47 -07:00
Stephen Birarda
8129c2477a
fix broken voxel server build, change some char* to unsigned char*
2013-04-16 12:35:49 -07:00
Stephen Birarda
53108b01ef
resolve conflicts on merge with upstream master
2013-04-16 12:02:33 -07:00
Stephen Birarda
1dd21a450e
Merge remote-tracking branch 'upstream/master'
2013-04-16 12:00:55 -07:00
Stephen Birarda
5c091a51a6
change signature of parseData to use unsigned char*, include packet header always
2013-04-16 11:51:36 -07:00
stojce
6b59374921
Merge pull request #48 from stojce/19261
...
Code Review for Job #19261
2013-04-16 08:40:01 -07:00
stojce
75c63f53fc
use safe version of sprintf
2013-04-16 17:38:34 +02:00
ZappoMan
1408be00f5
Merge pull request #47 from PhilipRosedale/master
...
Cleanup and partial re-enabling of head gyros
2013-04-16 08:21:27 -07:00
Philip Rosedale
1cdeac0fec
Merge pull request #49 from ZappoMan/view_frustum_work
...
Latest view frustum work
2013-04-16 07:24:36 -07:00
ZappoMan
246380b41e
temp fix to setPitch() problem. Removed some debug printfs. Fixed menu flicker bug.
2013-04-16 00:55:44 -07:00
Philip Rosedale
b3e99513cb
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-15 18:37:59 -07:00
Philip Rosedale
cd3e414eda
Removed unneeded variables in main.cpp for pitch,yaw. Renamed routines to make it more clear where gyros are being read. Re-enabled marker box being driven by head gyros.
2013-04-15 18:37:46 -07:00
Stephen Birarda
288a259ac1
more conflict resolutions for broken build after pull
2013-04-15 18:37:25 -07:00
Stephen Birarda
c6f8cc50a9
Merge remote-tracking branch 'upstream/master'
2013-04-15 18:34:18 -07:00
ZappoMan
e7fa540796
cleaning up of whacky currentCamera experiment
2013-04-15 18:30:33 -07:00
ZappoMan
faf57d9fa8
a little hackery when in view frustum mode so we can see the frustum without OpenGL clipping us
2013-04-15 18:11:23 -07:00
ZappoMan
47a4211257
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
...
Conflicts:
interface/src/Camera.cpp
interface/src/Camera.h
interface/src/main.cpp
2013-04-15 18:05:35 -07:00
Stephen Birarda
a5a93443c6
re-work AvatarData to handle body position and rotation
2013-04-15 18:05:22 -07:00
Jeffrey Ventrella
1e388347dc
yargh
2013-04-15 18:03:34 -07:00
ZappoMan
2625ef014c
latest View Frustum work
2013-04-15 17:57:48 -07:00
stojce
8da449041c
small code formating fix
2013-04-16 02:26:11 +02:00
stojce
39df647dcb
#19261 - Add startup time to the main window title, fit to screen
2013-04-16 02:24:38 +02:00
Jeffrey Ventrella
fc8c0498cf
adjusted avatar height and camera up to compensate - improves navigation
2013-04-15 16:16:05 -07:00
Jeffrey Ventrella
e97383be2e
updated many aspects of the avatar hand motion as determined by mouse motion and mouse click
2013-04-15 14:58:32 -07:00
Jeffrey Ventrella
574ab04e09
Merge remote-tracking branch 'origin/master'
2013-04-15 12:06:48 -07:00
ZappoMan
bd837862de
fixed lighting when in frustum render mode
2013-04-13 16:16:10 -07:00
ZappoMan
e6a1fb416d
improved the menu states names for frustum rendering modes
2013-04-13 15:58:10 -07:00
ZappoMan
37322fcb73
Many menu improvements, and some render_view_frustum() improvements
...
- Added menu items for Quit, Voxels, Stars, Frustum features, etc.
- Added FrustomDrawMode enhancements to render_view_frustum()
2013-04-13 15:20:21 -07:00
Philip Rosedale
98c8228161
had to take out call to myAvatar.getBonePosition - unclear why it now isn't working.
2013-04-12 21:11:03 -07:00
Philip Rosedale
d5d746ff9e
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-12 21:01:15 -07:00
Philip Rosedale
1d69acef56
Removed hand class files, relocated transmitter receiver function to Head.h
2013-04-12 21:01:01 -07:00
Jeffrey Ventrella
ca05823010
added some smoothness to the camera
2013-04-12 18:06:11 -07:00
ZappoMan
5a8c5ff011
coding standards clean up
2013-04-12 16:55:57 -07:00
ZappoMan
5504d87212
Merge and Cleanup
...
-Cleanup glmUtils(as in, get rid of it)
-Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-12 16:32:46 -07:00
Philip Rosedale
6d7f343be8
draw a test sphere around my hand in orldspace
2013-04-12 16:13:40 -07:00
Philip Rosedale
524ed7deb6
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-12 15:35:02 -07:00
ZappoMan
77996fb140
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-12 15:06:41 -07:00
ZappoMan
d568cce0cd
changed interface to use ViewFrustum class for rendering view frustum
...
- updated ViewFrustum class to work correctly
- added new keyboard interface to adjust offset camera position and up
- removed keyboard interface for local add sphere, since we don't need that anymore
2013-04-12 15:01:48 -07:00
Jeffrey Ventrella
15c9053fac
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-12 15:01:38 -07:00
Jeffrey Ventrella
265fcc6095
a few small fixes on the avatar springs
2013-04-12 15:00:48 -07:00
ZappoMan
d01d1164ca
latest view frustum work
2013-04-12 13:36:44 -07:00
ZappoMan
76d22f1b2b
more angle tweaks
2013-04-12 11:34:10 -07:00
ZappoMan
7f1ba5c733
playing around with fov angle
2013-04-12 11:26:32 -07:00
Philip Rosedale
dcacad3755
Removed unneeded GLenable cruft
2013-04-12 10:02:41 -07:00
ZappoMan
85bef98f4a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_lod_fixes
2013-04-11 18:42:12 -07:00
Philip Rosedale
76e2ca301e
Fixes stephen asked for - remove finger stuff
2013-04-11 17:53:57 -07:00
Philip Rosedale
27c032270c
Resolved merge
2013-04-11 17:49:43 -07:00
Philip Rosedale
47dfb08ff2
Merge remote-tracking branch 'origin/startupTimer'
2013-04-11 17:46:20 -07:00
Philip Rosedale
f1bf7d0eb5
trivial test, removed one unneeded variable
2013-04-11 17:35:32 -07:00
