Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33666 commits 29 branches 0 tags 1.1 GiB
Commit graph

13485 commits

Author SHA1 Message Date
Seth Alves
353f92f1ba Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-17 13:09:52 -07:00
Atlante45
1da68e0214 Fix particle bug by having lifetimes increase 2015-10-16 18:11:22 -07:00
Howard Stearns
38a967ac54 Allow compiler after someone broke things. 2015-10-16 16:28:11 -07:00
Howard Stearns
91c2d31118 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-16 15:51:09 -07:00
David Rowe
8c22db17cc Fix reading of QVector<float> from models files - polyline strokeWidths 2015-10-16 15:43:23 -07:00
Howard Stearns
f25cc93936 Initial prototype of exposing anim vars to javascript. 2015-10-16 10:48:36 -07:00
Seth Alves
937959c1c1 cleanups 2015-10-16 09:57:27 -07:00
Seth Alves
d2b7e5c4eb Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-16 09:54:26 -07:00
Seth Alves
8338491c3b Merge pull request #6095 from Atlante45/master 
Fix export bug
 2015-10-16 07:32:56 -07:00
Seth Alves
b18bb1e076 Merge pull request #6084 from AndrewMeadows/physics-cleanup 
move DIRTY_FLAGS out of EntityItem namespace
 2015-10-16 07:22:40 -07:00
Seth Alves
359a318568 fold kinematic hold into normal hold (disabled by default, an argument enables) 2015-10-15 20:23:06 -07:00
Atlante45
a84fdecec9 Fix export bug 2015-10-15 18:43:32 -07:00
Brad Hefta-Gaub
26f82e899e Merge pull request #6079 from ericrius1/whiteboard 
Entity whitelist for raypicking and whiteboard painting example
 2015-10-15 17:50:35 -07:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat 
Add some additional stats for debugging edit lags
 2015-10-15 16:00:29 -07:00
Seth Alves
462918ffcf cleanups 2015-10-15 14:55:17 -07:00
Seth Alves
36a523478f Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-15 14:21:30 -07:00
Seth Alves
4903db45b1 give other avatars an anim-skeleton 2015-10-15 14:21:06 -07:00
Andrew Meadows
3d17c57910 Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes 
Groundwork for hold action changes
 2015-10-15 13:30:02 -07:00
Brad Hefta-Gaub
93113af2d2 improve server error message for failed edit 2015-10-15 11:55:20 -07:00
Seth Alves
a70ba4cd5a add some accessors 2015-10-15 11:42:53 -07:00
Brad Hefta-Gaub
b7c40c2df1 fix Queue OUT stat 2015-10-15 11:41:04 -07:00
ericrius1
3b59bffb79 Deleting only strokes from the whiteboard where the erase button was clicked on 2015-10-15 11:38:18 -07:00
Seth Alves
64c5cde2d2 further unmangle branch split 2015-10-15 10:33:58 -07:00
Seth Alves
e571cb7ca4 more lock adjustments 2015-10-15 10:22:25 -07:00
ericrius1
55c68e0509 Merge branch 'master' into whiteboard 2015-10-15 10:08:32 -07:00
Andrew Meadows
fa17b77d70 move DIRTY_FLAGS out of EntityItem namespace 2015-10-15 09:34:09 -07:00
Seth Alves
c96f7562f2 Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes 2015-10-15 09:28:57 -07:00
Thijs Wenker
c99573ea64 Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now! 2015-10-15 15:35:35 +02:00
Clément Brisset
efd106e68c Merge pull request #6075 from birarda/default-asset-server 
add a migrator to move assets to ATP
 2015-10-14 17:02:10 -07:00
ericrius1
cfca0fe8c0 Adding a color indicator to whiteboard 2015-10-14 15:58:18 -07:00
Andrew Meadows
982476d02b Merge pull request #6076 from hyperlogic/tony/turn-hips-while-moving 
Rotate the avatar to align with the HMD while moving
 2015-10-14 15:09:39 -07:00
