Philip Rosedale
|
61b1a2f995
|
First person to third person transition driven by velocity, changes to make moving and flying physics more fun.
|
2013-06-13 11:31:41 -07:00 |
|
Philip Rosedale
|
c0ba2aeebe
|
Added jumping, tuned friction model, tuned thrust
|
2013-06-12 23:45:59 -07:00 |
|
Philip Rosedale
|
6cffb16279
|
merge fixes
|
2013-06-12 13:29:17 -07:00 |
|
Andrzej Kapolka
|
52c616b688
|
Added configurable lean scale, fixed loadSetting.
|
2013-06-12 13:06:28 -07:00 |
|
Philip Rosedale
|
6164e6cd7e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-12 11:37:24 -07:00 |
|
Philip Rosedale
|
3546bcc101
|
Avatar can set velocity, velocity set to zero on reset
|
2013-06-12 11:36:28 -07:00 |
|
Andrzej Kapolka
|
59c8d9d26a
|
Function cleanup, fixed misspelling, tweaked transparency distances to
accomodate lean.
|
2013-06-12 10:25:28 -07:00 |
|
Andrzej Kapolka
|
82f03ffd8e
|
Don't render the voxels when we're too close (i.e., in first person mode).
|
2013-06-11 17:53:49 -07:00 |
|
Andrzej Kapolka
|
648aacb53d
|
Let's use a fixed vector for the camera position so that the target doesn't
move with lean.
|
2013-06-11 17:26:41 -07:00 |
|
Philip Rosedale
|
1b20b016dd
|
Fixed acceleration checking bug that was limiting angular rotation, changed mouselook to work correctly/stable.
|
2013-06-05 20:04:30 -07:00 |
|
Philip Rosedale
|
97be04716e
|
Added render menu choice to switch between voxel and ball avatar rendering.
|
2013-06-05 17:24:53 -07:00 |
|
Philip Rosedale
|
b38c68ab20
|
remove unused setHeadFromGyros() routine - confusing.
|
2013-06-05 10:46:55 -07:00 |
|
ZappoMan
|
b75bd80de7
|
fix build busters
|
2013-06-04 17:54:48 -07:00 |
|
ZappoMan
|
f66641f1b4
|
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
|
2013-06-04 17:41:41 -07:00 |
|
ZappoMan
|
26542d44c9
|
Merge pull request #478 from Atlante45/master
Settings handling with QSettings
|
2013-06-04 17:41:02 -07:00 |
|
ZappoMan
|
4f2af717f2
|
Fixed merge issue with new orientation vectors, migrated to common identity names
|
2013-06-04 17:27:40 -07:00 |
|
Andrzej Kapolka
|
ad377e6256
|
We can't initialize avatars from the network thread; they need access to the
OpenGL context.
|
2013-06-04 17:25:04 -07:00 |
|
atlante45
|
d539ea283e
|
Merge 19358 with upstream Master
|
2013-06-05 01:43:47 +02:00 |
|
Andrzej Kapolka
|
d09700adde
|
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
interface/src/Skeleton.h
interface/src/VoxelSystem.h
|
2013-06-04 11:00:59 -07:00 |
|
Andrzej Kapolka
|
bc8eadd526
|
More work on voxeltars; separated default pose from bind pose.
|
2013-06-04 10:22:58 -07:00 |
|
atlante45
|
c199190666
|
Fixes asked by ZappoMan on QSettings' commit.
|
2013-06-04 19:00:38 +02:00 |
|
Jeffrey Ventrella
|
26bbb9917b
|
more work on avatar touch
|
2013-06-03 16:23:55 -07:00 |
|
Jeffrey Ventrella
|
00dce6b59e
|
fix
|
2013-06-03 12:01:01 -07:00 |
|
Jeffrey Ventrella
|
8d031b5c2d
|
preparation for extending the avatar ball array to accommodate more touch capabilities
|
2013-06-03 11:53:00 -07:00 |
|
Andrzej Kapolka
|
8d757e148f
|
More work on voxeltars; basic skinning works.
|
2013-06-02 19:55:51 -07:00 |
|
atlante45
|
dccc44a6f5
|
Added settings management using QSettings
|
2013-06-02 14:58:51 +02:00 |
|
Andrzej Kapolka
|
35ae08def0
|
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
|
2013-06-01 15:07:00 -07:00 |
|
Andrzej Kapolka
|
7425b39237
|
Working on avatar voxel system.
|
2013-05-31 17:55:30 -07:00 |
|
Jeffrey Ventrella
|
de49d7fc6c
|
more fixes
|
2013-05-31 17:32:30 -07:00 |
|
Jeffrey Ventrella
|
d92471860d
|
cleanup
|
2013-05-31 16:58:58 -07:00 |
|
Jeffrey Ventrella
|
4f49f1769e
|
separated springy balls from skeleton
|
2013-05-31 16:54:56 -07:00 |
|
Andrzej Kapolka
|
e4bc7af6b4
|
Working on avatar voxels.
|
2013-05-31 14:52:29 -07:00 |
|
Jeffrey Ventrella
|
fdfc639c23
|
merge
|
2013-05-31 13:52:22 -07:00 |
|
Jeffrey Ventrella
|
108ce62d1a
|
committing latest skeleton-separation changes (more to come as Andrzej and I work on it more)
|
2013-05-31 11:51:03 -07:00 |
|
Andrzej Kapolka
|
e2ec8245b0
|
Rather than adding Euler angles, compose quaternions for gyros.
|
2013-05-30 14:56:12 -07:00 |
|
Andrzej Kapolka
|
bcd3833898
|
Align chat with full camera rotation (not just yaw).
|
2013-05-30 13:46:53 -07:00 |
|
Andrzej Kapolka
|
fff9d1c372
|
Formatting.
|
2013-05-30 10:23:19 -07:00 |
|
Andrzej Kapolka
|
021dce72be
|
Moved direction vectors to AvatarData, made them align with OpenGL view space
(to avoid the 180 degree rotations).
|
2013-05-30 09:55:34 -07:00 |
|
Andrzej Kapolka
|
d6855b6430
|
Massive changes to orientations: use quaternions rather than Orientation
class.
|
2013-05-29 19:05:33 -07:00 |
|
Jeffrey Ventrella
|
75b57d17a7
|
fixed some things based on recent code review
|
2013-05-27 18:54:44 -07:00 |
|
Jeffrey Ventrella
|
096e465d36
|
cleaned up some formatting and in-line functions in Avatar.cpp
|
2013-05-27 10:31:31 -07:00 |
|
Jeffrey Ventrella
|
6634ad2ed2
|
thingy
|
2013-05-24 16:31:17 -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 |
|
Jeffrey Ventrella
|
b74ceae61a
|
added avatar hair
|
2013-05-23 22:52:43 -07:00 |
|
Stephen Birarda
|
b673715aa2
|
remove the no longer in use AvatarRenderer
|
2013-05-23 15:18:32 -07:00 |
|
Philip Rosedale
|
37cb914891
|
You can reset start location with 'G'
|
2013-05-23 15:02:32 -07:00 |
|
Jeffrey Ventrella
|
77324ebb46
|
made avatars appear to float above the ground
|
2013-05-23 10:14:46 -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
|
4940a6ae9a
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 15:51:03 -07:00 |
|