Commit graph

2751 commits

Author SHA1 Message Date
Jeffrey Ventrella
f5dc5b0a39 thingy 2013-05-17 14:57:15 -07:00
Jeffrey Ventrella
f099702d2a Merge remote-tracking branch 'upstream/master' 2013-05-17 14:56:51 -07:00
Jeffrey Ventrella
f2af37801e tidied up the head class and fixed a negated pitch value in orientation 2013-05-17 14:56:14 -07:00
Philip Rosedale
bb86d7a141 Merge pull request #341 from ZappoMan/voxel_animation
fixed memory leak
2013-05-17 14:40:09 -07:00
ZappoMan
0db62b58f5 fixed memory leak 2013-05-17 14:35:50 -07:00
Philip Rosedale
a08745a9e8 Merge pull request #340 from ZappoMan/voxel_animation
New Animation Server
2013-05-17 13:57:11 -07:00
ZappoMan
726a67c6c8 CR feedback 2013-05-17 13:55:26 -07:00
ZappoMan
2edc46ca5f tweaks to animations 2013-05-17 13:21:35 -07:00
ZappoMan
316da59da3 first cut at animation server 2013-05-17 12:44:39 -07:00
ZappoMan
75fea2f1ba Merge pull request #339 from birarda/no-copy
remove ability to copy AgentData and subclasses
2013-05-17 12:41:14 -07:00
Stephen Birarda
fc0448a148 disallow copying of VoxelSystem objects 2013-05-17 12:32:42 -07:00
Stephen Birarda
7e766eb351 fix eve's use of the now disallowed copy constructor 2013-05-17 12:31:16 -07:00
Stephen Birarda
c26a05ff97 disallow copying of VoxelAgentData objects 2013-05-17 12:31:00 -07:00
Stephen Birarda
fcfe5c9e25 disallow copying for AudioRingBuffer objects 2013-05-17 12:27:05 -07:00
Stephen Birarda
3e65d5a548 inline getters and setters in Avatar 2013-05-17 12:25:00 -07:00
Stephen Birarda
fb2f36519d inline getters and setters in AvatarData 2013-05-17 12:19:19 -07:00
Stephen Birarda
1ba1b56b2c disallow copying of Avatar objects 2013-05-17 12:15:19 -07:00
Stephen Birarda
199853711f disallow copying of AvatarData objects 2013-05-17 12:15:10 -07:00
Stephen Birarda
12bf23e4c8 disallow Agent copying 2013-05-17 12:14:44 -07:00
ZappoMan
2c17f04d40 Merge pull request #338 from birarda/avatar-refactor
refactor the Head class to not keep its sphere and use default copy constructor
2013-05-17 11:10:04 -07:00
Stephen Birarda
ce7918108c remove a lingering comment 2013-05-17 11:09:23 -07:00
Stephen Birarda
194035e464 repair indentation in Head constructor 2013-05-17 11:08:44 -07:00
Stephen Birarda
a11ddee974 fix the width and height for the new iris texture 2013-05-17 10:55:11 -07:00
Stephen Birarda
b2518e0595 change the iris texture 2013-05-17 10:51:29 -07:00
Stephen Birarda
c214e9b179 use the default Avatar destructor, comment out unused consts in Head 2013-05-17 10:46:59 -07:00
Stephen Birarda
a1ea7b58dd remove unused GLUQuadric sphere from Avatar class 2013-05-17 10:45:26 -07:00
Stephen Birarda
0e7c0776f2 refactor the Head class to remove _sphere and use default copy constructor 2013-05-17 10:43:26 -07:00
birarda
4b590eda78 Merge pull request #330 from Ventrella/master
fixed camera tightness in mirror mode; fixed a bunch of header (c) notifications; added avatar lookat code (not finished yet)t
2013-05-17 10:14:19 -07:00
Jeffrey Ventrella
ade5b7bec3 formatting changes 2013-05-17 09:52:19 -07:00
Jeffrey Ventrella
0edf72a2be trying to fix merge conflicts 2013-05-17 09:20:42 -07:00
Jeffrey Ventrella
7e0877e753 cleanup 2013-05-17 08:48:54 -07:00
ZappoMan
501a68a2de Merge pull request #336 from PhilipRosedale/master
View shifts back to straight ahead on movement
2013-05-16 21:25:04 -07:00
Philip Rosedale
e55efb81a8 Added acceleration decay of pitch (you look up/straight if you start moving) 2013-05-16 19:12:48 -06:00
Philip Rosedale
2be597beb0 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 19:11:15 -06:00
Jeffrey Ventrella
1c126e2525 resolved conflicts 2013-05-16 17:32:54 -07:00
Jeffrey Ventrella
750a48bb73 cleaned up head class - made most members private. Added copy constructor 2013-05-16 17:20:00 -07:00
ZappoMan
068e863fb4 Merge pull request #334 from PhilipRosedale/master
Mouse moves pitch, yaw when near screen edge, gravity bouncing fixed!
2013-05-16 16:24:42 -07:00
Philip Rosedale
aad5f3bfff Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 17:21:24 -06:00
Philip Rosedale
d8578ebb42 Merge pull request #335 from ey6es/master
Added gray background for chat entry, shadow/outline effects for text rendering.  Enabled shadows for text contrast.
2013-05-16 16:21:10 -07:00
Andrzej Kapolka
26badc56e0 Added shadow and outline effects to TextRenderer, use the shadow effect in
our text to separate it from the background.
2013-05-16 16:10:38 -07:00
Philip Rosedale
9011484590 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 17:06:40 -06:00
Philip Rosedale
9f57787ece Fixed jerking on gravity, added mouse pitch, yaw behavior. 2013-05-16 17:05:45 -06:00
Andrzej Kapolka
191c533ad2 Provide a gray background for the chat entry, so that we can see what we're
typing.
2013-05-16 14:24:18 -07:00
ZappoMan
d58a811844 Merge pull request #332 from birarda/audio-injection-manager
add an AudioInjectionManager to handle memory management for multiple injectors
2013-05-16 14:12:24 -07:00
Stephen Birarda
442d658835 switch from 255 to 0xFF for max volume constant 2013-05-16 14:10:48 -07:00
Stephen Birarda
a37b451993 add constants for volume byte values 2013-05-16 14:09:50 -07:00
Philip Rosedale
7866c803fb Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 14:44:15 -06:00
Philip Rosedale
b2709652b4 Tweaks to improve mouse Yaw behavior. 2013-05-16 14:43:46 -06:00
Philip Rosedale
f06e071d6b Merge pull request #333 from ey6es/master
Experimenting with a simple 3D Perlin noise texture on the voxels.
2013-05-16 13:43:16 -07:00
Stephen Birarda
f6cc40362c hook the injector up to the change AudioInjector setup 2013-05-16 13:10:48 -07:00