Andrew Meadows
843a4db650
rotation offset for hydra controllers
2014-07-03 13:50:27 -07:00
Andrew Meadows
8c8a29f477
merge upstream/master into andrew/ragdoll
2014-07-03 09:27:52 -07:00
Andrew Meadows
55dd2a4835
re-enable gravity effect on arm IK
2014-07-03 09:10:23 -07:00
Andrew Meadows
356a29c2fb
add AngularConstraint::softClamp() for hands
2014-07-03 08:40:34 -07:00
Brad Hefta-Gaub
67910a5ba2
Merge pull request #3115 from Barnold1953/OculusSDK
...
3DTV UI overlay + Oculus fixes
2014-07-02 21:45:34 -07:00
Brad Hefta-Gaub
1b29b7c120
Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback
...
Removed json callback
2014-07-02 21:45:19 -07:00
Brad Hefta-Gaub
da87ac4105
Merge pull request #3112 from Atlante45/replace_qnetworkaccessmanager
...
Replace QNetworkAccessManager by Wrapper
2014-07-02 21:41:08 -07:00
Atlante45
69533c25c2
Fix script not being loaded at startup
2014-07-02 17:54:21 -07:00
Philip Rosedale
257dc56168
Merge pull request #3111 from noirsoft/master
...
Implementing improved perlin noise
2014-07-02 17:20:10 -07:00
barnold1953
edcf4d04f8
Fixed bug when switching from normal view to oculus
2014-07-02 17:05:06 -07:00
barnold1953
ee30a446e9
Fixed 3rd person camera for non oculus
2014-07-02 16:45:05 -07:00
barnold1953
a859094d4a
Clickable 3D UI in 3DTV
2014-07-02 16:40:02 -07:00
Atlante45
1815472c6b
Modified recently added case to AccountManager
2014-07-02 16:12:39 -07:00
Atlante45
106e5b578b
Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager
2014-07-02 16:06:41 -07:00
Atlante45
45db5e2c40
Removed Xcode warnings
2014-07-02 15:57:11 -07:00
Clément Brisset
1f92d57230
Merge pull request #3103 from AlericInglewood/19827
...
Code Review for Job #19827
2014-07-02 15:53:57 -07:00
Clément Brisset
ae6b4def32
Merge pull request #3108 from huffman/19800
...
Code Review for Job #19800
2014-07-02 15:46:56 -07:00
Philip Rosedale
ec1f909210
Merge pull request #3109 from AndrewMeadows/ragdoll
...
stable arm IK without constraints
2014-07-02 15:26:10 -07:00
Atlante45
90a27bb118
Removed json callback
2014-07-02 15:18:56 -07:00
Atlante45
1ac38c9884
Switched call to setCache to invokeMethod
2014-07-02 14:31:19 -07:00
Atlante45
84ea9833bb
Added forgotten sendCustomRequest Method + comments
2014-07-02 14:30:40 -07:00
Atlante45
6e02561d96
Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager
2014-07-02 14:08:57 -07:00
Atlante45
bf520d0eff
Added thread safe implementation of NetworkAccessManager main methods
2014-07-02 14:05:46 -07:00
Chris Oates
c79c5df295
Fixing up #define / #if pair so that permutation table change can be turned of by setting #defined variable to 0 instead of having to comment it out.
2014-07-02 13:50:47 -07:00
Chris Oates
2d9a42c07a
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-02 13:12:37 -07:00
Chris Oates
e903b1659a
Implemented Improved Perlin Noise in existing "textured voxels" option.
...
TextureCache.cpp: modified so that permutation texture contains known permutation of 0..255 rather than random set of values. Does not noticeably affect visuals.
perlin_modulate.frag: implementation of improved noise, per 2002 SIGGRAPH paper, including "turbulence" summation.
2014-07-02 13:09:16 -07:00
Andrew Meadows
9f5f79b2e3
merge andrew/ragdoll into andrew/bispinor
...
improved IK merged into AngularConstraint work
Conflicts:
interface/src/renderer/JointState.cpp
interface/src/renderer/JointState.h
2014-07-02 11:37:17 -07:00
Atlante45
598c1cb516
Switched Sound to NetworkAccessManager
2014-07-02 11:27:55 -07:00
Atlante45
74e7e0a7bf
Switched XMLHttpRequestClass to NetworkAccessManager
2014-07-02 11:27:32 -07:00
Andrew Meadows
f5debdb930
merge upstream/master into andrew/bispinor
2014-07-02 11:23:42 -07:00
Atlante45
2549b0d946
Switched ScriptEngine to NetworkAccessManager
2014-07-02 11:22:44 -07:00
Atlante45
14a2bbb454
Switched SnapshotShareDialog to NetworkAccessManager
2014-07-02 11:22:29 -07:00
Andrew Meadows
b018c1c4a5
Add copy ctor for JointState
...
create AngularConstraint for joints that need them (but not used yet)
2014-07-02 11:22:07 -07:00
Atlante45
9bcd4e7ac8
Switched ScriptEditorWidget to NetworkAccessManager
2014-07-02 11:21:54 -07:00
Atlante45
602015be66
Switched ScriptModel to NetworkAccessManager
2014-07-02 11:21:26 -07:00
Atlante45
15b37ec3d1
Switched ResourceCache to NetworkAccessManager
2014-07-02 11:21:07 -07:00
Andrew Meadows
c3f7d9d155
delete AngularConstraints at end of tests
2014-07-02 11:20:14 -07:00
Ryan Huffman
70121357be
Update JSONCallbackParameters to take params in constructor
2014-07-02 11:12:06 -07:00
Clément Brisset
3acbaa7ab6
Merge pull request #3110 from AndrewMeadows/say-no-to-warnings
...
remove warnings
2014-07-02 11:10:36 -07:00
Atlante45
da0021cc8e
Switch ModelsBrowser to NetworkAccessManager
2014-07-02 10:53:30 -07:00
Atlante45
f6221abb71
Switch ModelUploader to NetworkAccessManager
2014-07-02 10:52:08 -07:00
Andrew Meadows
ed78855eb6
remove warnings about signed/unsigned comparisons
2014-07-02 10:49:37 -07:00
Andrew Meadows
ec80ccdb9c
remove warning about signed/unsigned comparison
2014-07-02 10:49:05 -07:00
Andrew Meadows
8b3af0b9cb
merge upstream/master into andrew/say-no-to-warnings
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
libraries/audio/src/AudioRingBuffer.cpp
2014-07-02 10:37:30 -07:00
Atlante45
6489151578
Switch ImageOverlay to NetworkAccessManager
2014-07-02 10:28:26 -07:00
Atlante45
36fb530594
Switched DomainServer to NetworkAccessManager
2014-07-02 10:26:38 -07:00
Andrew Meadows
6e5d77f0fc
merge upstream/master into andrew/ragdoll
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2014-07-02 09:41:13 -07:00
Andrew Meadows
49d54dd6f0
Add Model::inverseKinematics() for stable hand IK
...
(removed constraint enforcement which was causing problems,
will add that back later)
2014-07-02 09:33:51 -07:00
Brad Hefta-Gaub
2df851dcfc
Merge pull request #3106 from ctrlaltdavid/19823
...
Code Review for Job #19823
2014-07-02 09:06:01 -07:00
barnold1953
67ecde7d31
Made tree editor voxel world stationary and not crash
2014-07-01 21:39:19 -07:00
