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
Brad Hefta-Gaub
15fcf66d0e
Merge pull request #12022 from AndrewMeadows/lod-auto-adjust-002
...
more responsive LOD auto-adjust
2017-12-20 19:23:39 -08:00
Andrew Meadows
c1906215ba
add comments
2017-12-20 17:41:08 -08:00
Andrew Meadows
721e9d426a
restore signals on LOD change
2017-12-20 17:41:08 -08:00
Andrew Meadows
5c11ae3469
bump desktop min FPS from 20 to 30 msec
2017-12-20 17:41:08 -08:00
Andrew Meadows
4fb9680f3b
also consider GPU render time for LOD adjust
2017-12-20 17:41:08 -08:00
Andrew Meadows
9c4a0c8c70
tweak LOD adjustment logging
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
5c84c5f845
measure average time of 'present'
2017-12-20 17:41:08 -08:00
Andrew Meadows
7a9d566e02
remove unnecessary whitespace
2017-12-20 17:41:08 -08:00
John Conklin II
aad89e87be
Merge pull request #12032 from birarda/rc-61-merge-back
...
merge back for stable to master after RC-61
2017-12-20 17:37:31 -08:00
Melissa Brown
fddb192af8
Merge pull request #11961 from humbletim/add-midi-control-change
...
forward MIDI_CONTROL_CHANGE events
2017-12-20 17:11:08 -08:00
Zach Fox
d53baf3e40
Merge pull request #12030 from zfox23/commerce_fixTextInputErrorStatus
...
Fix error state for Commerce passphrase TextInputs
2017-12-20 16:58:12 -08:00
Stephen Birarda
85ecfbabab
Merge remote-tracking branch 'upstream/stable' into rc-61-merge-back
2017-12-20 16:54:20 -08:00
Zach Fox
e02e6790fe
Fix error state for Commerce passphrase TextInputs
2017-12-20 13:46:02 -08:00
Ryan Downe Karpf
b6d8434b55
Merge pull request #11969 from highfidelity/RC-61
...
Beta Release 61 - Includes up to Developer Release 7548
2017-12-20 11:10:57 -08:00
Zach Fox
08edc52932
Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel
...
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-20 09:18:10 -08:00
Zach Fox
297a3df63c
Merge pull request #11815 from zfox23/commerce_QmlWhitelist
...
QML Whitelisting + Commerce Integration
2017-12-19 18:07:14 -08:00
Sam Gondelman
5f5bf94f2a
Merge pull request #12008 from AndrewMeadows/fix-animation-crash
...
fix interface crash for bad QVector index in animation loop
2017-12-19 17:59:47 -08:00
NissimHadar
88ade87c71
Merge pull request #11774 from NissimHadar/hazeOnTransparent
...
Haze on transparent
2017-12-19 17:20:14 -08:00
Zach Fox
a72ed27a25
CR feedback
2017-12-19 16:57:48 -08:00
Zach Fox
5da49d156e
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-19 16:26:58 -08:00
Zach Fox
91ed531421
Merge pull request #12023 from zfox23/commerce_fixAvailabileBug
...
Fix bug preventing 'get' buttons from working in Marketplace
2017-12-19 16:24:56 -08:00
Zach Fox
ed5da4f83b
Fix bug preventing 'get' buttons from working in marketplace
2017-12-19 15:07:50 -08:00
Sam Gateau
01ff08de1d
Merge pull request #12004 from SamGondelman/burp2
...
Fix caching of ktx texture files
2017-12-20 04:38:54 +07:00
SamGondelman
9aed825328
Merge remote-tracking branch 'upstream/master' into burp2
2017-12-19 11:39:21 -08:00
Nissim Hadar
2c6868b03e
Pass keylight direction as parameter to the shader.
2017-12-19 11:12:27 -08:00
John Conklin II
09e9707404
Merge pull request #12018 from sethalves/pr-12015-for-rc-61
...
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 10:53:01 -08:00
Nissim Hadar
de7edc68d4
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeOnTransparent
2017-12-19 10:47:16 -08:00
Andrew Meadows
bad2c1df76
proper modulus of animation frame
2017-12-19 10:40:17 -08:00
Andrew Meadows
559cb33563
remove incorrect comment
2017-12-19 10:40:17 -08:00
Andrew Meadows
661a63bd0c
fix crash for bad QVector index
2017-12-19 10:40:17 -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
Howard Stearns
f8cef6631b
Merge pull request #11995 from birarda/bug/fix-connection-reset
...
make udt::Connection live as long as node connection
2017-12-19 09:43:54 -08:00
Seth Alves
63ac426bf2
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 08:13:44 -08:00
Nissim Hadar
73f16b1b2a
Merge branch 'hazeOnTransparent' of https://github.com/NissimHadar/hifi
2017-12-19 07:59:12 -08:00
Brad Hefta-Gaub
04fa4d2999
Merge pull request #12016 from SamGondelman/versionFix
...
Bump protocol version
2017-12-19 07:30:55 -08:00
John Conklin II
d4e44fec56
Merge pull request #12015 from sethalves/fix-av-collision-after-grab
...
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 07:01:37 -08:00
David Kelly
4fc69f8067
Merge pull request #11988 from davidkelly/dk/soldOut
...
Handle sold out items a bit better
2017-12-19 07:43:57 -07:00
SamGondelman
90d0e9dc32
bump protocol version
2017-12-18 18:35:15 -08:00
Anthony Thibault
7ea1f3b911
Merge pull request #12013 from sethalves/delete-expired-av-ents
...
when an avatar-entity's lifetime expires, remove it from avatarEntityData
2017-12-18 17:35:42 -08:00
Sam Gateau
8f6929fe53
Merge pull request #12011 from SamGondelman/skybox
...
Fix equirectangular skybox loading
2017-12-19 08:32:22 +07:00
Seth Alves
ca45c4e8da
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-18 17:30:56 -08:00
Thijs Wenker
3a55fcfaf5
Merge pull request #12014 from thoys/feat/list-assignment-types
...
list assignment types in assignment-client help
2017-12-18 16:55:57 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2
...
Commerce: Add Passphrase Auth Status data tracking
2017-12-18 16:26:59 -08:00
Thijs Wenker
1bfb62bd7f
list assignment types in assignment-client help
2017-12-18 15:32:32 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning
...
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
2017-12-18 15:20:23 -08:00
John Conklin II
9fc47c8e52
Merge pull request #12010 from SamGondelman/burp61
...
Fix equirectangular skybox loading (RC-61)
2017-12-18 14:47:27 -08:00
Seth Alves
ddbb7a4416
when an avatar-entity's lifetime expires, remove it from avatarEntityData
2017-12-18 14:26:25 -08:00
Zach Fox
afd3cf7045
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-18 14:08:09 -08:00
