Commit graph

46511 commits

Author SHA1 Message Date
Seth Alves
dc31525794 remove some left-over code 2016-08-31 16:39:57 -07:00
Stephen Birarda
85ba0f36cf fix controllers/shared compile for android interface port 2016-08-31 16:34:31 -07:00
Seth Alves
280b603747 remove some leftover code 2016-08-31 16:30:51 -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
Chris Collins
02afa460ff Merge pull request #8557 from jherico/location_bar
Don't show address bar when starting up in a connected state
2016-08-31 16:03:37 -07:00
Stephen Birarda
aea60692de update to latest android.toolchain.cmake 2016-08-31 15:39:46 -07:00
elisa-lj11
5c40e9a8f5 Restored download ability and removed extra file types from download options 2016-08-31 15:39:29 -07:00
Chris Collins
76a7226bba Merge pull request #8550 from zzmp/fix/ambient-skybox
fix washed out white ambient (by restoring tex)
2016-08-31 15:36:55 -07:00
elisa-lj11
9748a17abe checking out to try new branch 2016-08-31 15:22:28 -07:00
Brad Davis
b9a97712d5 Don't show address bar when starting up in a connected state 2016-08-31 15:17:57 -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
Zach Pomerantz
c8ff6ee4cc Merge branch 'master' of github.com:highfidelity/hifi into fix/ambient-skybox 2016-08-31 14:33:57 -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
d113105315 clarify SCRIBE_PATH error message 2016-08-31 14:08:59 -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
fc8fad0753 check SCRIBE_PATH for scribe, add instructions 2016-08-31 13:56:02 -07:00
James B. Pollack
2acf316d1c fix 2016-08-31 13:45:58 -07:00
Stephen Birarda
f67f53a4fa remove the mtc tool that is no longer used 2016-08-31 13:24:21 -07:00
Stephen Birarda
b56a596c29 put android build output in target folder 2016-08-31 13:23:19 -07:00
Ken Cooke
72535ce237 Fix reverbTest.js which was broken due to missing helper script 2016-08-31 13:09:06 -07:00
James B. Pollack
193065eb05 remove auto toggle 2016-08-31 12:36:28 -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
Stephen Birarda
62504d457b put the apk and apk-build folders in root of build 2016-08-31 11:50:39 -07:00
Zach Pomerantz
488f49fc40 rm AudioRingBuffer random access mode 2016-08-31 11:37:05 -07:00
Stephen Birarda
feef76cbab add tools, no plugins, add InterfaceActivity 2016-08-31 11:31:07 -07:00
Stephen Birarda
7d7cba4dd2 fix networking compile for android setsockopt 2016-08-31 11:30:47 -07:00
Stephen Birarda
3f1545008d don't target any plugins for android 2016-08-31 11:19:01 -07:00
Stephen Birarda
51085350f1 remove quazip targeting from android build 2016-08-31 11:06:01 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
Andrew Meadows
e5b63aa18f remove cruft from updateModel() arguments 2016-08-31 10:54:02 -07:00
Stephen Birarda
f1ed7a2e78 initial changes needed for android interface cmake 2016-08-31 10:53:29 -07:00
Seth Alves
7c831f2434 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-31 10:50:31 -07:00
Seth Alves
21b4759b6d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-31 10:27:44 -07:00
Zach Pomerantz
441005bba0 use existing defaults for zoneless keylight 2016-08-31 09:47:53 -07:00
Ryan Downe Karpf
6c853ec77d Merge pull request #8538 from AndrewMeadows/workaround-resolvePath
workaround for Script.resolvePath() bug
2016-08-31 08:59:14 -07:00
Andrew Meadows
12e6920a8d fix syntax error 2016-08-31 08:15:00 -07:00
Zach Pomerantz
372c52fea5 restore default ambient skybox 2016-08-30 17:07:34 -07:00
Zach Pomerantz
0e9ff04c4c fix layered zone applications 2016-08-30 17:00:02 -07:00
Zach Pomerantz
bb39cdafda fix applyPartial for last zone 2016-08-30 17:00:02 -07:00
Zach Pomerantz
abde84b068 fix async skybox tex loading 2016-08-30 17:00:02 -07:00
Seth Alves
c6804ba721 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 16:23:22 -07:00
Seth Alves
3d436d4c26 bump entity protocol version 2016-08-30 16:23:11 -07:00
Ken Cooke
1a6af49b3d Support for even more back-end sample rates 2016-08-30 16:10:11 -07:00
elisa-lj11
d16ef521f4 fixed merge conflicts from Howard's webview fix 2016-08-30 15:33:59 -07:00