Seth Alves
9937b6a3ef quiet some debugging 2015-10-14 13:12:11 -07:00
Seth Alves
d72152da87 more locking 2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f more lock fixing 2015-10-14 12:49:06 -07:00
Seth Alves
fa2bf2b2d9 tighten up locking in actions 2015-10-14 11:43:03 -07:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Seth Alves
77bb11675d terse entity-edit logging 2015-10-14 09:31:44 -07:00
Seth Alves
698a4001a8 Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-14 06:18:02 -07:00
Seth Alves
742cc0f511 rename a function 2015-10-14 06:17:55 -07:00
Anthony J. Thibault
1c1221597d Merge branch 'master' into tony/turn-hips-while-moving 2015-10-13 18:38:27 -07:00
Seth Alves
f61a005ebc cleanups 2015-10-13 17:47:41 -07:00
Brad Hefta-Gaub
c4af4c7b10 basic mono preview for the oculus display plugin 2015-10-13 17:45:29 -07:00
Anthony J. Thibault
e484a904a2 Rotate the avatar to align with the HMD while moving 
MyAvatar: refactored updateFromHMDSensorMatrix() a bit by splitting it into several methods, because
it was getting quite large and becoming hard to follow.

* beginStraighteningLean() - can be called when we would like to trigger a re-centering action.
* shouldBeginStraighteningLean() - contains some of the logic to decide if we should begin a re-centering action.
  for now it encapulates the capsule check.
* processStraighteningLean() - performs the actual re-centering calculation.

New code was added to MyAvatar::updateFromHMDSensorMatrix() to trigger re-centering when the avatar speed rises
over a threshold.

Secondly the Rig::computeMotionAnimationState() state machine for animGraph added a state change hysteresis
of 100ms.  This hysteresis should help smooth over two issues.

1) When the delta position is 0, because the physics timestep was not evaluated.
2) During re-centering due to desired motion, the avatar velocity can fluctuate causing undesired animation state fluctuation.
 2015-10-13 17:36:00 -07:00
Seth Alves
74ced250c1 don't compress joint rotations 2015-10-13 17:18:28 -07:00
Stephen Birarda
2caa7f6d64 change getUrl to getATPUrl, use in ATPAssetMigrator 2015-10-13 16:56:20 -07:00
Seth Alves
644076214e fix hang 2015-10-13 16:55:04 -07:00
Stephen Birarda
76bfc6218a add back block removed in merge 2015-10-13 16:36:10 -07:00
Seth Alves
4402242c3c allow an action to suppress sending of physics related edits to the entity-server 2015-10-13 16:27:40 -07:00
Seth Alves
2ecb7e8d29 fix bug that was making action deletes fail 2015-10-13 16:19:12 -07:00
Stephen Birarda
fc82ea8541 resolve conflicts on merge with upstream/master 2015-10-13 16:12:54 -07:00
Stephen Birarda
c328941b9d Merge pull request #6074 from huffman/fix-empty-hash 
Fix crash when atp url is empty
 2015-10-13 16:02:28 -07:00
Ryan Huffman
c468cabe7e Fix crash when atp url is empty 2015-10-13 15:12:01 -07:00
Seth Alves
fcbb107bc0 tweak 2015-10-13 14:13:53 -07:00
Seth Alves
8b72f6e7c6 tweak 2015-10-13 13:50:43 -07:00
Seth Alves
54eac099b9 tweak 2015-10-13 12:52:53 -07:00
Seth Alves
83780296de don't send physical property updates if there's an action on the object 2015-10-13 12:12:57 -07:00
Stephen Birarda
cf74cfb50e add an ATPAssetMigrator for bulk ATP migration 2015-10-13 10:38:52 -07:00
Andrew Meadows
ef3775c44d Merge pull request #6059 from Atlante45/warning 
Fix warning
 2015-10-13 08:39:42 -07:00
ericrius1
47c3df7587 Cleaned up spacing 2015-10-12 17:38:52 -07:00
ericrius1
2f620e654b Fixed styling 2015-10-12 17:37:51 -07:00
ericrius1
f93b1d3325 Correctly whitelisting entities for ray picking 2015-10-12 17:05:34 -07:00
Howard Stearns
e8b074c85c Merge pull request #6031 from AndrewMeadows/ik-moves-hips 
IK moves hips
 2015-10-12 17:03:33 -07:00
