Jeffrey Ventrella
c88a7f8f55
fixed merge
2013-05-01 13:51:59 -07:00
Jeffrey Ventrella
b388e9a760
(1) re-designed and debugged the orientation class and cleaned up quaternion code, and fixed issues in camera and main related to yaw and camera transforms (2) improved hand-holding algorithm
2013-05-01 13:00:08 -07:00
Andrzej Kapolka
a412f7b1cb
Derp, forgot to move this in my codebase.
2013-05-01 12:41:53 -07:00
Andrzej Kapolka
11a750f6a0
Changes according to Philip's feedback: spacing around operators, removed
...
unused variables, moved font family names to #defines.
2013-05-01 12:17:57 -07:00
Andrzej Kapolka
15e46bac82
Disable kerning, expand bounds to account for antialiasing.
2013-05-01 11:59:21 -07:00
Andrzej Kapolka
668e25f9cd
Fixed merge issue.
2013-05-01 11:51:19 -07:00
Andrzej Kapolka
5d457afaf9
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Avatar.h
2013-05-01 11:46:23 -07:00
Stephen Birarda
0f3d3fb4c7
move private member constants in Avatar.h to implementation
2013-05-01 11:04:58 -07:00
Andrzej Kapolka
13a4058068
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-30 16:06:44 -07:00
Philip Rosedale
24a636486e
Added Google glass support, cleaned up gyro code, ready for Oculus!
2013-04-30 16:04:55 -07:00
Philip Rosedale
55330cf14f
Merge repairs.
2013-04-30 13:49:42 -07:00
Philip Rosedale
6142372219
Merge remote-tracking branch 'origin/master'
2013-04-30 13:44:49 -07:00
Philip Rosedale
8e06602e9a
Added Avatar method to allow received UDP transmitter data to drive the avatar head rotation, cleaned up gyro code.
2013-04-30 13:40:16 -07:00
Andrzej Kapolka
675c0cb74e
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-04-30 12:37:24 -07:00
birarda
8153b2af95
Merge pull request #161 from ZappoMan/view_frustum_work
...
First cut at new Voxel Sending strategy
2013-04-30 11:48:55 -07:00
Andrzej Kapolka
39a70ce9e7
Rather than Xs, use a "solid block" pseudo-character to draw a bar. Tweaked
...
the colors to indicate the pressed key again.
2013-04-30 11:06:23 -07:00
Andrzej Kapolka
ccdc1146a2
Removed cut and paste error from CMake file, made a couple variables in
...
TextRenderer more descriptive.
2013-04-30 10:26:47 -07:00
Andrzej Kapolka
8b742e43e6
GCC fails on these constants (ISO C++ forbids initialization of member
...
‘COLLISION_BALL_FORCE’), so I moved them into the CPP (they don't seem to
require external visibility anyway).
2013-04-30 10:15:48 -07:00
ZappoMan
622a078d24
code review cleanup
2013-04-30 10:10:17 -07:00
Andrzej Kapolka
733ccd4787
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-30 10:04:39 -07:00
Andrzej Kapolka
34f2a28114
Delete our glyph textures on destruction.
2013-04-30 10:04:01 -07:00
Andrzej Kapolka
a24f215f09
Moved menu, chat entry field to ui subdirectory.
2013-04-30 09:59:05 -07:00
Andrzej Kapolka
068d3d216e
Need to commit these, too, for the font rendering change.
2013-04-29 19:12:34 -07:00
Andrzej Kapolka
a8c28a6d2a
First stab at text rendering by rendering glyphs (using Qt's font rendering)
...
into textures, storing the associated metrics, and drawing strings as
sequences of textured quads.
2013-04-29 18:54:12 -07:00
ZappoMan
429ba8c729
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-29 17:48:12 -07:00
ZappoMan
accda966d5
Add LOD culling to the server protocol.
...
- Add LOD/distance culling to VoxelTree:encodeTreeBitstreamRecursion()
and VoxelTree::searchForColoredNodesRecursion()
- added new levels to boundaryDistanceForRenderLevel()
- added more spheres to the scene to get a better sense of LOD behavior
2013-04-29 17:38:52 -07:00
Jeffrey Ventrella
6b66d8e789
Merge remote-tracking branch 'upstream/master'
2013-04-29 14:12:01 -07:00
Jeffrey Ventrella
fe9ab0a213
improved collisions
2013-04-29 14:11:33 -07:00
Andrzej Kapolka
c9c32630e8
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-29 13:22:25 -07:00
Andrzej Kapolka
0fe4d57ad7
I think this is the least intrusive fix for the chat crashes: lock the agent
...
list when we're updating from the network, simulating, or rendering. I think
there are likely to be other synchronization issues, but this is a start.
2013-04-29 13:17:39 -07:00
Jeffrey Ventrella
9924be9188
Merge remote-tracking branch 'upstream/master'
2013-04-29 10:41:58 -07:00
Jeffrey Ventrella
4e4521325d
added 'isCollidable' to avatar bone so that some bones do not collide (for handshaking)
2013-04-29 10:38:29 -07:00
ZappoMan
781721b79c
clean up constants for voxels
2013-04-29 06:49:57 -07:00
ZappoMan
7c180c800f
printf/pringLog cleanup
2013-04-29 06:28:19 -07:00
ZappoMan
ff996c9946
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-29 06:18:25 -07:00
Philip Rosedale
3787c93142
Fixes per review
2013-04-28 14:49:08 -07:00
Jeffrey Ventrella
caac600030
improved hand holding algorithm
2013-04-27 22:00:02 -07:00
Philip Rosedale
b9234b0a02
Merge remote-tracking branch 'upstream/master'
2013-04-27 17:19:55 -07:00
Jeffrey Ventrella
37e304fd14
Merge remote-tracking branch 'upstream/master'
2013-04-27 16:45:58 -07:00
Philip Rosedale
5e737ce5d4
Merge remote-tracking branch 'upstream/master'
2013-04-27 16:39:19 -07:00
Philip Rosedale
f6ef117788
Merge pull request #157 from tschw/19165
...
19165
2013-04-27 16:37:46 -07:00
ZappoMan
e373a8b866
removed accidentally added whitespace
2013-04-27 14:59:58 -07:00
ZappoMan
2d518520f5
removed extra AgentList() constructor which got accidentally included in merge mistake
2013-04-27 14:58:38 -07:00
ZappoMan
94bb6a1b0f
removed some testing/debug code
2013-04-27 14:57:23 -07:00
ZappoMan
999930743e
removed some debug code
2013-04-27 14:55:34 -07:00
ZappoMan
2f2af7ec09
removed some debug code
2013-04-27 14:53:08 -07:00
ZappoMan
e4c39369aa
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-27 14:49:03 -07:00
ZappoMan
70818bd3fe
Added some new debugging code, removed some old debugging code, some small coding standard tweaks
2013-04-27 12:03:20 -07:00
Jeffrey Ventrella
57cbd9c6d9
cleaned up collision code some
2013-04-27 09:47:46 -07:00
Jeffrey Ventrella
5c3bd5fe87
improved collisions between avatars
2013-04-27 09:33:58 -07:00
