Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-06 02:25:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46298 commits 25 branches 0 tags 1.1 GiB
Commit graph

46298 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
cf242eca9f Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet 
Marketplace tablet is a bit larger and lower DPI.
 2016-09-02 08:45:29 -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
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
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
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
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
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
Brad Davis
b9a97712d5 Don't show address bar when starting up in a connected state 2016-08-31 15:17:57 -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
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
Stephen Birarda
fc8fad0753 check SCRIBE_PATH for scribe, add instructions 2016-08-31 13:56:02 -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
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
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
Stephen Birarda
f1ed7a2e78 initial changes needed for android interface cmake 2016-08-31 10:53:29 -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
Brad Davis
3ca01a1e4b Merge pull request #8540 from howard-stearns/restore-WebView-tab-handler 
restore onNewViewRequested
 2016-08-30 15:21:27 -07:00
howard-stearns
8824507523 new smaller WebView.qml 2016-08-30 14:37:08 -07:00
howard-stearns
564769f7d3 move WebView.qml to baseWebView.qml 2016-08-30 14:07:34 -07:00
howard-stearns
232ac74b26 back to master version 2016-08-30 14:06:20 -07:00
howard-stearns
c5b998a2a8 use new hook in marketplace code 2016-08-30 12:18:03 -07:00
Chris Collins
188f5d5ace Merge pull request #8545 from ZappoMan/fbx2016 
support for fbx2016 format
 2016-08-30 11:36:25 -07:00
Brad Davis
eb0a8db0af Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam 
When trigger is pulled, snap search beam to correct length instead of animating
 2016-08-30 11:13:58 -07:00
Stephen Birarda
74fac8c7c9 Merge pull request #8512 from birarda/shareable-address 
add shareable address from default name, leverage for steam join/invite
 2016-08-30 09:35:24 -07:00
Brad Hefta-Gaub
7397b884e7 support for fbx2016 format 2016-08-30 09:07:39 -07:00