Atlante45
b7ba99380a Pretty up loading debug 2015-10-12 15:32:44 -07:00
Atlante45
7eadb11404 Remove optional upload caching 2015-10-12 15:09:17 -07:00
Atlante45
0e0a8301eb Collapse line 2015-10-12 15:06:51 -07:00
Atlante45
0cdad78581 Move debug to helper functions 2015-10-12 15:03:37 -07:00
Atlante45
4abac35c72 Cache on upload 2015-10-12 15:03:37 -07:00
Atlante45
51acf07c15 Factor couple methods in AssetUtils 2015-10-12 15:03:37 -07:00
ericrius1
8d39f9c760 Syntax fixes 2015-10-12 15:02:03 -07:00
ericrius1
d01dda9c81 Adding in functionality to include only specified Ids in ray picking 2015-10-12 14:40:11 -07:00
Andrew Meadows
8ebdd25b71 more cleanup 2015-10-12 14:07:23 -07:00
Atlante45
c666c9fb9b Fix warning 2015-10-12 13:40:33 -07:00
Andrew Meadows
22786dea7d cleanup 2015-10-12 13:35:26 -07:00
Andrew Meadows
44243aaa52 remove some debug code 2015-10-12 11:39:54 -07:00
U-GAPOS\andrew
f01847de14 experimental HMD hips tracking 2015-10-12 11:39:54 -07:00
Andrew Meadows
35d2a5b5ea track tipRotation for HmdHead target 2015-10-12 11:39:54 -07:00
Andrew Meadows
5f1068c404 cleanup and optimization of IK loop 2015-10-12 11:39:54 -07:00
Andrew Meadows
6a96d5f0c5 don't bother to create targets with bad types 2015-10-12 11:39:54 -07:00
Andrew Meadows
bc48f70877 move IKTarget into its own files 2015-10-12 11:39:54 -07:00
Andrew Meadows
56f038d5a7 simpler logic for tracking hips offset 2015-10-12 11:39:54 -07:00
Andrew Meadows
03eaa95258 initial hip translation from IK 
works for 2D 3rd person but probably not well for HMD
 2015-10-12 11:39:54 -07:00
Brad Hefta-Gaub
f8956a853b Merge pull request #6051 from jherico/marge 
Cleanup CMake files
 2015-10-11 16:22:56 -07:00
Brad Davis
8024d9f017 Merge pull request #6055 from ZappoMan/newControllerInterface 
implement StandardController and expose it to JS as Controller.Standard.*
 2015-10-11 16:10:42 -07:00
Brad Hefta-Gaub
21a473035e more CR feedback 2015-10-11 15:37:17 -07:00
Brad Hefta-Gaub
312bbf6167 CR feedback 2015-10-11 15:15:20 -07:00
Brad Hefta-Gaub
9667a103aa actually add new files 2015-10-11 15:02:11 -07:00
Brad Hefta-Gaub
0986f86c34 implement StandardController and expose it to JS as Controller.Standard.* 2015-10-11 14:55:07 -07:00
Brad Davis
cd1b758534 PR comments 2015-10-11 00:32:31 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Davis
e5fc2e5525 Low level support for URL overrides when loading content 2015-10-10 23:00:15 -07:00
Brad Hefta-Gaub
ded677e90f Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub
25481e0a25 Merge pull request #6038 from Atlante45/asset-drop 
Asset file drop
 2015-10-10 09:32:58 -07:00
Brad Hefta-Gaub
63f3156a61 add Controler.Actions 2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub
d3ee9b0f39 more work on exposing device inputs as JavaScript named constants 2015-10-09 20:58:23 -07:00
Howard Stearns
7ba149fbbd Log when hydra is disconnected. 2015-10-09 16:19:14 -07:00
Brad Hefta-Gaub
37f530f97f first cut at wiring up devices and inputs to JS 2015-10-09 16:15:29 -07:00
Brad Hefta-Gaub
614a47c90d Merge pull request #6044 from Atlante45/json_asset 
Fix warnings
 2015-10-09 15:46:59 -07:00
Howard Stearns
ce82ba87d2 Merge pull request #6011 from hyperlogic/tony/hmd-rest-detection 
When HMD is at rest, re-center the body under the avatar.
 2015-10-09 15:20:07 -07:00
Stephen Birarda
b84109a781 Merge pull request #6040 from huffman/fix-null-node 
Fix case where we deref a null pointer in OctreeInboundPacketProcessor
 2015-10-09 14:57:16 -07:00
Anthony J. Thibault
b5ba621f78 Merge branch 'master' into tony/hmd-rest-detection 2015-10-09 14:36:18 -07:00
Clément Brisset
a5f0b75e25 Merge pull request #6043 from huffman/fix-uninitialized-arr 
Fix uninitialized pointer in AssetResourceRequest
 2015-10-09 13:36:58 -07:00
