Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 13:16:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33467 commits 74 branches 59 tags 1.2 GiB
Commit graph

33467 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
7a9620ef99 Merge pull request #6013 from jherico/lisa 
Picking fixes in the HMD
 2015-10-07 01:28: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
Howard Stearns
1fc305ca6b Update HMD-derived avatar stuff during reset, update position under head, and remove unused vars. 2015-10-06 20:51:53 -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
028935f831 Removing deprecated function usage 2015-10-06 20:36:55 -07:00
Brad Hefta-Gaub
6e5847bb1c make Hand Input Mouse off by default 2015-10-06 19:58:25 -07:00
Brad Hefta-Gaub
927cee81bf Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-06 19:48:52 -07:00
Brad Davis
bac69c73a8 Fixing bug in application compositor transform 2015-10-06 19:08:44 -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
James B. Pollack
7aab34975f code quality 2015-10-06 17:08:51 -07:00
Brad Hefta-Gaub
34fa5b43fc Merge pull request #5991 from imgntn/knockover_blocks 
[Scripts] Test Block Spawner for Blockers Game
 2015-10-06 17:03:29 -07:00
Brad Hefta-Gaub
0e5f4bc4c9 Merge pull request #5983 from ericrius1/lightFixes 
Light fixes in toybox
 2015-10-06 17:02:17 -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
James B. Pollack
4788480186 reset balls if they move too far 2015-10-06 16:48:34 -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
Brad Hefta-Gaub
7a2bad0b29 Merge branch 'master' of https://github.com/ZappoMan/hifi 2015-10-06 16:25:30 -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
Atlante45
76e0006732 Remove forgotten cursorVisible 2015-10-06 15:58: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
0db88ba572 fix a typo in comment 2015-10-06 15:06:28 -07:00
Stephen Birarda
4c695b179a remove out of order assert in avatar-mixer 2015-10-06 15:04:48 -07:00
Stephen Birarda
593153deec add receive rate and inbound kbps to av stats 2015-10-06 14:58:51 -07:00
Howard Stearns
db955d894f Align avatar body to head on reset. 2015-10-06 14:52:53 -07:00
Stephen Birarda
fbf6d166b7 add wire size to BasePacket 2015-10-06 14:48:28 -07:00
Atlante45
8a7871e15b rebase fix 2015-10-06 14:13:28 -07:00
Stephen Birarda
9079f891e9 repair broken node bandwidth stats 2015-10-06 14:09:21 -07:00
Atlante45
ed13c02075 Fix rebase 2015-10-06 13:57:51 -07:00
Atlante45
c745050dea Fix QObject::connect warning 2015-10-06 13:57:51 -07:00
Atlante45
7b25c9d417 More header cleanup 2015-10-06 13:57:50 -07:00
Atlante45
775994f9d0 Fix for 3DConnection 2015-10-06 13:57:49 -07:00
Atlante45
b63df98b8b More unused 2015-10-06 13:57:49 -07:00
Atlante45
17edd38cb9 Remove unused variables 2015-10-06 13:57:48 -07:00
Atlante45
39e0d0e1dc Put timers on the stack 2015-10-06 13:56:26 -07:00
Atlante45
e9b7125894 Misc cleanup 2015-10-06 13:56:26 -07:00
Atlante45
5e9425d9eb Fix view frustum preference 2015-10-06 13:56:25 -07:00
Atlante45
60ebd3a544 Remove unused members (Mostly mouse stuff) 2015-10-06 13:56:25 -07:00
Atlante45
35e2f8cd89 Removed _myAvatar from Application 2015-10-06 13:56:25 -07:00