Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-20 20:09:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14869 commits 25 branches 0 tags 1.1 GiB
Commit graph

402 commits

Author SHA1 Message Date
Atlante45
9ca00b55a5 Spelling 2014-07-24 17:19:49 -07:00
Atlante45
35caef1882 Added pointing behaviour 2014-07-18 15:39:12 -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
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
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