Dante Ruiz
5bb1b1bbff
remove backup file
2018-01-25 16:26:00 -08:00
Dante Ruiz
537db37b26
removed dead comment
2018-01-25 16:23:35 -08:00
Dante Ruiz
3c12ed3b75
Merge branch 'master' of github.com:highfidelity/hifi into entity-joints
2018-01-25 16:03:15 -08:00
John Conklin II
37b53e3968
Merge pull request #12259 from jherico/fix/render_config
...
Fix a number of bugs caused by the binary resources migration
2018-01-25 14:28:47 -08:00
Brad Davis
ab4e2d99f1
Don't try to set the current directory to a QRC path
2018-01-25 13:04:54 -08:00
Brad Davis
867bb99b51
Fix help screen URL
2018-01-25 13:04:08 -08:00
Brad Davis
d4aef1ea88
Fix URLs in QSS files to use QRC base path
2018-01-25 13:03:42 -08:00
Brad Davis
ac94327ec7
Fix loading of the context overlay information icon
2018-01-25 12:44:55 -08:00
Brad Davis
bde5282541
Fix loading of the render config JSON
2018-01-25 12:43:49 -08:00
Bradley Austin Davis
00538c69cd
Merge pull request #12257 from jherico/source_tree_qml
...
Fix resource loading from source tree
2018-01-25 12:29:24 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription
...
some settings cleanup
2018-01-25 11:30:14 -08:00
Brad Davis
3915a2d4ba
Fix resource loading from source tree
2018-01-25 11:07:39 -08:00
ZappoMan
cb01bd14b9
Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription
2018-01-25 10:39:43 -08:00
Seth Alves
e3f859329d
Merge pull request #12245 from sethalves/fix-asan-build
...
fix asan build
2018-01-25 10:15:29 -08:00
John Conklin II
5ac2e9da15
Merge pull request #12251 from zfox23/commerce_fixMacSecurityPic
...
Fix MacOS Security Pic visibility; fix incorrect button state when changing pic
2018-01-25 09:42:32 -08:00
John Conklin II
1865432b47
Merge pull request #12180 from Zvork/locallights
...
Local lights on translucent objects
2018-01-25 09:36:58 -08:00
Seth Alves
7c09b210c6
Merge pull request #12253 from hyperlogic/bug-fix/avatar-eye-offset
...
Bug fix for incorrect positioned eyes on other peoples avatars
2018-01-25 07:51:35 -08:00
Anthony J. Thibault
a252e90f96
Bug fix for incorrect positioned eyes on other peoples avatars
...
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
2018-01-24 18:58:08 -08:00
Zach Fox
94e1c425ab
Fix MacOS Security Pic visibility; fix incorrect button state when changing pic
2018-01-24 17:03:16 -08:00
John Conklin II
049cf43de0
Merge pull request #12242 from hyperlogic/bug-fix/twisted-knees
...
Bug fix for twisted knees on some avatars.
2018-01-24 16:19:49 -08:00
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
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
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
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
Sam Gateau
7fe4f8480a
Merge pull request #12172 from highfidelity/android
...
Android updates
2018-01-23 14:41:35 -08:00
Zach Fox
1920bedaf3
Fix the text filter in My Purchases
2018-01-23 13:42:38 -08: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
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
Brad Davis
288e753eea
Fix font loading from non-QRC html
2018-01-22 16:48:00 -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
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
Anthony J. Thibault
52f1803ea8
code review feedback
2018-01-22 09:55:39 -08:00
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2
...
Commerce: Pixel-perfect "Send Money" UI
2018-01-22 09:39:23 -08:00
Olivier Prat
43f7bb5f56
Fixed compilation error due to really long shader
2018-01-22 16:50:03 +01:00
Olivier Prat
a807e41ff4
Merge branch 'master' of http://github.com/highfidelity/hifi into locallights
2018-01-22 16:05:54 +01:00
Seth Alves
45a00bebc0
Merge pull request #12217 from luiscuenca/sortOrderFix
...
Fix sortOrder param on tablet buttons
2018-01-21 10:40:25 -08:00
