Stephen Birarda
1dd21a450e
Merge remote-tracking branch 'upstream/master'
2013-04-16 12:00:55 -07:00
Stephen Birarda
e71f21b7bf
fix broken builds from last commit, pull new avatar data in VoxelAgentData
2013-04-16 11:59:03 -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
a3fabaf300
Merge pull request #50 from tschw/19188
...
19188
2013-04-16 08:25:07 -07: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
tosh
7c2cff824f
renames AngleUtils -> AngleUtil for consistency with the rest of the files
2013-04-16 14:07:19 +02:00
tosh
ac55c610be
tidies changeset
2013-04-16 14:06:03 +02: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
5e5a7e0a0c
Improved SerialInterface: Added gravity vector get function, closer to coding standards, better rendering of levels.
2013-04-15 20:52:18 -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
861c8e76ee
grab jeffrey's changes to Util consts
2013-04-15 18:35:46 -07:00
Stephen Birarda
2b49442039
resolve conflicts on merge with upstream master
2013-04-15 18:34:40 -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
Stephen Birarda
61cf17da73
update agent-mixer to use new AvatarData class
2013-04-15 18:19:01 -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
ZappoMan
c2c36e6cea
Tweaks to Camera class
...
- added lens attributes
- coding standard cleanup
2013-04-15 17:56:52 -07:00
ZappoMan
3b994cbdcf
Latest work on ViewFrustum
...
- added support for specifying lens attributes (fov, near, far, ratio)
- changed constructor and calculate methods to be separate
- coding standard cleanup
2013-04-15 17:54:44 -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
Stephen Birarda
ed3f308a0e
pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM
2013-04-15 16:08:35 -07:00
Stephen Birarda
af1071b374
comments to AvatarData and avatar-mixer before pack/unpack refactor
2013-04-15 16:07:46 -07:00
Stephen Birarda
a4011934c6
move Orientation class to avatars library, constants to SharedUtil
2013-04-15 15:39:23 -07:00
Jeffrey Ventrella
99c2480642
small tweaks to get ready for bigger tweaks in avatar bone logic
2013-04-15 15:29:49 -07:00
Stephen Birarda
2dfe49a885
moved AvatarAgentData to AvatarData
2013-04-15 15:05:55 -07:00
Jeffrey Ventrella
427253b8b0
cleaned up formatting in Head
2013-04-15 15:05:30 -07:00
Stephen Birarda
4702e6ade0
remove the unecessary trailing slash when setting root dir
2013-04-15 14:59:48 -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
Stephen Birarda
d0eed92699
add an avatars library and move AvatarAgentData there
2013-04-15 14:51:34 -07:00
Stephen Birarda
d094c6fc3b
refactor LinkHifiLibrary, add SetupHifiLibrary macro
2013-04-15 14:41:59 -07:00
Jeffrey Ventrella
574ab04e09
Merge remote-tracking branch 'origin/master'
2013-04-15 12:06:48 -07:00
birarda
0d762b57dd
Merge pull request #46 from birarda/master
...
fix incorrect packing of data from avatar mixer
2013-04-15 11:28:04 -07:00
Stephen Birarda
613d5ab5f6
pack agent ID, not socket, from avatar mixer
2013-04-15 11:27:27 -07:00
birarda
07b5e86b8a
Merge pull request #45 from birarda/agent-id
...
fix packing and unpacking of agent IDs
2013-04-15 11:17:27 -07:00
Stephen Birarda
24689e97ab
fix packing and unpacking of agent IDs
2013-04-15 11:12:31 -07:00
Philip Rosedale
b929f14648
Merge pull request #44 from ZappoMan/view_frustum_work
...
fixed lighting when in frustum render mode
2013-04-13 16:18:47 -07:00
ZappoMan
bd837862de
fixed lighting when in frustum render mode
2013-04-13 16:16:10 -07:00
Philip Rosedale
531e294052
Merge pull request #43 from ZappoMan/view_frustum_work
...
improved the menu states names for frustum rendering modes
2013-04-13 16:03:25 -07:00
ZappoMan
e6a1fb416d
improved the menu states names for frustum rendering modes
2013-04-13 15:58:10 -07:00
Philip Rosedale
40752104c2
Merge pull request #42 from ZappoMan/view_frustum_work
...
Interface menu items and new drawing modes for client side view frustum
2013-04-13 15:58:09 -07:00