Clément Brisset
aa221741e5 Merge pull request #6041 from birarda/packet-corruption 
fix for re-send timeout in SendQueue
 2015-10-09 13:33:34 -07:00
Atlante45
cba8b0962d Fix warnings 2015-10-09 13:29:59 -07:00
Atlante45
3e71c4cc4e CR 2015-10-09 13:18:05 -07:00
Ryan Huffman
c02df56ceb Fix uninitialized pointer in AssetResourceRequest 2015-10-09 13:15:13 -07:00
Atlante45
ae83dfe041 Move auto-resize to update 2015-10-09 12:23:19 -07:00
Atlante45
bcd148cb87 Construct entity properties at definition 2015-10-09 12:23:19 -07:00
Atlante45
75f0a6442f ModelEntities spawned with no dimension autoresize 2015-10-09 12:23:19 -07:00
David Rowe
09e5b30c16 Only emit particles if isEmitting is true 2015-10-09 11:21:59 -07:00
Stephen Birarda
58f9830a94 fix for re-send timeout in SendQueue 2015-10-09 10:04:35 -07:00
Ryan Huffman
36aaffce43 Revert "Fix _packets not being cleaned up in ReceivedPacketProcessor" 
This reverts commit 4dddb508a8.
 2015-10-09 10:01:53 -07:00
Ryan Huffman
21e9d30bbe Move qdeclare/qregister calls to their respective class header 2015-10-09 09:58:32 -07:00
Ryan Huffman
4dddb508a8 Fix _packets not being cleaned up in ReceivedPacketProcessor 2015-10-09 09:21:36 -07:00
Brad Hefta-Gaub
e2e086ef55 Merge pull request #6033 from samcake/hobbes 
FIxing the backgroung leaking in the rear view mirror and moving from Float32 to 24 bits Depth buffer
 2015-10-09 08:36:52 -07:00
Brad Hefta-Gaub
26b83d0f36 Merge pull request #6037 from sethalves/dont-send-righthandthumb3 
fix bug in AvatarData::toByteArray related code
 2015-10-08 20:26:22 -07:00
Clément Brisset
7caf8755d1 Merge pull request #6039 from birarda/packet-corruption 
hold the sent packets lock while re-sending a packet
 2015-10-08 19:57:08 -07:00
Stephen Birarda
8985427516 maintain sent packets lock while re-sending packet 2015-10-08 19:47:15 -07:00
Seth Alves
14ad1ed6be fix bug in AvatarData::toByteArray related code. this was causing a few joint translations that hadn't changed to be sent 2015-10-08 18:37:09 -07:00
Clément Brisset
6d694b877d Merge pull request #6036 from birarda/packet-corruption 
fix for registration of meta types in Socket
 2015-10-08 18:29:03 -07:00
Clément Brisset
a2b5748f54 Merge pull request #6027 from birarda/net-crashes 
clean up Nodes via deleteLater on the network thread
 2015-10-08 18:22:40 -07:00
Stephen Birarda
1cd76bb937 fix for registration of meta types in Socket 2015-10-08 18:17:24 -07:00
Anthony J. Thibault
1c2f86f8b7 Fix for sending translation for non-animated joints. 
Only the JointState._defaultTranslation needs to be multiplied
by the unitScale in JointState::translationIsDefault().  This
was incorrectly flagging some non-animated joints as animated.
 2015-10-08 17:50:22 -07:00
samcake
3897716ff5 Simplifying the DrawOpaqueStencil Pixel shader 2015-10-08 17:49:55 -07:00
samcake
d7dd90f87e Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-08 16:47:59 -07:00
samcake
bad5ea7d53 grouping the depth and stencil buffer into a single buffer 2015-10-08 16:47:33 -07:00
Stephen Birarda
aa2a8edc6f use _segmentStartIndex before changing its value 2015-10-08 15:44:18 -07:00
Stephen Birarda
0d9421a65e constantize the PacketList write error 2015-10-08 15:40:49 -07:00
Stephen Birarda
519df1565a fix comment format in PacketList 2015-10-08 15:38:41 -07:00
Stephen Birarda
dc4f987a2e fix segmented write logic in PacketList 2015-10-08 15:38:41 -07:00
samcake
f105803958 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-08 15:25:32 -07:00
Stephen Birarda
8ce3ee0d60 have nodes be cleaned up on the NL thread 2015-10-08 13:22:43 -07:00
Ryan Huffman
26c40adecb Merge pull request #6023 from ZappoMan/animationGroupSettings 
Fixes to isEmitting for ParticleEffects
 2015-10-08 12:24:36 -07:00
