Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 13:56:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28750 commits 71 branches 56 tags 1.2 GiB
Commit graph

651 commits

Author SHA1 Message Date
ZappoMan
1bfce7d876 more removal of immediate mode 2015-01-06 14:14:13 -08:00
ZappoMan
bd1612f6a4 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-05 16:51:31 -08:00
ZappoMan
8b22b166ac convert lookat vectors and laser pointers to use renderLine() 2015-01-05 16:06:35 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
fbfa40e3c9 remove hair 2014-12-30 13:44:25 -08:00
ZappoMan
a4520f6a07 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 10:27:06 -08:00
dev
c99ad77799 fixing the size of the name displayed on screen 2014-12-29 16:45:14 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
ZappoMan
1db1914a2e replace gluProject() with just the math 2014-12-19 13:46:33 -08:00
Brad Hefta-Gaub
821cbe610c Merge pull request #3975 from ctrlaltdavid/20212 
CR for Job #20212 - Operate laser pointer with hands controlled by Leap Motion
 2014-12-19 09:55:45 -08:00
ZappoMan
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
ZappoMan
fc1e1ecfc0 move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled 2014-12-16 11:27:44 -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
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
ZappoMan
e0a017e963 make GeometryCache work with DependancyManager 2014-12-15 10:49:34 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00
David Rowe
fe8937e37e Make lasers able to emanate from index finger tips 2014-12-11 21:31:08 -08:00
ZappoMan
526664ac57 delete old dead code 2014-12-01 22:11:34 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Brad Hefta-Gaub
7dd88eca08 Merge pull request #3829 from samcake/temp1 
refining the avatar display name rendering with different behavior if in...
 2014-11-19 16:39:04 -08:00
Brad Hefta-Gaub
0b7c3d3356 Merge pull request #3828 from AndrewMeadows/bispinor 
don't slide feet during idle animations
 2014-11-19 16:38:34 -08:00
dev
fc54ad93b8 refining the avatar display name rendering with different behavior if in HMD mode or not 2014-11-19 11:46:59 -08:00
Andrew Meadows
6673d9d0c2 avatar stands on lowest toe 2014-11-19 09:13:24 -08:00
dev
2e19ad48a7 ready for pull request 2014-11-19 00:50:59 -08:00
dev
4028e66c08 trying to fix the lighting issue in stereo and fix the display name size and orientation 2014-11-18 18:59:54 -08:00
David Rowe
8e58e6e3b0 Remove unused methods 2014-10-31 12:48:30 -07:00
Andrew Meadows
e631ab8d38 use Qt::AutoConnection for Avatar::setFoo() methods 
This prevents a JS script from blocking when setting C++ values.
 2014-10-29 13:01:47 -07:00
Andrew Meadows
f25cfc0c7f remove debug code 2014-10-27 10:22:40 -07:00
Andrew Meadows
c1728c0296 Merge upstream/master into andrew/experimental 2014-10-27 10:08:48 -07:00
Philip Rosedale
d5d0fbd9d8 Hair gravity always the same 2014-10-24 16:08:01 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
AndrewMeadows
8372975bad Merge pull request #3582 from PhilipRosedale/master 
'Ribbons' that are driven by audio loudness and tuned/draped for mask avatars
 2014-10-15 14:08:20 -07:00
samcake
e7af0cbe7f Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application 2014-10-14 00:08:29 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
Philip Rosedale
9be2b33971 Hair draped for masks and driven by audio loudness 2014-10-10 17:06:11 -07:00
Sam Gateau
ba2d072a65 fix syntax issues for constant names and the CmakeLists.txt useless change 2014-10-06 12:15:36 -07:00
Andrew Meadows
01a3eaa26b added experimental MyAvatar.setSkeletonOffset() 
for improved walk animations
 2014-10-05 19:10:55 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Andrzej Kapolka
9855fbcfb4 Don't bother using a callback to render the eye vectors; just rely on the 
post-lighting call to Avatar::render, like everything else.  This should fix
the crash that Philip was seeing (presumably due to avatars' being deleted
during the draw process).
 2014-09-29 11:45:12 -07:00
