Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping
...
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
...
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
SamGondelman
13ece79476
merge with master
2019-02-13 16:30:22 -08:00
SamGondelman
77a8ddb3f0
Merge remote-tracking branch 'upstream/master' into materialMapping
2019-02-11 16:35:05 -08:00
David Rowe
5428bb19dc
Add "Avatar Script" JSDoc API classification
2019-02-12 11:49:49 +13:00
SamGondelman
f7a487a020
move materialcache et al to material-networking library
2019-02-08 10:28:07 -08:00
SamGondelman
25ca52d892
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:48:13 -08:00
danteruiz
30bd9774b2
script engine to load platform specific files
2019-02-05 13:11:54 -08:00
SamGondelman
b80d2a9b06
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-01 13:33:04 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
...
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
2019-01-29 13:12:51 -08:00
Ken Cooke
fa08e42da6
Restore legacy attenuation behavior for system sounds and scripts that do not set position.
...
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
2019-01-29 11:21:02 -08:00
SamGondelman
5ce8f566cc
more overlay wip
2019-01-25 11:10:11 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities
...
case 20595: case 20563: Do not delete local entities when switching domains.
2019-01-17 11:25:58 -08:00
Antonina Savinova
560c44a74a
Merge pull request #14697 from howard-stearns/more-log-purge
...
log purge
2019-01-15 16:19:03 -08:00
Dante Ruiz
e7d3844620
making pre review requests
2019-01-14 11:14:57 -08:00
Seth Alves
6ca9ab6fba
avoid shutdown crash
2019-01-11 15:53:49 -08:00
Seth Alves
36040597ba
rename variable for consistency
2019-01-11 15:53:49 -08:00
Seth Alves
6589db628a
fix a couple shutdown crashes and a class of asan warning
2019-01-11 15:53:49 -08:00
Howard Stearns
62ed84aa19
more log purge
2019-01-11 12:34:44 -08:00
unknown
f8f13e974d
property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties
2019-01-02 11:12:10 -08:00
Wayne Chen
4c9c785c24
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-10 07:57:44 -08:00
Brad Hefta-Gaub
a005f9e9ab
Merge pull request #14546 from danteruiz/fix-reload-scripts
...
fix realod all scripts functionality broken by PR14478
2018-12-09 17:30:36 -08:00
Dante Ruiz
177a94b9a9
fix realod all scripts functionality
2018-12-07 11:48:03 -08:00
Clement
7723261cb9
Remove deferred script loading logic
2018-12-05 14:08:30 -08:00
Wayne Chen
a2a4d2ff89
removing trailing debug
2018-12-05 08:21:11 -08:00
Wayne Chen
07599c02c8
true reversion of scrips param
2018-12-05 08:16:54 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2
2018-11-28 19:10:20 -08:00
Dante Ruiz
c4a9ca3445
fix interface crashing when reloading scripts
2018-11-27 09:32:37 -08:00
Wayne Chen
b8d8710604
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-19 09:02:16 -08:00
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -08:00
Clement
7192aed131
Rework audio data memory ownership model
2018-11-14 14:45:18 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
sabrina-shanman
753557736e
Merge branch 'master' into hfm_library
2018-11-12 15:03:30 -08:00
Zach Fox
e0ca535853
CR round 2
2018-11-08 10:08:42 -08:00
Wayne Chen
f683a51ef5
allowing qApp to load overlay/load default scripts if runningscripts empty
2018-11-07 16:32:06 -08:00
sabrina-shanman
2c94d1f620
Fix hfm not linking in script-engine for Android build
2018-11-07 09:24:42 -08:00
Roxanne Skelly
cef7000a72
Case 19754 - Remove logging URLs and related file locations.
...
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
Wayne Chen
8797c40d94
cleanup unused functions
2018-11-06 15:04:51 -08:00
Clement
0ca0a6f3be
Fix JSDoc arrays
2018-11-06 12:57:17 -08:00
Clement
4e802b0f3f
Add JSDoc comments
2018-11-06 11:59:15 -08:00
Clement
37c69ebe62
Add audio soloing feature
2018-11-05 19:02:26 -08:00
sabrina-shanman
2801f324b7
Switch references to HFM to the HFM lib and remove HFM classes in FBX
2018-11-05 12:47:34 -08:00
Wayne Chen
ed847203ea
wip for getting hmd overlay
2018-10-29 11:33:28 -07:00
Kerry Ivan Kurian
e7d1c2873a
Merge branch 'master' into log-resource-requests-2
2018-10-23 13:46:59 -07:00
Brad Davis
c8e664a0a1
New SPIRV Shader toolchain
2018-10-23 10:40:12 -07:00
Zach Fox
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -07:00
Zach Fox
2f37a2b1a1
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-18 11:12:26 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3
2018-10-02 08:58:04 -07:00
