Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 23:28:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28905 commits 25 branches 0 tags 1.1 GiB
Commit graph

117 commits

Author SHA1 Message Date
Seth Alves
8ac06c4059 remove friend class from Avatar 2015-07-27 08:48:16 -07:00
Seth Alves
ee334ff826 JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates. 2015-07-22 18:43:10 -07:00
Seth Alves
7c8d52cbd1 back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer 2015-07-22 13:41:31 -07:00
Stephen Birarda
ce6585ccc8 fix AC monitor and AM double register 2015-07-16 17:44:43 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Niraj Venkat
1f1a5f8e75 Coding standard and fixing pointers 2015-07-13 22:57:11 -07:00
Niraj Venkat
10e0a93ac0 Fix for avatar rendering not working on domain exit/entry 2015-07-13 15:22:00 -07:00
Niraj Venkat
dacc6f66c0 Avatars rendered correctly based on Scene.shouldRenderAvatars 2015-07-10 17:26:56 -07:00
Howard Stearns
1c2972bd7c Expose avatar collisions to scripts, and include velocityChange in exposed collision data. 2015-07-07 11:49:55 -07:00
Howard Stearns
1f3a1f6ac8 Add comments re upcoming physics changes. 2015-07-02 10:07:14 -05:00
Howard Stearns
dc7360cdc2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds 2015-06-27 08:37:30 -07:00
Howard Stearns
98f165f2ae Avatar collision sounds. 
collisionsSoundURL can be set in preferences:
  Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav.
  Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
 2015-06-26 16:23:16 -07:00
Stephen Birarda
c6df573933 fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
Andrew Meadows
ce9dfc098b unhook motionstate before removing avatar 2015-06-22 15:40:26 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Atlante45
8570fe0c19 Shared ptr tweaks 2015-06-10 15:02:26 +02:00
Atlante45
3af8bec3d7 Fix ghost avatars/displaynames 2015-06-10 14:59:27 +02:00
ZappoMan
adcb62eb18 more hacking and cleanup 2015-06-02 21:03:34 -07:00
ZappoMan
4ce27f1483 first cut at rendering avatars as individual model items 2015-06-02 16:54:47 -07:00
ZappoMan
2fba5a0928 more work on simple renderable 2015-05-28 12:19:43 -07:00
Ryan Huffman
f972e84d6c Move avatar renedering to Scene 2015-05-27 12:40:26 -07:00
Ryan Huffman
389d5556f5 Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer 2015-05-27 12:36:55 -07:00
ZappoMan
20ceb72d92 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-26 15:01:26 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Andrew Meadows
01cc629224 fix crashes during init and shutdown 2015-05-22 09:20:08 -07:00
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -07:00
Andrew Meadows
2f4162f447 cleanup of AvatarManger API 2015-05-19 16:53:30 -07:00
Andrew Meadows
f86c419988 stubbery for collidable avatars 2015-05-19 14:15:26 -07:00
Atlante45
809c7919aa Fix ghost avatars 2015-04-13 15:57:36 +02:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Stephen Birarda
b27a86fb25 always render yourself, handle change of render values elsewhere 2015-04-01 17:36:43 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Stephen Birarda
5e864278a3 fix packet processing, PerfWarn label 2015-02-06 12:21:05 -08:00
Atlante45
2d973e5288 Move updateMyAvatar to AvatarManager 2015-01-29 16:55:32 -08:00
Atlante45
6b7a391885 move a couple avatar initialisations outside avatar maanger 2015-01-29 16:00:57 -08:00
ZappoMan
41c135c4e5 move GlowEffect to libraries 2014-12-15 19:19:21 -08:00
ZappoMan
e53833b306 make GlowEffect support DependencyManager 2014-12-15 17:29:48 -08:00
Andrzej Kapolka
ace415b138 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-04 16:46:32 -08:00
ZappoMan
526664ac57 delete old dead code 2014-12-01 22:11:34 -08:00
Andrzej Kapolka
8d3eef708a Move various avatar render bits to post-lighting section. 2014-09-19 13:13:05 -07:00
Andrzej Kapolka
c6aad42f21 Move LocalLight to AvatarManager, apply it at the avatar level. 2014-09-18 17:09:53 -07:00
Andrew Meadows
1a8a2d9156 Add Avatar submenu to main menu for non-debug stuff 2014-08-19 17:26:01 -07:00
Atlante45
de8c7fb204 Fix avatar not fading out 2014-08-06 12:14:36 -07:00
Andrzej Kapolka
be028c2b01 Fixes for local lights. 2014-07-22 14:13:51 -07:00
TonyPeng
7aae85833b Take out getter for avatar's hash key. 2014-07-16 10:08:49 -07:00
TonyPeng
90d56bc108 Use the number of local lights to update new avatars instead of checking hashes. 2014-07-15 16:10:13 -07:00
TonyPeng
28854363d4 Coding standard 2014-07-15 09:20:33 -07:00
TonyPeng
1aa20dff60 Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager. 2014-07-14 13:59:57 -07:00
Andrew Meadows
fdd9acb477 bug fix: bad logic for early exit 2014-07-10 10:55:41 -07:00
Andrew Meadows
d26585728b Improved stat accumulation and context names 2014-07-09 11:53:53 -07:00