Andrzej Kapolka
efa22d931f If we're rendering the billboard, don't render the body. 2014-09-26 13:48:11 -07:00
Andrzej Kapolka
18cb15ee7d Warning fixes. 2014-09-22 15:31:46 -07:00
Andrzej Kapolka
aeb424cd71 Fix for billboards. 2014-09-22 15:01:39 -07:00
AndrewMeadows
3d89aa9c9c Merge pull request #3463 from ey6es/deference 
Break deferred lighting business out into its own class, use deferred lighting for voxels/avatars/entities/particles in addition to metavoxels.  Don't merge until after conference, obviously.
 2014-09-22 10:42:25 -07:00
Atlante45
c570931f35 Fix attachemnt getting into wrong state 
If you play a recording containing attachement with different
attachemnts already on, those attachement will sometime get into a wrong
state.
 2014-09-19 15:43:22 -07:00
Andrzej Kapolka
8d3eef708a Move various avatar render bits to post-lighting section. 2014-09-19 13:13:05 -07:00
Andrzej Kapolka
08fda3bbef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-19 10:30:40 -07:00
Andrzej Kapolka
e356b06c75 Fix for lights in rear view mirror/head mode. 2014-09-18 17:39:40 -07:00
Andrzej Kapolka
c6aad42f21 Move LocalLight to AvatarManager, apply it at the avatar level. 2014-09-18 17:09:53 -07:00
Andrzej Kapolka
c54e1c937c Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/src/avatar/Head.cpp
 2014-09-18 13:08:55 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00
Philip Rosedale
8c71ed3f10 Improving headMove, added JS call for neckPosition 2014-09-18 10:48:36 -07:00
stojce
a6a48aafdc Hide name for all avatars, including MyAvatar 2014-09-18 07:34:14 +02:00
stojce
9a523a60cf Add option to toggle on/off names above heads 2014-09-18 06:59:29 +02:00
Andrzej Kapolka
ce9ecba5d8 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/resources/shaders/model.frag
	interface/resources/shaders/model_cascaded_shadow_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_specular_map.frag
	interface/resources/shaders/model_cascaded_shadow_specular_map.frag
	interface/resources/shaders/model_normal_map.frag
	interface/resources/shaders/model_normal_specular_map.frag
	interface/resources/shaders/model_shadow_map.frag
	interface/resources/shaders/model_shadow_normal_map.frag
	interface/resources/shaders/model_shadow_normal_specular_map.frag
	interface/resources/shaders/model_shadow_specular_map.frag
	interface/resources/shaders/model_specular_map.frag
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-09-17 13:50:13 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021 
Code Review for Job #20021
 2014-09-17 09:19:29 -07:00
Andrzej Kapolka
07efda89ef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-16 13:20:43 -07:00
David Rowe
a594136a9a Fix up hand roll, pitch, and yaw as best able for now 2014-09-15 20:12:13 -07:00
David Rowe
3ddd5854cd Position avatar hands with Leap Motion with no roll, pitch or yaw 2014-09-14 15:03:22 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-09-12 17:50:26 -07:00
Andrzej Kapolka
53933fc9c6 Working on deferred lighting for models. 2014-09-12 17:09:07 -07:00
Andrew Meadows
93864ee869 fix velocity drift of MyAvatar 2014-09-11 15:03:11 -07:00
Andrzej Kapolka
de8dd4cecc Share instances of TextRenderer. 2014-09-10 18:55:36 -07:00
Andrew Meadows
4da1ca22ba Add RayIntersectionInfo and use for shape-vs-ray 2014-09-09 17:35:06 -07:00
Andrzej Kapolka
f69324f270 Fix for display name. 2014-09-08 15:29:36 -07:00
Andrzej Kapolka
f2535d4df8 Adjust avatar names for device pixel ratio. 2014-09-08 15:23:08 -07:00
Andrew Meadows
15025bf8d8 fix for flickering avatars 2014-09-08 13:08:08 -07:00
Andrew Meadows
bd8fc75305 fix bug: zero velocity when teleporting to new locations 2014-09-05 17:51:18 -07:00
Andrew Meadows
9c2bfa35f7 restore position integration in Avatar::simulate() 2014-09-05 14:10:10 -07:00
Andrew Meadows
7be411b4ca expose _measured_ MyAvatar velocity to JS 2014-09-05 11:44:13 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Andrew Meadows
328167464f Merge branch '19908' of github.com:huffman/hifi into huffman-19908 
Conflicts:
	interface/src/Menu.cpp
 2014-08-21 09:21:24 -07:00