samcake
eacbcf2881 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-08 12:06:34 -07:00
samcake
dff598ebd1 clening and getting ready for pr 2015-10-08 12:06:09 -07:00
Seth Alves
3db148f3dc fix obj model meshes 2015-10-08 11:13:52 -07:00
samcake
c7049bad39 Backing up on any changes regarding shading, focus on the rearr view mirror and stencil bug 2015-10-08 09:32:05 -07:00
Brad Hefta-Gaub
65473cadcb Merge pull request #6021 from jherico/homer 
Support reload-on-change for local scripts
 2015-10-07 20:34:15 -07:00
Brad Hefta-Gaub
bb10d8a7d5 more work on rationalizing particle properties 2015-10-07 20:08:30 -07:00
Brad Hefta-Gaub
b479dd0a12 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-07 19:55:01 -07:00
Brad Hefta-Gaub
02a24712ca fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js 2015-10-07 19:52:29 -07:00
Brad Davis
99d1e17ae8 Support reload-on-change for local scripts 2015-10-07 19:18:59 -07:00
samcake
a2ca1c033d FIxing the rear view mirror issue with background and fooling around with Lighting equations 2015-10-07 19:04:03 -07:00
Eric Levin
a6e1fbd50f Merge pull request #6014 from ctrlaltdavid/20699 
Sanitize particle properties, fix crashes
 2015-10-07 17:19:29 -07:00
Brad Hefta-Gaub
a86e34f9f9 Merge pull request #6018 from hyperlogic/tony/avatar-mixer-stats-improvements 
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
 2015-10-07 16:04:13 -07:00
Anthony Thibault
a363493a99 Merge pull request #6016 from samcake/calvin 
Fix the cauterized Cluster Matrices issue when rear view mirror is enabled
 2015-10-07 15:52:11 -07:00
Andrew Meadows
ef58238c66 Merge pull request #6017 from ZappoMan/animationGroupSettings 
fix a bunch of warnings
 2015-10-07 15:50:20 -07:00
Brad Hefta-Gaub
e93326e43f Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-07 15:49:46 -07:00
Anthony J. Thibault
00f3b7b1b5 Renamed delt to averageTimeBetweenPackets 2015-10-07 15:46:42 -07:00
Brad Hefta-Gaub
ae93c020be Merge pull request #5994 from Atlante45/display_name 
Display name in terms of arc size not pixels
 2015-10-07 15:40:30 -07:00
Anthony J. Thibault
0cebeb7fe9 Separated AvatarMixer inbound and outbound bandwidth on stats overlay 
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
 2015-10-07 15:32:10 -07:00
Andrew Meadows
7a918eb288 fix variable names in header 2015-10-07 15:25:07 -07:00
David Rowe
131b4ed004 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
	libraries/entities/src/ParticleEffectEntityItem.cpp
 2015-10-07 15:08:07 -07:00
Atlante45
14a1860670 Do not change keyhole radius 2015-10-07 14:55:18 -07:00
Brad Hefta-Gaub
bfd014203e fix a bunch of warnings 2015-10-07 14:48:42 -07:00
samcake
f0b7622ef0 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-07 14:27:01 -07:00
samcake
0a351a8a0c FIx the problem with cauterizedClusterMatrices in the case rear view mirror is used. Clean the way to define the depth stencil format for texture 2015-10-07 14:26:33 -07:00
Andrew Meadows
464ef2293d more descriptive variable names 2015-10-07 14:19:15 -07:00
Andrew Meadows
0680be0422 save sixense settings and some UI cleanup 2015-10-07 14:19:15 -07:00
Andrew Meadows
76264ae704 fix formatting 2015-10-07 14:17:21 -07:00
Andrew Meadows
6c2a94fddb remove unused method declarations 2015-10-07 14:17:21 -07:00
Andrew Meadows
0061426ded Merge pull request #6006 from ZappoMan/animationGroupSettings 
Animation group settings
 2015-10-07 14:09:20 -07:00
Brad Hefta-Gaub
b09ae1755e fix formatting of macros 2015-10-07 13:59:00 -07:00
Brad Hefta-Gaub
6f9b5d8125 Merge pull request #5988 from thoys/js-hmd-position-orientation 
expose position and orientation of HMD to Javascript.
 2015-10-07 13:27:15 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
