Brad Hefta-Gaub
da87ac4105
Merge pull request #3112 from Atlante45/replace_qnetworkaccessmanager
...
Replace QNetworkAccessManager by Wrapper
2014-07-02 21:41:08 -07:00
Philip Rosedale
257dc56168
Merge pull request #3111 from noirsoft/master
...
Implementing improved perlin noise
2014-07-02 17:20:10 -07:00
Atlante45
106e5b578b
Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager
2014-07-02 16:06:41 -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
1ac38c9884
Switched call to setCache to invokeMethod
2014-07-02 14:31:19 -07:00
Atlante45
6e02561d96
Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager
2014-07-02 14:08:57 -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
Atlante45
598c1cb516
Switched Sound to NetworkAccessManager
2014-07-02 11:27:55 -07:00
Atlante45
14a2bbb454
Switched SnapshotShareDialog to NetworkAccessManager
2014-07-02 11:22:29 -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
Ryan Huffman
70121357be
Update JSONCallbackParameters to take params in constructor
2014-07-02 11:12:06 -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
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
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
Ryan Huffman
f0c013960d
Remove unnecessary qDebug
2014-07-01 20:05:30 -07:00
Ryan Huffman
ccc638d8c1
Merge branch 'master' of git://github.com/highfidelity/hifi into 19800
2014-07-01 20:03:54 -07:00
Ryan Huffman
83349e0e53
Rename UserLocationsWindow to UserLocationsDialog
2014-07-01 20:03:05 -07:00
Ryan Huffman
aa08577c73
Fix long line
2014-07-01 17:59:59 -07:00
Ryan Huffman
a9e352981a
Fix cleanup of resources for UserLocations*
2014-07-01 17:59:49 -07:00
Atlante45
ab15a1487e
Switched BillboardOverlay to NetworkAccessManaqer
2014-07-01 17:44:38 -07:00
Atlante45
c5a997a567
Switched Application to NetworkAccessManager
2014-07-01 17:43:25 -07:00
Brad Hefta-Gaub
d8a5f59511
Merge pull request #3104 from Atlante45/model_and_billboard_overlays
...
Model and billboard overlays
2014-07-01 15:52:25 -07:00
Atlante45
d63ad86db0
Removed unnecessary function
2014-07-01 15:37:52 -07:00
Ryan Huffman
e7e7bef506
Add error string on rename failure
2014-07-01 15:37:10 -07:00
Ryan Huffman
9953fd6d2b
Update MyLocations to not send rename request if unchanged
2014-07-01 15:29:13 -07:00
Atlante45
12ebfd92d1
Memory leak
2014-07-01 15:12:31 -07:00
Atlante45
19be406b1a
Added billboards overlays
2014-07-01 15:09:30 -07:00
Atlante45
e9826250cb
CR
2014-07-01 12:57:39 -07:00
Atlante45
958367f579
Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
...
Conflicts:
interface/src/devices/OculusManager.cpp
2014-07-01 12:45:42 -07:00
Atlante45
547431d52e
Coding Standard -- static_cast
2014-07-01 12:43:28 -07:00
Atlante45
09cf01e097
ModelOverlay functionnal + bounding box
2014-07-01 12:42:56 -07:00
Brad Hefta-Gaub
df51d26625
Merge pull request #3094 from wangyix/seqNumberStats
...
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
2014-07-01 10:54:35 -07:00
wangyix
99fd1c7106
changed numSamplesNeedToStartPlayback calculation in Audio.cpp
2014-07-01 10:44:07 -07:00
Brad Hefta-Gaub
a88c92ea17
Merge pull request #3099 from Barnold1953/OculusSDK
...
Oculus SDK Upgrade
2014-07-01 10:43:39 -07:00
barnold1953
80bfb0766b
Fixed warnings
2014-07-01 10:28:40 -07:00
Ryan Huffman
50b13c99a7
Update UserLocationsWindow derive from QDialog
2014-06-30 22:44:10 -07:00
Ryan Huffman
bfde24fe12
Update MyLocations sort order
2014-06-30 22:37:32 -07:00
Ryan Huffman
a566f90820
Update User Location update/delete to not work simultaneously
2014-06-30 22:37:13 -07:00
Ryan Huffman
15d60df420
Update User Locations window to update name when it changes on update
2014-06-30 22:25:00 -07:00
Ryan Huffman
51e42221be
Update menu to toggle User Locations Menu
2014-06-30 22:24:27 -07:00
Atlante45
2015861e13
Fixed spelling mistake
2014-06-30 20:10:53 -07:00
