Commit graph

67264 commits

Author SHA1 Message Date
samcake
17f8e789fc less warning maybe ? 2018-04-25 15:53:50 -07:00
samcake
5db3eee4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 15:21:43 -07:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName
added Entities.findbyName
2018-04-25 14:00:10 -07:00
John Conklin II
282d319972
Merge pull request #12977 from birarda/feat/new-serverlesss-tutorial
update serverless content for RC67
2018-04-25 13:23:22 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate
Docs/docs to js docs update
2018-04-25 12:26:19 -07:00
samcake
32e83c256a Adjusting the task::Engine run signature to appease gcc gods and other warnings 2018-04-25 12:23:30 -07:00
John Conklin II
f04200a620
Merge pull request #12976 from ctrlaltdavid/21856
Docs to JSDoc
2018-04-25 11:36:34 -07:00
John Conklin II
0cc43a95c8
Merge pull request #12951 from birarda/feat/installer-special-tutorial
allow download of serverless content for specific campaign
2018-04-25 11:35:30 -07:00
John Conklin II
eef3bc2df5
Merge pull request #12980 from dback2/desktopEquip
Desktop equip - deleted/cleared entities fix
2018-04-25 11:35:04 -07:00
John Conklin II
748c8cdc58
Merge pull request #12861 from Zvork/taapre
Bloom and Temporal Anti-Aliasing improvements
2018-04-25 11:16:56 -07:00
John Conklin II
91b93db0c5
Merge pull request #12981 from birarda/bug/revert-hmac
revert HMAC packet verification for now
2018-04-25 10:07:36 -07:00
samcake
5b5cad38e8 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 10:03:42 -07:00
Olivier Prat
e37b18336a Improved anti-aliasing on text 2018-04-25 12:08:08 +02:00
Olivier Prat
f332849d9a Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-25 09:19:21 +02:00
Olivier Prat
eb01f25621 Merge branch 'taapre' of http://github.com/Zvork/hifi into taapre 2018-04-25 08:35:50 +02:00
Olivier Prat
c0b5bc8ffd
Merge pull request #1 from samcake/taa-zvork
Fixing the crash on mac
2018-04-25 08:35:32 +02:00
milad nazeri
4c736b2d62 Fixed defaults 2018-04-24 21:38:48 -07:00
David Rowe
cae9447ac5 Doc review 2018-04-25 15:09:47 +12:00
Andrew Meadows
1dea7e05ab
Merge pull request #12987 from samcake/workload
Workload : Adding a controller feedback job to regulate the View Region Sizes
2018-04-24 16:00:18 -07:00
John Conklin II
6062f21da1
Merge pull request #12961 from Atlante45/fix/es-deadlock
Enforce correct lock order between EntityTree and EntitySimulation
2018-04-24 15:40:32 -07:00
David Back
71dc75b208 fix disconnect clear entities 2018-04-24 14:25:33 -07:00
samcake
f2c76abafa Apply the noAA /popJittering on the WebOverlay 2018-04-24 14:18:44 -07:00
John Conklin II
ce14dfb9a4
Merge pull request #12974 from AndrewMeadows/dont-feed-bullet-garbage
don't try to build convex hulls with nan data
2018-04-24 14:11:25 -07:00
David Back
3b251c0c49 Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-24 14:09:29 -07:00
Atlante45
d82333534c Ensure the tree lock is always taken before the simulation lock 2018-04-24 13:46:05 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data
Get the correct device name connect to OpenVr
2018-04-24 13:29:41 -07:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
samcake
adfc935fdb Merge with master 2018-04-24 13:04:16 -07:00
Stephen Birarda
63491588cb Revert "Merge pull request #12690 from SimonWalton-HiFi/hmac-auth"
This reverts commit 7378c87ade, reversing
changes made to 92bf99f436.
2018-04-24 12:44:51 -07:00
samcake
33bbbcef83 Merging with master 2018-04-24 11:49:34 -07:00
samcake
382161659e Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork 2018-04-24 11:37:00 -07:00
Sam Gateau
b342b16857 Fixing the crash on mac 2018-04-24 11:25:40 -07:00
Sam Gateau
2cae294ab4
Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate
LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it
2018-04-24 11:22:48 -07:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash
Attempt to shutdown web surfaces more consistently
2018-04-24 10:15:25 -07:00
Olivier Prat
f5296e9d97 Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-24 17:17:52 +02:00
Sam Gateau
f50b2fab2b Exposing timing and regulated radiuses 2018-04-23 22:38:50 -07:00
milad nazeri
1121fe8da0 fix tabs 2018-04-23 21:47:53 -07:00
Brad Davis
ecaf162afb Fixing PR build 2018-04-23 20:41:36 -07:00
samcake
f686ef1f25 Exposing more uniforms to ui for refining the controller 2018-04-23 18:02:09 -07:00
David Back
e21c451815 ensure deleted or cleared entities properly unequipped 2018-04-23 16:56:18 -07:00
Stephen Birarda
005a2bce14 update to serverless content for RC67 2018-04-23 16:29:40 -07:00
David Rowe
98f43b6a70 Interim JSDoc for MyAvatar - stubs for remainder 2018-04-24 10:47:33 +12:00
John Conklin II
5cf93ebd1f
Merge pull request #12966 from SamGondelman/audio
Fix audio level meter
2018-04-23 14:56:57 -07:00
John Conklin II
2e6a563c87
Merge pull request #12959 from davidkelly/dk/14375
Don't populate user list in pal until you connect the events up
2018-04-23 14:47:31 -07:00
Andrew Meadows
ae186d46c6 don't try to build convex hulls with nan data 2018-04-23 14:46:23 -07:00
John Conklin II
6af6423056
Merge pull request #12905 from dback2/desktopEquip
Desktop equip/unequip
2018-04-23 14:35:29 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
John Conklin II
91197cadcf
Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix
Fix for null sourceNode use
2018-04-23 14:11:06 -07:00
David Rowe
719062dd9f Interim JSDoc for MyAvatar - first pass 2018-04-24 09:10:59 +12:00
Stephen Birarda
02c1cd2d50 optionally use campaign serverless content during install 2018-04-23 13:54:47 -07:00