Brad Davis
2c35242af1
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-10 13:40:12 -08:00
Brad Davis
7a7aee770c
Switching to binary resources
2018-01-10 13:39:56 -08:00
MiladNazeri
2220b976dc
Merge pull request #12130 from cain-kilgore/21665
...
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
2018-01-10 12:06:58 -08:00
Sam Gateau
d4dc1e352f
Merge pull request #12124 from AndrewMeadows/no-misc-stats
...
more context for update performance stats
2018-01-10 09:10:26 -08:00
Cain Kilgore
330b266ca8
Merge branch 'master' of https://github.com/highfidelity/hifi into 21665
2018-01-10 11:33:06 +00:00
Cain Kilgore
38afc5a25b
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
2018-01-10 11:31:46 +00:00
Brad Davis
b1e95681a9
Cleanup android
2018-01-09 23:30:31 -08:00
Brad Davis
105dffebaf
Fixing UI
2018-01-09 18:36:42 -08:00
Andrew Meadows
8c6edc749a
provide more context for update perf stats
2018-01-09 12:59:32 -08:00
SamGondelman
7c56a9ffb2
model meta is only withTypeShape if visual geometry request fails
2018-01-09 12:43:43 -08:00
Brad Davis
bd5af2b493
Working on android avatar rendering
2018-01-09 11:40:32 -08:00
Brad Davis
a2c2e7d9ff
Fixes to load cubemap
2018-01-08 14:43:54 -08:00
Gabriel Calero
7fbd23f36b
Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr
2018-01-08 17:38:28 -03:00
Gabriel Calero
6050737e7c
Resolving comments in PR
2018-01-08 17:36:08 -03:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr
2018-01-08 12:49:52 -05:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661
...
Laser auto-on with tablet and Web overlays
2018-01-05 14:08:01 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices
2018-01-05 10:54:59 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
...
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
2018-01-05 09:07:54 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
...
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963 )
2018-01-05 08:15:48 -08:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor
...
defang accidental disable of MyAvatar's default motor
2018-01-04 17:44:22 -08:00
David Back
81f3590954
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-04 13:17:07 -08:00
Gabriel Calero
8cac98545a
Fixes for Android
2018-01-04 17:36:10 -03:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener
...
Remove legacy jurisdiction code
2018-01-04 11:52:38 -08:00
David Rowe
7236ac17e2
Merge branch 'master' into 21661
2018-01-04 15:21:00 +13:00
David Back
6c8987d75f
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-03 14:44:52 -08:00
Gabriel Calero
fc62b2d34a
Fix ktx_cache path for android. Load the least js scripts for android
2018-01-03 16:42:18 -03:00
Gabriel Calero
468fc89c3e
Use forward pipeline for android
2018-01-03 16:38:23 -03:00
Gabriel Calero
76b38bebad
Make Interface run in Android
2018-01-03 16:36:11 -03:00
David Rowe
901af8896f
Add "Prefer Stylus Over Laser" setting
2018-01-03 17:54:43 +13:00
Elisa Lupin-Jimenez
a63538c4e9
Merge pull request #12021 from elisa-lj11/poly_api
...
Google Poly API
2018-01-02 10:28:17 -08:00
Atlante45
28f164d7e5
Remove legacy jurisdiction code
2017-12-29 12:46:52 -08:00
Elisa Lupin-Jimenez
3e10d3b436
Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api
2017-12-26 10:18:51 -08:00
David Back
c620f3274c
merge
2017-12-22 16:28:29 -08:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
vladest
7985c39f2a
Adopt path to certain Tablet dialogs to new loading subsystem and path resolver
2017-12-21 22:14:15 +01:00
Alexander Ivash
bd3a056f4e
rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict
...
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
2017-12-21 20:03:38 +00:00
Andrew Meadows
4fb9680f3b
also consider GPU render time for LOD adjust
2017-12-20 17:41:08 -08:00
Andrew Meadows
8e0d367a2d
use full 'present' time for FPS calculation
...
also, refactor LOD adjust logic
2017-12-20 17:41:08 -08:00
Andrew Meadows
6ad3a0598c
remove crufty comment
2017-12-20 08:42:42 -08:00
Andrew Meadows
f82de05f9c
defang accidental disable of MyAvatar's default motor
2017-12-20 08:42:42 -08:00
Elisa Lupin-Jimenez
8a9e5bc39d
Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api
2017-12-19 10:41:39 -08:00
Zach Fox
18d5be147c
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-19 09:48:15 -08:00
Seth Alves
ddbb7a4416
when an avatar-entity's lifetime expires, remove it from avatarEntityData
2017-12-18 14:26:25 -08:00
Brad Davis
9f7b6f543d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-12-18 11:17:07 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
...
Cleanup names of debug stats and trace contexts.
2017-12-18 10:02:42 -08:00
Elisa Lupin-Jimenez
0e57ed5c12
Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api
2017-12-18 10:00:18 -08:00
Elisa Lupin-Jimenez
dc999401d5
Created poly scripting interface template
2017-12-13 16:19:36 -08:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
Andrew Meadows
406bf7898d
cleanup prof stats and trace context names
2017-12-11 11:31:00 -08:00
Andrew Meadows
2538204b1e
expose physics simulation stats to Test JS API
2017-12-11 11:31:00 -08:00
