ZappoMan
|
0fff73e225
|
fixed plainting with new head implementation
|
2013-04-11 01:36:52 -07:00 |
|
ZappoMan
|
24862ca535
|
fixing up render view frustum, now it's working
|
2013-04-11 01:02:04 -07:00 |
|
Jeffrey Ventrella
|
cd8c760959
|
cleaned up some code
|
2013-04-11 00:10:52 -07:00 |
|
Jeffrey Ventrella
|
dbbe7500ac
|
removed negative z hack in avatar. Avatar getting less hacky
|
2013-04-10 21:52:18 -07:00 |
|
ZappoMan
|
712b14c364
|
hacking on frustum for camera
|
2013-04-10 21:27:29 -07:00 |
|
ZappoMan
|
0f17c148f4
|
adding camera vs head for frustum view, not working yet
|
2013-04-10 21:21:13 -07:00 |
|
Jeffrey Ventrella
|
0564aa1a1b
|
Hi!
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 21:12:20 -07:00 |
|
Jeffrey Ventrella
|
f294cc8782
|
working on avatar orientation issues
|
2013-04-10 21:12:15 -07:00 |
|
Philip Rosedale
|
34e5b670a2
|
Tweaked location and color of agents display for menu, removed audio start playback log
|
2013-04-10 18:01:18 -07:00 |
|
Philip Rosedale
|
859903274d
|
Tweaks to menu to have right position under Mac, always on, slightly smaller font
|
2013-04-10 17:48:09 -07:00 |
|
Philip Rosedale
|
8d5ee616ac
|
Added a debug menu option
|
2013-04-10 16:58:53 -07:00 |
|
Stephen Birarda
|
6270659cdc
|
inline declaration and initialization for menu
|
2013-04-10 16:56:15 -07:00 |
|
Stephen Birarda
|
b152d43f77
|
refactor menu callbacks and row/column adding
|
2013-04-10 16:07:46 -07:00 |
|
birarda
|
88c2e9510d
|
Merge pull request #22 from dominiquevincent/19171
Code Review for Job #19171
|
2013-04-10 15:49:23 -07:00 |
|
Jeffrey Ventrella
|
a2a7640bd2
|
merge
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 15:27:10 -07:00 |
|
Jeffrey Ventrella
|
3871c220b2
|
improved hand movement - now transformed to av rotation
|
2013-04-10 15:27:04 -07:00 |
|
vincent
|
cd1aa99dfa
|
#19171 merge with master
|
2013-04-11 00:20:05 +02:00 |
|
vincent
|
4dbff46234
|
#19171 Code Review changes
|
2013-04-11 00:13:40 +02:00 |
|
ZappoMan
|
5d1f11e413
|
fixed bug in frustrum direction, added viewing offset mode
|
2013-04-10 15:02:31 -07:00 |
|
Jeffrey Ventrella
|
a523a24c23
|
fixed hand motion stuff
|
2013-04-10 15:00:28 -07:00 |
|
Jeffrey Ventrella
|
797cec4513
|
hello!
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 14:29:14 -07:00 |
|
Jeffrey Ventrella
|
7b4d0b5598
|
removed bone spam
|
2013-04-10 14:29:08 -07:00 |
|
vincent
|
eb646ade84
|
#19171 split of menu.cpp in menuColumn.cpp and menuRow.cpp
|
2013-04-10 22:39:01 +02:00 |
|
ZappoMan
|
4b7b5437ac
|
some cleanup of view frustum debugging code
|
2013-04-10 13:26:21 -07:00 |
|
ZappoMan
|
7cd70b1f47
|
use Jeffery's code for view frustum debugging
|
2013-04-10 13:12:47 -07:00 |
|
Jeffrey Ventrella
|
228f76c789
|
Thingy!
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 12:54:57 -07:00 |
|
Jeffrey Ventrella
|
be5044c560
|
flipped y direction of up-down avatar navigation
|
2013-04-10 12:54:52 -07:00 |
|
Philip Rosedale
|
d57a4428d9
|
deleted unused stuff that caused conflict with myAvatar change
|
2013-04-10 12:47:40 -07:00 |
|
Philip Rosedale
|
53df8a718a
|
Merge remote-tracking branch 'origin/master'
|
2013-04-10 12:45:35 -07:00 |
|
Philip Rosedale
|
8010129774
|
Few more bits of cleanup and variable renaming, turned voxel rendering back on by default
|
2013-04-10 12:43:26 -07:00 |
|
Jeffrey Ventrella
|
87c351ce4f
|
changed 'myHead' to 'myAvatar' in main.cpp, and a few local variables acordingly
|
2013-04-10 12:37:34 -07:00 |
|
vincent
|
6a5c51bc69
|
#19171 Add a simple openGL menu that will work x-platform
|
2013-04-10 21:31:29 +02:00 |
|
Jeffrey Ventrella
|
eee57a9c0c
|
fixed merge conflict
|
2013-04-10 12:21:40 -07:00 |
|
ZappoMan
|
76937720bd
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 12:13:12 -07:00 |
|
Jeffrey Ventrella
|
089271f615
|
whatever you say, git.
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 12:13:03 -07:00 |
|
Jeffrey Ventrella
|
ab8140e0ef
|
fixed a bug in avatar head lookat direction
|
2013-04-10 12:12:57 -07:00 |
|
ZappoMan
|
28a41132a4
|
latest work on render_view_frustum
|
2013-04-10 12:12:52 -07:00 |
|
birarda
|
84456ac9af
|
Merge pull request #20 from dominiquevincent/19197
Code Review for Job #19197
|
2013-04-10 11:49:59 -07:00 |
|
vincent
|
1e2e505301
|
Another merge and fix ...
|
2013-04-10 20:41:46 +02:00 |
|
ZappoMan
|
597f35db3d
|
moved vector math helpers to Utils.cpp/h
|
2013-04-10 09:39:43 -07:00 |
|
ZappoMan
|
fc122f23d2
|
added first cut at view frustum debuging code
|
2013-04-10 01:32:01 -07:00 |
|
ZappoMan
|
e19b53a344
|
added key interface to toggle voxels
|
2013-04-10 00:46:04 -07:00 |
|
Philip Rosedale
|
e910bece1d
|
temp commented groundPlaneGrid till file is fixed
|
2013-04-10 00:30:24 -07:00 |
|
Philip Rosedale
|
7edd93fd2c
|
Merge remote-tracking branch 'origin'
|
2013-04-10 00:25:20 -07:00 |
|
Philip Rosedale
|
ef785ba7aa
|
Improved comments at start of main.cpp, dropped unused octal.h,.cpp files, deleted many unused system variables and functions.
|
2013-04-10 00:25:03 -07:00 |
|
Jeffrey Ventrella
|
1b833fb4a9
|
added grid plane to aid in testing avatar navigation
|
2013-04-09 21:14:24 -07:00 |
|
Philip Rosedale
|
5a98ebfff2
|
Merge remote-tracking branch 'origin'
|
2013-04-09 17:13:01 -07:00 |
|
Philip Rosedale
|
760aafef8e
|
Changed to render a small box of a fixed pixel width at screen center, useful for testing LOD Changes.
|
2013-04-09 17:12:43 -07:00 |
|
Jeffrey Ventrella
|
3dae70e665
|
removed glm::dvec3 and replaced with glm::vec3 in most of avatar code, except for velocity
|
2013-04-09 15:23:59 -07:00 |
|
Jeffrey Ventrella
|
09af8d153f
|
added camera modes and also set initial avatar yaw to 90
|
2013-04-09 15:05:37 -07:00 |
|