57cc7adbfe standardize somethingChanged - CR feedback 2015-10-07 12:27:12 -07:00
samcake
6c75daa027 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-07 11:39:07 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
Brad Hefta-Gaub
6eeb64b032 CR feedback 2015-10-07 11:23:24 -07:00
samcake
05da9d94cd fixing the depth stencil texture case 2015-10-07 11:20:11 -07:00
Stephen Birarda
022c4276b9 Merge pull request #5892 from Atlante45/protocol 
Add channels to UDT
 2015-10-07 11:06:22 -07:00
David Rowe
4624649b1b Sanitize particle properties, fix crashes 2015-10-07 08:57:55 -07:00
Thijs Wenker
4ab5e0af84 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 14:48:06 +02:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Hefta-Gaub
b06d17d45a Merge pull request #6000 from samcake/hobbes 
Migrate FBXReader to use model::Mesh and clean Model Part rendering
 2015-10-07 01:31:21 -07:00
samcake
dd2aa36a11 FIx the shiny objects by actually using the specular map as it should be... 2015-10-06 23:10:03 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
samcake
83a0091e47 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-06 22:03:07 -07:00
Anthony J. Thibault
2dabe69341 When HMD is at rest, re-center the body under the avatar. 
This should help the case when a user avatar is stuck in an
uncomfortable pose for a long period of time.  If they stop
moving their head, the body should recenter itself and
appear more natural.

Added an AtRestDetector class.  That tracks the average and variance
of both position and rotation (quaternion logarithms), then
detects when the variance falls under a threshold.

Also, renamed variables with the straighting prefix to straightening.
 2015-10-06 20:37:51 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
Thijs Wenker
6e52fcb857 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 03:11:24 +02:00
samcake
c75c31ddc8 Fixing the index Offset issue with instanced shapes from Geometry cache 2015-10-06 18:04:08 -07:00
Brad Hefta-Gaub
02bb372c27 Merge pull request #6008 from AndrewMeadows/ik-targets-use-model-frame 
IK targets specified in the skeleton's model-frame
 2015-10-06 17:34:42 -07:00
Clément Brisset
8a24d1eb9c Merge pull request #6007 from ZappoMan/fixWarning 
clean up warnings and coding standard issues
 2015-10-06 17:02:11 -07:00
Ryan Huffman
74c89ad099 Merge pull request #5984 from Atlante45/cleanup_app 
Application cleanup
 2015-10-06 16:58:05 -07:00
Andrew Meadows
224fc55033 put IK targets in skeleton's model-frame 2015-10-06 16:49:29 -07:00
Atlante45
3a8deff53e Return if innactive 2015-10-06 16:38:16 -07:00
Brad Hefta-Gaub
867d34b617 clean up warnings and coding standard issues 2015-10-06 16:33:24 -07:00
Atlante45
ca575bee89 Remove unecessary move 2015-10-06 16:15:51 -07:00
Atlante45
5ee966261d Start thread right away 2015-10-06 16:12:50 -07:00
Atlante45
81b88cb096 Renamed MessagePart > MessagePartNumber 2015-10-06 16:12:04 -07:00
Brad Hefta-Gaub
016bf4011d cleanup 2015-10-06 16:07:36 -07:00
Brad Hefta-Gaub
1319642a59 fix frame jumping behavior on restart 2015-10-06 15:59:35 -07:00
Howard Stearns
e66f6b79cc Merge pull request #6004 from birarda/av-mixer-stats 
add receive rate and inbound kbps to avatar-mixer stats
 2015-10-06 15:24:30 -07:00
Brad Hefta-Gaub
be79101a93 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-06 15:20:37 -07:00
Stephen Birarda
fbf6d166b7 add wire size to BasePacket 2015-10-06 14:48:28 -07:00
Stephen Birarda
9079f891e9 repair broken node bandwidth stats 2015-10-06 14:09:21 -07:00
Atlante45
9c7a480fda Remove shadowMatrices/Distances 2015-10-06 13:56:23 -07:00
Atlante45
765608d0ff More unused 2015-10-06 13:56:21 -07:00
Atlante45
77a7814854 Move sendPingPackets 2015-10-06 13:56:20 -07:00
Atlante45
0f18db886c Remove 4 Application static methods 
- Replace by lambda
- Cleaned up global scope
 2015-10-06 13:56:19 -07:00