Ryan Huffman
3d940469de Increase display name drawing distance 2014-08-19 19:41:31 -07:00
Ryan Huffman
42de56381a Update blue audio sphere name and angle to draw at 2014-08-19 19:40:27 -07:00
Ryan Huffman
3b7260c434 Fix blue audio sphere not showing correctly 2014-08-19 19:22:11 -07:00
Ryan Huffman
8bc5f86666 Add Audio Sphere menu option 2014-08-19 19:21: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
c113dd350e Moved members to MyAvatar 2014-08-18 16:25:38 -07:00
Atlante45
acb55ce65e Switched audio play back to AudioInjector out of Audio 2014-08-18 12:31:44 -07:00
Atlante45
73a3a13c59 More recording work 2014-08-12 18:15:48 -07:00
Atlante45
792f779bbf Hooked up MyAvatar to playbacks 2014-08-12 16:16:01 -07:00
ZappoMan
b7767b7971 get referentials compiling with new Entity ID changes 2014-08-08 15:12:57 -07:00
Atlante45
110b034bcb Changed updates locations 2014-08-05 18:41:48 -07:00
Atlante45
293c2e94ad Correct member initialisation 2014-08-05 18:17:49 -07:00
Atlante45
b360b6c55d PR cleanup + JS API 2014-08-05 17:07:03 -07:00
Atlante45
39a74cbc28 Few modifications to how avatars update their positions 2014-08-05 12:03:53 -07:00
Atlante45
d9dde06c14 Various tweaks to referentials 2014-08-04 14:59:15 -07:00
Philip Rosedale
e272d0be75 Merge pull request #3203 from Atlante45/laser_pointer_js 
Laser pointer js
 2014-07-24 17:28:08 -07:00
Atlante45
9ca00b55a5 Spelling 2014-07-24 17:19:49 -07:00
Philip Rosedale
176473b5ba Merge branch 'master' of https://github.com/worklist/hifi 2014-07-22 19:29:42 -04:00
Andrzej Kapolka
d4904f976a Missed the local light stats. 2014-07-22 15:50:08 -07:00
Andrzej Kapolka
be028c2b01 Fixes for local lights. 2014-07-22 14:13:51 -07:00
Atlante45
35caef1882 Added pointing behaviour 2014-07-18 15:39:12 -07:00
Philip Rosedale
6bd3e99569 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-16 17:26:56 -07:00
TonyPeng
317a08fc60 Draw local light stats. 2014-07-16 09:44:05 -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
Philip Rosedale
8fb5ca44d4 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-15 14:47:28 -07:00
TonyPeng
4cea4d2838 Resolve upstrem conflict 2014-07-15 10:33:22 -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
Philip Rosedale
db73d8d2f4 add body angular acceleration 2014-07-14 12:23:00 -07:00
Philip Rosedale
2d4194cae5 fixes per review, clap animation requires double-tap to start 2014-07-13 23:33:02 -07:00
Philip Rosedale
b0e44be1c0 merge fix 2014-07-11 20:26:58 -05:00
Philip Rosedale
b86890033c Moved hair to separate class 2014-07-11 19:35:17 -05:00
Andrzej Kapolka
222869bf53 Merge pull request #3157 from wdings23/master 
2 local lights as default
 2014-07-11 11:24:48 -07:00
TonyPeng
df7f3073dc 2 local lights as default 2014-07-10 17:18:49 -07:00
barnold1953
18c5ebce9e Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-10 16:42:36 -07:00
barnold1953
8bc9214445 Added helper scaling function to Avatar. 2014-07-10 14:37:04 -07:00
Andrew Meadows
ad6a219a60 fix bug: remove redundant _skeleton.simulate() 2014-07-10 11:08:15 -07:00
Brad Hefta-Gaub
635cb380f2 Merge pull request #3151 from ctrlaltdavid/19860 
Code Review for Job #19860
 2014-07-09 18:35:01 -07:00
