Commit graph

46631 commits

Author SHA1 Message Date
Seth Alves
a35e527128 try to fix far-trigger 2016-09-01 11:46:08 -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
Stephen Birarda
8977f9ed92 fix else condition in hifiAudioCodec 2016-09-01 10:57:30 -07:00
Stephen Birarda
a94fe62b37 use shared libc++ to reduce shared lib size 2016-09-01 10:56:49 -07:00
Stephen Birarda
ae87f966c8 update ndk version in BUILD_ANDROID 2016-09-01 10:50:10 -07:00
Seth Alves
53ba190ca6 don't do auto-release test unless the hand is equipping 2016-09-01 09:57:46 -07:00
James B. Pollack
a8a9577866 actually remove the math.random 2016-08-31 21:14:50 -07:00
Anthony J. Thibault
823420ae0a Working web entity keyboard
* Missing many keys
* Does not dynamically appear and disappear
2016-08-31 17:57:13 -07:00
elisa-lj11
288ba96795 reverted default scripts to load marketplace.js 2016-08-31 17:47:16 -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
7b8293dc80 repairs for non-android builds after changes 2016-08-31 17:28:09 -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
Seth Alves
2b2d320659 Merge branch 'arrow-actions' of github.com:sethalves/hifi into arrow-actions 2016-08-31 16:53:13 -07:00
Seth Alves
47259ee053 find equip-points with controller position rather than hand 2016-08-31 16:52:46 -07:00
Stephen Birarda
6efa47a04e workaround plugin build failures 2016-08-31 16:45:12 -07:00
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