Commit graph

19104 commits

Author SHA1 Message Date
David Rowe
38c2efa22f Implement Entities.findInFrustum() method 2016-09-09 18:57:48 +12:00
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00
David Rowe
7d6ab77c16 Merge branch 'master' into 21040 2016-09-08 11:30:19 +12:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
SamGondelman
b048637c26 fix signal issue and qabstract::socket issue 2016-09-06 17:36:52 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Brad Davis
20deae3242 Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
David Rowe
f83599f855 Merge branch 'master' into 21040 2016-09-07 10:08:51 +12:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
Brad Hefta-Gaub
78cf81954c Merge pull request #8555 from jherico/thread_count
Stuttering: global thread pool management
2016-09-06 09:27:02 -07:00
Brad Hefta-Gaub
418495d2c5 Merge pull request #8546 from samcake/yellow
Revert the sRGB pixel format by default
2016-09-03 10:16:16 -07:00
Brad Hefta-Gaub
a51f66e9ff Merge pull request #8553 from zzmp/clean/audio-ring-buffer
clean and comment AudioRingBuffer
2016-09-02 20:16:06 -07:00
David Rowe
17d30796cc Use count of textures actually rendered
Textures specified in model may be invalid and so not actually rendered.
2016-09-03 13:07:00 +12:00
Andrew Meadows
0a55afda69 Merge pull request #8554 from elisa-lj11/marketplaces_html
Include a marketplace status bar and access to "marketplace" of marketplaces
2016-09-02 17:12:05 -07:00
elisa-lj11
2f07ba87af Renamed isZipped for more clarity on checking for non-fbx files 2016-09-02 16:48:55 -07:00
Seth Alves
342f7edff3 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-02 16:12:41 -07:00
elisa-lj11
6721cc8dfb fixed return statement formatting 2016-09-02 15:48:47 -07:00
Brad Davis
94210d2e69 Use dynamic count for global thread pool 2016-09-02 15:23:35 -07:00
elisa-lj11
18700d6397 narrowed filters for Clara website check 2016-09-02 15:18:13 -07:00
Seth Alves
b8b1127d55 merge from upstream 2016-09-02 15:11:21 -07:00
Brad Davis
91bfa7677c Updating stats display for threaded rendering 2016-09-02 14:41:49 -07:00
Brad Davis
2c8b795c5f Fix incorrect fence delete 2016-09-02 11:26:21 -07:00
Brad Hefta-Gaub
8ec5798b7a Merge pull request #8548 from samcake/blue
Exposing GPU & Batch running time to Engine gpu jobs
2016-09-02 09:31:09 -07:00
Brad Hefta-Gaub
667137f951 Merge pull request #8552 from AndrewMeadows/invoke-updateModel
eliminate log warning about invokeMethod of EntityTreeRenderer::updateModel()
2016-09-02 09:17:57 -07:00
Brad Hefta-Gaub
e3bad8e8f4 Merge pull request #8556 from ZappoMan/renderStats
add support for renderInfo properties to model entities
2016-09-02 09:04:56 -07:00
Seth Alves
25f6e1d79d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-01 15:06:52 -07:00
Brad Hefta-Gaub
b3e5e21f40 Merge pull request #8559 from birarda/android-interface
create a foundation for interface target compile on android
2016-09-01 13:10:45 -07:00
Seth Alves
1a9f43cb67 fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled 2016-09-01 12:17:34 -07:00
Stephen Birarda
f48da0252a use the correct Qt windows macro 2016-09-01 11:33:20 -07:00
Stephen Birarda
545181a465 avoid numeric_limits use on Q_OS_WINDOWS 2016-09-01 11:18:40 -07:00
Seth Alves
53ba190ca6 don't do auto-release test unless the hand is equipping 2016-09-01 09:57:46 -07:00
elisa-lj11
bebf9c5890 Added error feature when user tries to download a non fbx file 2016-08-31 17:46:35 -07:00
Stephen Birarda
65c1edfb1c add missing link from render-utils to entities 2016-08-31 16:57:52 -07:00
Stephen Birarda
b660a82cc7 fix physics compile for android 2016-08-31 16:55:31 -07:00
Stephen Birarda
dae40c944b fix audio and audio-client compile for android 2016-08-31 16:55:19 -07:00
Stephen Birarda
6efa47a04e workaround plugin build failures 2016-08-31 16:45:12 -07:00
Stephen Birarda
85ba0f36cf fix controllers/shared compile for android interface port 2016-08-31 16:34:31 -07:00
Seth Alves
74dc2ce493 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-31 16:26:21 -07:00
Stephen Birarda
47f15f6ad8 use libc++ and clang toolchain 2016-08-31 16:16:40 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Zach Pomerantz
4d4a68d706 add FIXME about loudness in AudioRingBuffer 2016-08-31 14:44:45 -07:00
Zach Pomerantz
ba96ab25dc inline some AudioRingBuffer definitions 2016-08-31 14:43:44 -07:00
Andrew Meadows
8c520afd1e Merge pull request #8530 from zzmp/fix/skybox-nesting
fix skybox nesting
2016-08-31 14:21:09 -07:00
elisa-lj11
b131338dd0 Injected script to remove other file types from download options 2016-08-31 14:13:26 -07:00
Stephen Birarda
7c45ed043e fix solo render compile 2016-08-31 14:08:46 -07:00
Zach Pomerantz
b740b9802a clean up AudioRingBuffer 2016-08-31 13:57:56 -07:00
Stephen Birarda
c9e18e8d90 spacing repairs in autoscribe_shader_lib 2016-08-31 11:59:51 -07:00
Stephen Birarda
02dcc39185 use numeric limits for recording library compile 2016-08-31 11:56:20 -07:00
Zach Pomerantz
488f49fc40 rm AudioRingBuffer random access mode 2016-08-31 11:37:05 -07:00
Stephen Birarda
7d7cba4dd2 fix networking compile for android setsockopt 2016-08-31 11:30:47 -07:00