Andrzej Kapolka
af6704a83c Merge pull request #3134 from wdings23/light_and_haze 
Added local lights to avatar. Added haze to voxel.
 2014-07-09 16:07:20 -07:00
David Rowe
f2d49fa6a1 Rename focus indicators menu item and default to off 2014-07-09 15:12:29 -07:00
Andrew Meadows
f463099d16 add "simulate" stat name to Avatar::simulate() 2014-07-09 14:31:47 -07:00
TonyPeng
ef4b95c6e0 Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays. 2014-07-09 13:27:42 -07:00
Andrew Meadows
3d6752ad90 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-07-09 12:52:00 -07:00
TonyPeng
56eadcb0dc Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays. 2014-07-09 12:05:34 -07:00
Andrew Meadows
d26585728b Improved stat accumulation and context names 2014-07-09 11:53:53 -07:00
Philip Rosedale
f8185dec75 removed some debug logs 2014-07-08 22:26:11 -07:00
David Rowe
305623d8a7 Add option to hide focus indicators 2014-07-08 21:37:08 -07:00
TonyPeng
94e81da557 Added local lights to avatar. Added haze to voxel. 2014-07-08 09:44:28 -07:00
Philip Rosedale
93602328d9 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-28 11:22:22 -07:00
Aleric Inglewood
1bc2f214a5 Compiler warning fixes. 
This fixes all warnings that I got while compiling with g++ 4.7.2:

 In file included from interface/src/Application.h:53:0,
                  from interface/src/Menu.cpp:36:
 interface/src/Menu.h: In constructor ‘Menu::Menu()’:
 interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder]
 interface/src/Menu.h:289:27: warning:   ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder]
 interface/src/Menu.cpp:82:1: warning:   when initialized here [-Wreorder]

 libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’:
 libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’:
 libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'.
 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'.

 interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’:
 interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default]
 interface/src/avatar/Avatar.cpp:574:18: warning:   matches this ‘link’ under ISO standard rules [enabled by default]
 interface/src/avatar/Avatar.cpp:577:22: warning:   matches this ‘link’ under old rules [enabled by default]

 interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’:
 interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0:
 interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’:
 interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder]
 interface/src/ui/RunningScriptsWidget.h:60:27: warning:   ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder]
 interface/src/ui/RunningScriptsWidget.cpp:27:1: warning:   when initialized here [-Wreorder]
 2014-06-27 22:18:38 +02:00
Philip Rosedale
f072c04b4c hair is a separate class 2014-06-27 09:30:51 -07:00
Philip Rosedale
58d460da09 option to turn on/off string hair 2014-06-25 15:14:17 -07:00
Philip Rosedale
40dee3b39e Added JS calls for left/right estimated palm position on skeleton model, improved toy ball to use them 2014-06-25 05:24:22 -07:00
Philip Rosedale
88c01266ab more hair tweaks, don’t render in 1P, improved toy ball 2014-06-25 03:29:08 -07:00
Philip Rosedale
81e7f8e0a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-24 16:21:35 -07:00
Philip Rosedale
9eb91e2b44 tweaking params 2014-06-24 16:15:16 -07:00
Philip Rosedale
556578b8dc first pass - hair as vertlet strands 2014-06-24 09:30:11 -07:00
Andrew Meadows
8986be5f1c remove old collideAgaintsOurself() code 2014-06-23 10:36:31 -07:00
Andrew Meadows
d4b5550cda Skeleton now creates VerletShape 2014-06-18 17:22:39 -07:00
Andrew Meadows
ecbf5043d7 code out of Model into base and derived classes 
PhysicalEntity (base class) gets some shape management stuff
SkeletonModel (derived class) gets some boundary shape and
joint-shape stuff
 2014-06-17 16:22:18 -07:00
Andrew Meadows
0addf3bae4 cleaup: remove some unused collision code 
remove CollisionInfo::_type
remove unused Avatar collision response stuff
comment out some code that works but will probably be replaced
 2014-06-06 14:36:05 -07:00
