Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError
...
Commerce: Fix Certificate Info error
2018-04-11 09:38:43 -07:00
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
samcake
68e45127e1
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-10 17:57:22 -07:00
Stephen Birarda
7ec65e8c0c
fix unreadable baked textures in serverless tutorial
2018-04-10 17:02:37 -07:00
SamGondelman
d841eeb6e9
Merge remote-tracking branch 'upstream/master' into androidPrimitives
2018-04-10 16:52:08 -07:00
SamGondelman
0c069574c5
forward pipelines for primitives
2018-04-10 15:56:08 -07:00
Stephen Birarda
0d237f84b0
remove the installer information file during uninstall
2018-04-10 14:56:47 -07:00
Simon Walton
ca5720c015
Take out superfluous DependencyManager::set<tracing::Tracer>()
2018-04-10 13:52:46 -07:00
Simon Walton
cf3648409d
Allow duration for tracing, other fixes
2018-04-10 13:14:52 -07:00
Simon Walton
513a4875f0
Move --traceFile option to start of main()
2018-04-10 13:13:47 -07:00
Simon Walton
9b6306601a
Merge Clement's PR12700 diffs for early trace start
2018-04-10 13:13:46 -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 Gateau
6acda83f5c
Bringing the test to the workload ui
2018-04-09 23:13:39 -07:00
Sam Gateau
9cb918a4ad
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-09 20:03:26 -07:00
Sam Gateau
62d5229811
Merge pull request #12842 from samcake/workload
...
Workload: building a test script for the physics /simulation workload
2018-04-09 19:56:18 -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
samcake
87b3f9bd1f
More featuers for the view of the workload and test scrtpts to stress the system)
2018-04-09 17:27:55 -07:00
samcake
72649f5c06
More featuers for the view of the workload and test scrtpts to stress the system)
2018-04-09 17:27:40 -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
samcake
49977d7fc3
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-04-06 17:42:45 -07:00
Sam Gateau
476b75488c
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate
...
Workload: low hanging fruit optimization: don't unneccessarily update() entities
2018-04-06 17:38:54 -07:00
Andrew Meadows
9c84f05275
rollback change to MaterialEntityItem, we'll fix later
2018-04-06 17:32:57 -07:00
Clement
6e7f8a2ef6
Fix value collision for baking version
2018-04-06 17:24:16 -07:00
Andrew Meadows
353afb47b3
more correct needsToCallUpdate() implementations
2018-04-06 16:53:08 -07:00
Andrew Meadows
b515fd50fc
remove unused data member
2018-04-06 16:52:49 -07:00
samcake
694baa81e8
removing logging around physics
2018-04-06 16:12:02 -07:00
Andrew Meadows
b523b2a81a
more correct proxyID validation
2018-04-06 15:41:38 -07:00