Commit graph

66599 commits

Author SHA1 Message Date
Sam Gateau
167db14bdb restoring the sampler desc layout to fix ktx cache and fixing the bug shadow when turning global shadow on off 2018-04-11 00:00:11 -07:00
NissimHadar
60f4c6788f Added creation of tests outline .MD file. 2018-04-10 23:04:56 -07:00
NissimHadar
8e063a600b Added recursive creation of MD files. 2018-04-10 20:16:36 -07:00
Stephen Birarda
7ec65e8c0c fix unreadable baked textures in serverless tutorial 2018-04-10 17:02:37 -07:00
Stephen Birarda
0d237f84b0 remove the installer information file during uninstall 2018-04-10 14:56:47 -07:00
Liv
c7be6e0934
Update edit.js
remove the unneeded manual removal of the create setting - it's handled with the rest of the menu items now, and this was causing it to default to false every start..

tested locally but might have gotten in a weird state, so fixing in GH editor.
2018-04-10 12:15:57 -07:00
SamGondelman
bba47ba2b4 materials on client only entities 2018-04-10 11:35:24 -07:00
Seth Alves
d8f0cfa89a
Merge pull request #12797 from druiz17/update-bake-tool
update python bake tool
2018-04-10 10:20:38 -07:00
Liv Erickson
20ee169054 two more spaces 2018-04-10 09:23:14 -07:00
Liv Erickson
6c15577653 style fixes for eslint 2018-04-10 09:18:54 -07:00
Sam Gondelman
d781cf43ee
Merge pull request #12775 from Cristo86/android_jump
Android Control - jump and view sensitivity
2018-04-09 17:32:57 -07:00
SamGondelman
8f65813924 fix asserts on domain switch 2018-04-09 17:10:49 -07:00
Cristian Luis Duarte
1242446c52 Cleanup controller code 2018-04-09 19:57:55 -03:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66
RC66 merge back to master
2018-04-09 13:17:12 -07:00
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
John Conklin II
4dcab95b40
Merge pull request #12828 from Atlante45/fix/skybox-baking
Fix skybox baking
2018-04-09 11:55:51 -07:00
John Conklin II
890a63afb4
Merge pull request #12833 from ElderOrb/FB14015_RC66
Close 'goto' app on pressing 'forward' / 'backward' buttons
2018-04-09 11:42:17 -07:00
John Conklin II
d281d7b2cb
Merge pull request #12819 from Atlante45/fix/location-hostname
Fix location.hostname
2018-04-09 09:42:41 -07:00
John Conklin II
be3d5d03cc
Merge pull request #12808 from ElderOrb/FB13962_RC66
Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)
2018-04-09 09:42:00 -07:00
NissimHadar
7f70511d1a Added a script command to clear caches. 2018-04-08 10:32:35 -07:00
NissimHadar
f610d6b201 Merge branch 'master' of github.com:highfidelity/hifi into speedUp1 2018-04-07 20:36:57 -07:00
NissimHadar
10ce785ad7 If not in DEBUG then do not call qcDebug (in NetworkTexture::ktxInitialDataRequestFinished) 2018-04-07 09:17:08 -07:00
Alexander Ivash
faddc556d7 FB14015 - Go To app does not close when selecting forward and back arrows on desktop 2018-04-07 17:57:22 +03:00
David Rowe
f3a745b6cb Fix initialization order 2018-04-07 18:53:27 +12:00
David Rowe
8093e3e5ae Fix some miscellaneous JSDoc typos 2018-04-07 16:48:05 +12:00
David Rowe
96178404c7 Document that jointTranslations and jointRotations are not cloned 2018-04-07 16:47:38 +12:00
David Rowe
ba020854b6 Add missing "animationSettings.currentFrame" property JSDoc 2018-04-07 16:46:44 +12:00
David Rowe
38d7b81a4f Add missing "get" and JSDoc for "loadPriority" property 2018-04-07 16:46:02 +12:00
David Rowe
6d9b69cd2e Fix cloning a model overlay not cloning animation settings 2018-04-07 16:44:58 +12:00
Clement
6e7f8a2ef6 Fix value collision for baking version 2018-04-06 17:24:16 -07:00
SamGondelman
6ffdae0500 disable etc2/eac compression on 4.1 2018-04-06 15:38:29 -07:00
SamGondelman
5503c7909a fix materials not disappearing on deletion in certain cases 2018-04-06 15:18:21 -07:00
Sam Gateau
ae0af3ab62
Merge pull request #12823 from druiz17/fix-selection-api
fix enableHighlightList  and disableHihglightList function for Selection API
2018-04-06 15:13:15 -07:00
Cristian Luis Duarte
f556c8d3a7 Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-06 18:02:30 -03:00
Dante Ruiz
00713ab225 fix selection api 2018-04-06 14:00:50 -07:00
John Conklin II
02422ba538
Merge pull request #12820 from birarda/bug/store-serverless-with-tilde
RC66 - move file ~ expansion from AddressManager to DomainHandler
2018-04-06 13:31:01 -07:00
Clement
dea5382991 Fix location.hostname 2018-04-06 13:19:07 -07:00
John Conklin II
fe5e797a24
Merge pull request #12816 from SamGondelman/web66
RC66: Possible fix for QML texture leak
2018-04-06 13:08:50 -07:00
Cristian Luis Duarte
bd6f0fd59e Make view/rotation control independent of touchUpdate events rate 2018-04-06 16:17:28 -03:00
John Conklin II
f6721d4ad0
Merge pull request #12802 from birarda/client-only-installer-name
66 fix - installer changes for client only name and clean install
2018-04-06 11:53:22 -07:00
Zach Fox
0c48ccefa4 Clean up failResponse to make it better 2018-04-06 11:41:17 -07:00
Stephen Birarda
1ff7939735 move file ~ expansion from AddressManager to DomainHandler 2018-04-06 11:05:17 -07:00
Zach Fox
af5a68b282 Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError 2018-04-06 10:58:32 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66
Merge back RC66 to master
2018-04-06 10:43:01 -07:00
John Conklin II
c8d109854b
Merge pull request #12800 from huffman/fix/entity-lock
Remove lock file recovery in entity server
2018-04-06 10:04:34 -07:00
John Conklin II
55154b670a
Merge pull request #12801 from sethalves/fix-serverless-sharable
fix -- don't tell steam about serverless domain urls
2018-04-06 10:04:03 -07:00
John Conklin II
384b0a0f41
Merge pull request #12804 from birarda/new-serverless-tutorial
update to serverless tutorial with RC66 fixes
2018-04-06 10:03:03 -07:00
SamGondelman
d38dadaf58 possible fix for qml texture leak 2018-04-06 09:34:00 -07:00
Alexander Ivash
25a44edfce fix conditional bindings
note: unfortunately there is no way to understand whether the item was anchored as even not anchored item has some anchors
2018-04-06 13:22:27 +03:00
Alexander Ivash
3ce00acd16 rebased to the master 2018-04-06 13:22:27 +03:00