Andrew Meadows
ca77eb9d1e cleanup of avatar collisions, prep for more ragdoll collisions 
removal of paddle hands
particles use general sphere collision path against avatars
temp removal of skeleton self collision
 2014-06-06 10:51:22 -07:00
Andrew Meadows
30d936c15b getJointPosition -> getJointPositionInWorldFrame 2014-06-04 10:52:10 -07:00
Atlante45
17e3bd6110 CR comments 2014-05-29 18:24:21 -07:00
Atlante45
b91fd19f39 snapped attachment to center and scale them to fit 2014-05-29 14:30:28 -07:00
Atlante45
b4deed775e Added joints position and combined rotation to scripting interface 2014-05-28 15:59:42 -07:00
Andrzej Kapolka
edaa251e5f Provide option to disable avatar shadowing. 2014-05-27 11:43:34 -07:00
barnold1953
dad2788b8c Moved 'I am looking at' ball to be immediately above name text, and reduced opacity 2014-05-21 17:45:17 -07:00
Andrew Meadows
337bc8b947 reuse boolean results rather than recomputing them 2014-05-16 08:28:36 -07:00
Andrew Meadows
e98f5c7486 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-05-15 12:33:09 -07:00
Andrew Meadows
4640587445 more correct model bounding capsule 2014-05-15 12:28:55 -07:00
Andrew Meadows
366e9c7d34 PalmDataA::getPalmDirection --> getNormal() 2014-05-14 09:05:54 -07:00
Andrew Meadows
46ec3accfd merge upstream/master into andrew/thermonuclear 2014-05-12 11:55:59 -07:00
Andrew Meadows
49dedb72c9 remove FingerData class and related cleanup 2014-05-12 11:09:12 -07:00
Kai Ludwig
3e1d0536c1 Fix for: #19626 - Fix the Windows 7 crash 
The image data for glTexImage2D is size=width x height without any borders. So there must be a border of 0 given when calling glTexImage2D, otherwise there is not enough image data causing crashes when textures get loaded.

The effect occurs reproducible on Win7 with ATI cards. Maybe their OpenGL-Implementation is less robust ...
 2014-05-11 16:18:46 +02:00
Andrzej Kapolka
3329cb7638 Set the LOD distance on attachments (controls the load priority, too). 2014-05-09 15:25:48 -07:00
Andrzej Kapolka
0474375a39 Don't render head attachments in first person mode. 2014-05-09 15:13:58 -07:00
Andrew Meadows
217080fe1d cleanup - remove unused leap fingers 2014-05-09 10:27:01 -07:00
Andrzej Kapolka
c02b708ee5 Provide the option to avoid making duplicate attachments. 2014-05-08 15:54:30 -07:00
Philip Rosedale
538e785208 Merge pull request #2815 from ZappoMan/modelserver 
More Model Improvements & some other tweaks
 2014-05-07 20:59:04 -07:00
Philip Rosedale
c6b4b7c250 Merge pull request #2811 from AndrewMeadows/inertia 
prevent avatar from getting trapped in voxel collisions
 2014-05-07 16:54:28 -07:00
ZappoMan
37ca6efc7c correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
Andrew Meadows
9fc1c765d3 overhaul of CollisionInfo 
store Cube info for sphereAACube collisions
 2014-05-07 11:40:00 -07:00
Andrzej Kapolka
983a3af4b9 Attachment translations in world space. 2014-05-06 11:50:37 -07:00
Philip Rosedale
e3ab16997a tweaks to roll (back to no magnify) and lookAt indicator dot 2014-05-05 22:06:28 -07:00
Philip Rosedale
e0c898bba0 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-05 18:03:33 -07:00
Philip Rosedale
53baf5652e avatar look at indicator smaller grey ball 2014-05-05 18:03:25 -07:00
Andrzej Kapolka
fd0a39df12 Always update attachments. 2014-05-05 16:19:33 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07:00
Andrzej Kapolka
f37460e39a Basic attachment rendering. 2014-05-05 15:46:09 -07:00
Andrzej Kapolka
71231268a5 Better head heights for headless skeletons. 2014-05-02 14:28:12 -07:00
Atlante45
7787cf97b6 Only glow body + fixed display name scale 2014-04-29 16:30:14 -07:00
Andrew Meadows
f07a418a27 namechange CollisionFlags --> CollisionGroups 2014-04-24 11:07:49 -07:00
Andrew Meadows
37a5d9130f move _thrust from Avatar to MyAvatar 2014-04-23 11:55:28 -07:00
Andrew Meadows
359c14e319 cleanup: remove unused Avatar::_mode 
The mode, if it is required, should probably eventually live in
AvatarDAta since it will be determined by whatever engine is running the
avatar (script or interface) and then broadcast to the rest of the
world.  When we need it we'll add it back in the right place.
 2014-04-23 11:48:42 -07:00
