Commit graph

64045 commits

Author SHA1 Message Date
Zach Fox
6f54921cb1
Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear
Fix security image index clear after back nav
2018-01-24 13:43:49 -08:00
Andrew Meadows
a0e07a2c4b
Merge pull request #12232 from luiscuenca/showHelp
Fix Interface first launch should show help
2018-01-24 12:11:34 -08:00
humbletim
e8f0df4363 switch to bool per CR feedback 2018-01-24 14:28:22 -05:00
humbletim
3ebf322fcf switch to foreach per CR feeddback 2018-01-24 14:13:34 -05:00
humbletim
63a226f999 make fromScriptValue logic easier to follow for CR; eliminate extra QByteArray conversion 2018-01-24 13:49:58 -05:00
MiladNazeri
3da8e5249c
Merge pull request #12226 from kencooke/audio-options-pitch
Add "pitch" property to allow pitch shifting an audio effect
2018-01-24 10:38:24 -08:00
humbletim
c2ee13931e changes per CR feedback; additional jsdoc 2018-01-24 13:38:10 -05:00
Sam Gateau
b27047f1fc
Merge pull request #12244 from NissimHadar/newAutoTester
Implemented new recursive functionality.
2018-01-24 09:04:57 -08:00
Zach Fox
6566c5c5e6
Merge pull request #12238 from zfox23/commerce_fixPurchasesFilter
Fix the text filter in My Purchases
2018-01-24 08:42:55 -08:00
Olivier Prat
c92a9975ba Merged with master 2018-01-24 09:53:38 +01:00
Seth Alves
64a55f1393 fix asan build 2018-01-23 20:36:11 -08:00
Nissim Hadar
f9e0c724ce Added '?raw=true' suffices where needed. 2018-01-23 18:09:45 -08:00
Nissim Hadar
6bb325f6a2 Implemented new recursive functionality. 2018-01-23 17:25:02 -08:00
Thijs Wenker
c46a115000 attempt to fix ubuntu build 2018-01-24 01:45:53 +01:00
Anthony J. Thibault
991ba7f195 Bug fix for twisted knees on some avatars.
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix.  The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale.  If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity.  To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.
2018-01-23 16:05:43 -08:00
luiscuenca
29dd24b05f Fix GoTo app in HMD mode 2018-01-23 15:50:32 -07:00
Sam Gateau
7fe4f8480a
Merge pull request #12172 from highfidelity/android
Android updates
2018-01-23 14:41:35 -08:00
Thijs Wenker
79dbde6a6f optional auto-complete build (requires NPM installed) 2018-01-23 23:01:59 +01:00
Zach Fox
1920bedaf3 Fix the text filter in My Purchases 2018-01-23 13:42:38 -08:00
humbletim
9fb20bee80 remove extra space 2018-01-23 15:13:53 -05:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
humbletim
76cbc4ee55 separate getAsset fail/then handlers 2018-01-23 14:47:49 -05:00
luiscuenca
fddbf13796 Fix Asset Browser access from Create 2018-01-23 11:12:22 -07:00
Zach Fox
86ce9766f3 Fix security image index clear after back nav 2018-01-23 10:11:23 -08:00
Olivier Prat
8985514a31 Merge branch 'master' of http://github.com/highfidelity/hifi into locallights 2018-01-23 09:51:17 +01:00
humbletim
16ca0eebed fix atp-client AssetUtils:: namespace 2018-01-23 03:36:00 -05:00
humbletim
97889b30d5 remove unnecessary lambda capture 2018-01-23 03:21:19 -05:00
humbletim
51d8b9aea6 update and expand on js unit tests 2018-01-23 03:12:50 -05:00
humbletim
3a735c1fc7 CR feedback and code cleanup 2018-01-23 03:12:26 -05:00
luiscuenca
3c12ae8925 Fix Edit/Asset Browser in HMD mode 2018-01-22 20:52:18 -07:00
Anthony Thibault
a1009f3332
Merge pull request #12231 from hyperlogic/bug-fix/scripted-avatar-overflow
Fix for assignment-client scripted-agent crashes
2018-01-22 17:47:34 -08:00
John Conklin II
623d552549
Merge pull request #12233 from hyperlogic/bug-fix/scripted-avatar-overflow-rc63
RC63: Fix for assignment-client scripted-agent crashes
2018-01-22 17:21:16 -08:00
Thijs Wenker
67effd1ad1 create folder 2018-01-23 02:15:31 +01:00
Brad Davis
288e753eea Fix font loading from non-QRC html 2018-01-22 16:48:00 -08:00
Thijs Wenker
5885569644 fix UNIX jsdoc command order 2018-01-23 01:29:52 +01:00
Anthony J. Thibault
5926384076 Take defaultPoseFlag section into account when computing byteArraySize.
(cherry picked from commit c13c9f301c)
2018-01-22 16:02:35 -08:00
luiscuenca
6d6950deca Fix Interface first launch should show help 2018-01-22 16:25:58 -07:00
Dante Ruiz
2d70e76546 fix merge conflict 2018-01-22 15:15:11 -08:00
Brad Davis
6a91d549ce Fix stylus overlay 2018-01-22 15:08:26 -08:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
Anthony J. Thibault
c13c9f301c Take defaultPoseFlag section into account when computing byteArraySize. 2018-01-22 14:57:09 -08:00
Thijs Wenker
e8955fcd32 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 2018-01-22 23:37:24 +01:00
Atlante45
5bd0cc1a97 Merge branch 'stable' of https://github.com/highfidelity/hifi into RC63 2018-01-22 13:40:17 -08:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703
Revert "Display both lasers on tablet and Web surfaces"
2018-01-22 12:27:00 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master
Fix lockup when no midi devices present.
2018-01-22 11:25:46 -08:00
John Conklin II
8d028d4bd4
Merge pull request #12220 from RebeccaStankus/API-Debugger-UI
Updated UI to fit Toolkit Standards
2018-01-22 10:30:48 -08:00
Thijs Wenker
f4e6606c8d fix MyAvatar JS API typo 2018-01-22 19:01:13 +01:00
Thijs Wenker
4ff3c9e046 fix jsdoc output folder 2018-01-22 19:00:45 +01:00
Anthony J. Thibault
52f1803ea8 code review feedback 2018-01-22 09:55:39 -08:00