Atlante45
05545b684d Made glowing when speaking an option 2014-04-18 17:47:21 -07:00
Stephen Birarda
69d3360675 add a convenience method to AvatarHashMap to check for avatar removal 2014-04-17 16:48:24 -07:00
Stephen Birarda
e303ce1a12 move some Avatar management to AvatarHashMap 2014-04-17 16:37:40 -07:00
Andrew Meadows
0ad841edfb don't render avatar boundary shapes in first person 2014-04-11 17:44:51 -07:00
Andrzej Kapolka
475528f112 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 15:00:32 -07:00
Atlante45
9c662acc9d Modified max glow + don't glow you own avatar 2014-04-10 14:40:35 -07:00
Atlante45
2cc2149647 Glow when you talk, flash when you clip 
closes #2592
 2014-04-10 11:55:30 -07:00
Andrzej Kapolka
f61c746b4a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 09:45:23 -07:00
Andrew Meadows
4942e93daa replace .f with .0f as per coding standard 2014-04-10 07:53:11 -07:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Andrzej Kapolka
d4706bba8a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 10:21:13 -07:00
Brad Hefta-Gaub
2988239aed Merge pull request #2615 from ey6es/master 
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
 2014-04-08 07:20:00 -10:00
Andrzej Kapolka
a157c67901 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 09:56:07 -07:00
Andrzej Kapolka
fa05a48270 Provide a means of supplying the joint mappings in the FST file so that agent 
scripts can address joints by name.  Closes #2526.
 2014-04-07 17:55:36 -07:00
Andrew Meadows
bf0eb69e2c fix for sometimes slow avatar 2014-04-07 16:28:55 -07:00
Andrzej Kapolka
a2b94aa433 Working on render modes. 2014-04-04 14:22:01 -07:00
Andrew Meadows
933cade6b0 Re-add fullUpdate hint to Model::simulate() 2014-04-02 16:34:33 -07:00
Andrew Meadows
97ba5250a5 Only simulate() Avatar Models when necessary 
Also: rebuild collision shapes when Model scale changes
 2014-04-02 12:01:18 -07:00
Andrew Meadows
b65855a384 merge upstream/master into avatar-interaction 2014-04-01 12:53:47 -07:00
Andrew Meadows
9f9127b716 draw head bounding shape first 2014-04-01 11:39:24 -07:00
Andrew Meadows
1bbdc9d78b Adding bounding capsule shape for Model 
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
 2014-04-01 09:25:25 -07:00
Stephen Birarda
3c8aa90ae0 Merge pull request #2559 from AndrewMeadows/avatar-interaction-2 
split lean input from lean perturbations
 2014-03-28 09:25:36 -07:00
Andrzej Kapolka
361276d133 Use a spherical estimate of the shadowed region to avoid growing and shrinking 
it as we turn around.  Also, might as well render shadows for the billboards.
 2014-03-27 16:19:21 -07:00
Andrzej Kapolka
aee15e0496 Don't render display name/chat message for own avatar in first person mode. 2014-03-27 15:38:21 -07:00
Andrew Meadows
796d20168e splitting lean input from lean perturbations 2014-03-27 15:30:30 -07:00
Andrzej Kapolka
ca9f0c01c1 Couple of quick fixes: reset the skeleton joints when space is pressed as a 
last resort to fix broken IK, don't render display names at the origin if
we don't have a skeleton model.
 2014-03-27 11:08:55 -07:00
Andrew Meadows
9a4db152ff avatar responds to hand-vs-head collisions again 2014-03-26 13:20:18 -07:00