Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 14:33:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
78274 commits 75 branches 59 tags 1.2 GiB
Commit graph

32346 commits

Author SHA1 Message Date
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
SamGondelman
a66c515c2a fix url issue and always generateIrradiance 2019-04-25 11:36:29 -07:00
David Rowe
e7eaa7815c Misc. JSDoc fixes 2019-04-25 22:01:03 +12:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
David Rowe
62cf42732b Fix up deprecated notice 2019-04-25 17:34:49 +12:00
Angus Antley
ea173b8d61 more time for talk ease in and updated json random choice times 2019-04-24 21:29:55 -07:00
Howard Stearns
da1597c5d1
Merge pull request #15327 from Atlante45/fix/warnings 
Case 22065: Fix mac warnings
 2019-04-24 20:32:29 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Shannon Romano
70c2b8b8c4
Merge pull request #15443 from Atlante45/fix/asset-server-baking-master 
Case 22333: Master: Fix asset server auto-baking
 2019-04-24 16:30:14 -07:00
Dante Ruiz
0bdc37859d Refresh Rate Controller 2019-04-24 16:16:08 -07:00
Angus Antley
93b49a86db fixed build error 2019-04-24 15:50:00 -07:00
Angus Antley
45f4cb2018 added animation files and updated ease in function in rig 2019-04-24 14:56:38 -07:00
Shannon Romano
1b67042091
Merge pull request #15428 from raveenajain/gltf_debug 
case 22347: glTF move debug code
 2019-04-24 10:31:49 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-24 09:52:12 -07:00
Shannon Romano
839aa0ebe8
Merge pull request #15446 from amerhifi/questCrashFix 
Case 22340 : turning on blit present for quest
 2019-04-24 09:24:24 -07:00
Shannon Romano
26e65b7ca6
Merge pull request #15444 from SamGondelman/warning 
Case 22262: Comment out QScript type warning
 2019-04-24 09:22:58 -07:00
Shannon Romano
0768cd58dc
Merge pull request #15427 from SamGondelman/materialMap 
Case 22079: Bake existing materialMap in FST
 2019-04-24 09:16:12 -07:00
Angus Antley
5aee2f35f0 updated the ease in function 2019-04-24 08:27:36 -07:00
amantley
7f3101eefb working on the ease in function for the talk idle 2019-04-23 18:13:15 -07:00
SamGondelman
3b746384ca really fix texture baking, and turn off irradiance generation during baking 2019-04-23 16:01:31 -07:00
Clement
86b6341098 Add error reporting + Make temp dir erase safer 2019-04-23 14:54:12 -07:00
Atlante45
329a76d4d6 Fix unix warning 2019-04-23 14:54:12 -07:00
Atlante45
3605b3d560 Patch interface redirect code 2019-04-23 14:54:12 -07:00
SamGondelman
b1f00d6f22 attempt to handle atp redirects from .fbx to .baked.fst 2019-04-23 14:54:10 -07:00
amer cerkic
8a7503ef51 turning on blit present for quest 2019-04-23 11:45:25 -07:00
luiscuenca
b10aca10d4
Fix code standard issues 2019-04-23 09:45:39 -07:00
Shannon Romano
7a9dd49eed
Merge pull request #15411 from Zvork/shadow 
Case 22117: Shadows Appear Incorrectly Placed Relative to Avatars
 2019-04-23 09:32:53 -07:00
Simon Walton
c03839e49f Fix threaded issues; add verify failed flag to avatar identity packet 
Bump packet version
 2019-04-23 09:26:17 -07:00
SamGondelman
9deb4e47ad comment out warning 2019-04-23 08:46:54 -07:00
David Rowe
7dde764907 Merge branch 'master' into M21956 
# Conflicts:
#	libraries/audio/src/Sound.h
 2019-04-23 14:58:23 +12:00
David Rowe
fbc8e1c347 Miscellaneous fixes 2019-04-23 14:49:14 +12:00
David Rowe
6e09c4885f Review updates 2019-04-23 14:35:25 +12:00
SamGondelman
4fc97effda combine snapshotOperator lists per sam's suggestions 2019-04-22 16:22:18 -07:00
Anthony Thibault
d7babe6fbf Added data rates for new hand controller section 2019-04-22 16:16:55 -07:00
Angus Antley
bac5cf9bbb fixed the debug state info updating 2019-04-22 14:35:04 -07:00
Angus Antley
6d9e4188eb added AnimRandomSwitch class and got it integrated with a new avatar-animation.json that includes random idles and random fidgets and random talk 2019-04-22 14:14:17 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
SamGondelman
7245d1a037 handle texturebakers with same url but different usage 2019-04-22 13:24:34 -07:00
luiscuenca
9c90a2b684
more fixes 2019-04-22 13:17:42 -07:00
Olivier Prat
8dabcb76b8 Taking into account comments 2019-04-22 21:30:57 +02:00
luiscuenca
20cac4cd4d
Rotation fix and refactor 2019-04-22 11:38:27 -07:00
Anthony Thibault
0c0b847666 First version of faux joint optimizations 
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.

Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
 2019-04-22 11:02:13 -07:00
Sabrina Shanman
2a7ef5c5bb
Merge pull request #15426 from sabrina-shanman/bug_oven_texture-scale_master 
(case 22282) Fix some baked models not preserving texture scale (master)
 2019-04-22 09:52:36 -07:00
Clement
0f2dbd7b6a Fix mac warnings 2019-04-19 20:14:15 -07:00
Sabrina Shanman
16da80b9b6
Merge pull request #15425 from sabrina-shanman/bug_hfm_main-thread 
(case 22011) Fix model processing occurring on main thread
 2019-04-19 15:40:54 -07:00
SamGondelman
703a4a5700 call leaveEntity when script stops 2019-04-19 15:18:05 -07:00
raveenajain
f2312f77c1 remove unused var 2019-04-19 22:47:47 +01:00
raveenajain
65f4fac993 move debug code 2019-04-19 21:40:57 +01:00
SamGondelman
080cb36170 bake existing materialMap 2019-04-19 13:01:47 -07:00
Shannon Romano
c09e0eca1d
Merge pull request #15416 from SamGondelman/transparent83 
Case 22283: Fix transparent textures on baked assets
 2019-04-19 12:35:20 -07:00
sabrina-shanman
05a2b11c54 Fix mat4FromVariant 2019-04-19 11:29:28 -07:00
sabrina-shanman
74b4b47a2a Save some bandwidth by not including unity texture transforms in material jsons 2019-04-19 11:29:28 -07:00
sabrina-shanman
9cb5ed888a Remove unnecessary hasTexcoordTransform 2019-04-19 11:29:28 -07:00
sabrina-shanman
7b74561b27 Fix baked models not preserving scale in some cases 2019-04-19 11:29:27 -07:00
SamGondelman
b9934bce70 Merge remote-tracking branch 'upstream/master' into materialMap 2019-04-19 11:27:04 -07:00
Sam Gondelman
38ca699ff5
Merge pull request #15406 from sabrina-shanman/bug_oven_fst-rebake 
(case 22271) (RC83) Fix baked models unable to rebake
 2019-04-19 10:44:54 -07:00
Shannon Romano
4962bc8c10
Merge pull request #15395 from SamGondelman/oven 
Case 22213: Fix materialJSON paths in domain baker
 2019-04-19 10:39:42 -07:00
sabrina-shanman
7333b02f34 Fix model processing occurring on main thread 2019-04-19 09:48:30 -07:00
Shannon Romano
d5ab49c64c
Merge pull request #15402 from sabrina-shanman/hfm_bug_model-materials_master 
(case 22216) Fix Interface not loading some baked models correctly
 2019-04-19 08:53:40 -07:00
Olivier Prat
7d412f9109 Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias. 2019-04-19 11:03:43 +02:00
Sam Gondelman
2604afa454
Merge pull request #15396 from SamGondelman/oven2 
Case 22244: Fix oven crash (RC83)
 2019-04-18 20:22:36 -07:00
David Rowe
6837d7e5e8 Midi JSDoc 2019-04-19 12:26:21 +12:00
SamGondelman
27f1255899 fix transparent textures on baked assets 
(cherry picked from commit b89dbf8346)
 2019-04-18 11:23:45 -07:00
Olivier Prat
39d03ce87a Removed magic number 2019-04-18 19:19:38 +02:00
SamGondelman
0d914a695b wip 2019-04-18 09:06:02 -07:00
Olivier Prat
9d0706ec8b Merge branch 'master' of https://github.com/highfidelity/hifi into shadow 2019-04-18 11:06:35 +02:00
Olivier Prat
3cb9c518ea Exposed max shadow distance and a shadow bias scale parameter in graphics::Light 2019-04-18 11:06:12 +02:00
sabrina-shanman
d80b40e5a5 Fix baked FSTs unable to be rebaked by creating an FST in the original 
output folder
 2019-04-17 16:37:01 -07:00
Shannon Romano
bbab0b59b7
Merge pull request #15332 from raveenajain/gltf_brainstem_fix 
Case 22060 fix model
 2019-04-17 16:29:25 -07:00
SamGondelman
e7d12dc4f8 fix snapshots and preview 2019-04-17 15:43:05 -07:00
sabrina-shanman
693cdabc2c Small style fix for materialID bounds check in FBXSerializer_Mesh.cpp 2019-04-17 13:26:19 -07:00
sabrina-shanman
53f74abd49 Fix another Interface issue loading baked models 2019-04-17 13:24:04 -07:00
sabrina-shanman
343b853b59 Fix Interface not loading some baked models correctly 2019-04-17 13:24:04 -07:00
sabrina-shanman
b711ee8b8a Fix MaterialBaker not including names in baked multi-materials 2019-04-17 13:24:04 -07:00
raveenajain
2fab5a0945 parents, skeleton, break fix 2019-04-17 21:14:44 +01:00
Shannon Romano
da314694b4
Merge pull request #15271 from amantley/overrideHandAnimsSquashed 
Allow Hand Animations to be Overridden
 2019-04-17 11:53:41 -07:00
Shannon Romano
5d1c1010c5
Merge pull request #15294 from sethalves/fix-refreshGroupsCache-asan-error 
case 21977: fix asan reported error when returning QString reference to refreshGroupsCache
 2019-04-17 11:43:12 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
amantley
035c8a687d fixed merge conflict 2019-04-17 10:16:39 -07:00
raveenajain
104ed758b9 re-order nodes, cluster update 2019-04-17 17:52:48 +01:00
Shannon Romano
f2069a2cd7
Merge pull request #15344 from amantley/bugTwoBoneOverFlow 
Fixed out of range error in AnimTwoBoneIK
 2019-04-17 09:51:09 -07:00
Olivier Prat
3fc711dba2 Added opacity mask to shadow casters 2019-04-17 12:35:24 +02:00
Olivier Prat
5d7b149a9e Switched to clamped tangent for shadow slope bias 2019-04-17 11:12:59 +02:00
Olivier Prat
ae20a5d439 Fixed crash in debugShadow.js 2019-04-17 09:47:33 +02:00
luiscuenca
1ad197df26
Send avatar skeleton trait 2019-04-16 17:40:43 -07:00
SamGondelman
2d5cfbf4f5 fix oven crash 2019-04-16 15:16:26 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check 
Better head vs camera checks for avatar head cauterization
 2019-04-16 15:07:46 -07:00
Shannon Romano
517710bcb8
Merge pull request #15388 from r3tk0n/running-fix 
Case 22192: Adjust run speed constants.
 2019-04-16 14:51:23 -07:00
Shannon Romano
7de56092f8
Merge pull request #15376 from SimonWalton-HiFi/delayed-node-adds-tweaks 
Clear delayed Node-adds upon restart
 2019-04-16 11:27:15 -07:00
Shannon Romano
4b91363226
Merge pull request #15375 from SimonWalton-HiFi/pingpunch-lower-rate 
Increase ping interval for unconnected Nodes
 2019-04-16 11:22:30 -07:00
SamGondelman
23918258d9 fix materialJSON paths in domain baker 2019-04-16 10:30:09 -07:00
David Rowe
7af55de43d Messages JSDoc update 2019-04-16 14:20:40 +12:00
r3tk0n
d0abb86366 Reversed costants because no sleep. >_< 2019-04-15 17:26:22 -07:00
David Rowe
60298245da Menu JSDoc update 2019-04-16 11:24:24 +12:00
Shannon Romano
4d255fce93
Merge pull request #15373 from sabrina-shanman/hfm_crash_textures 
(case 21906) Fix TextureBaker failures and heap corruption in MaterialBaker
 2019-04-15 15:12:39 -07:00
raveenajain
f458427067 Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_brainstem_fix 2019-04-15 12:59:43 -07:00
raveenajain
3c84a46cba update how nodes are initially parsed 2019-04-15 20:27:54 +01:00
r3tk0n
12d7e35722 Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release. 2019-04-15 10:56:07 -07:00
r3tk0n
a40fdf3f77 Merge branch 'master' of https://github.com/highfidelity/hifi into running-fix 2019-04-15 09:47:26 -07:00
r3tk0n
87deb348a8 Adjust run speed constants. 2019-04-12 14:07:06 -07:00
Shannon Romano
a0ddadc0e7
Merge pull request #15320 from ctrlaltdavid/M21989 
Case 21989: AvatarList and AvatarManager JSDoc
 2019-04-12 12:27:29 -07:00
Shannon Romano
11e5f0a101
Merge pull request #15323 from ctrlaltdavid/M22052 
Case 22052: Camera JSDoc
 2019-04-12 12:26:39 -07:00
Shannon Romano
5e8e44f97b
Merge pull request #15316 from amantley/bugSetRotation 
Bug fixed for MyAvatar.getJointRotation(name, quat) and MyAvatar.setJointRotation(name, quat)
 2019-04-12 12:23:03 -07:00
Simon Walton
7180d8b99b Clear delayed Node-adds upon restart 2019-04-11 17:56:27 -07:00
Simon Walton
a5e94eea75 Increase ping interval for unconnected Nodes 2019-04-11 17:36:09 -07:00
Ryan Huffman
f2474b4d2b Fix lack of ranges on numerical types in Create 2019-04-11 14:20:52 -07:00
Anthony J. Thibault
7aeb4bca87 Include head rotation in getEyeModelPositions 2019-04-11 14:05:15 -07:00
sabrina-shanman
39cf3c3d83 Fix TextureBaker failures and heap corruption in MaterialBaker 2019-04-11 13:44:26 -07:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
Saracen
3dde53f743 Friendlier and more understandable naming. 2019-04-11 03:57:34 +01:00
Saracen
eb8e912808 Added missing checks to ground and takeoff state. 2019-04-11 03:29:58 +01:00
David Rowe
38e21dcaa2 Doc review 2019-04-11 11:04:02 +12:00
David Rowe
ca3f45163f Merge branch 'master' into M21989 2019-04-11 10:37:34 +12:00
David Rowe
617617736e Merge branch 'master' into M22052 2019-04-11 10:24:27 +12:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize 
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
 2019-04-10 12:29:40 -07:00
Sam Gateau
c33efdf9e0
Merge pull request #15282 from kitely/fix-ray-local-entities 
Case 21883: Fix safe landing code improperly finding local entities
 2019-04-10 12:28:07 -07:00
Sam Gateau
6f4f7335dc
Merge pull request #15307 from kencooke/audio-gain-interpolation 
Case 22019: Audio clicks/pops when gain is rapidly changing
 2019-04-10 12:26:59 -07:00
Sam Gateau
89ff63e8bb
Merge pull request #15267 from jherico/fix/tracing 
Case 21930: Don't change OpenGL context state every frame
 2019-04-10 09:42:09 -07:00
David Rowe
d587f1227d Add ResourceRequestObserver JSDoc 2019-04-10 12:09:48 +12:00
David Rowe
59533d0f59 Controller JSDoc update 2019-04-10 08:51:14 +12:00
Saracen
bce80130bd Allow players to disable automatic falling to flight threshold. 2019-04-09 21:07:17 +01:00
Anthony J. Thibault
02d5769991 Better head vs camera checks for avatar head cauterization 
* cameraInsideHead() check now uses detailed avatar collision when possible.
* head is now more constantly hidden in first person camera mode
* getEyeModelPositions() uses a better estimate when avatar eye joints are missing.
* moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp
* added isPlayingOverrideAnimation() method to Rig class
 2019-04-09 12:57:03 -07:00
raveenajain
c970a58715 comments, edge case for skinned 2019-04-09 17:29:07 +01:00
SamGondelman
a50cca006e use # instead of ? for material URL name selection 2019-04-08 23:45:47 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
raveenajain
40fe156c8b naming, condition 2019-04-08 19:54:31 +01:00
luiscuenca
0d92ec1f5b
Fix comparison warning 2019-04-08 11:24:59 -07:00
luiscuenca
d9eaa2076d
Fix out of bounds when the model url is incorrect 2019-04-08 10:36:58 -07:00
John Conklin II
c902e8392c
Merge pull request #15343 from luiscuenca/fixSimJoints 
Fix error extracting SIM joints on Flow
 2019-04-05 18:28:05 -07:00
Sam Gondelman
b12a0e5cce
Merge pull request #15342 from SamGondelman/material 
Case 20513: Extra check to make sure we remove materials from MyAvatar
 2019-04-05 17:18:37 -07:00
Sam Gondelman
88c278d357
Merge pull request #15319 from SamGondelman/materialBaker 
Case 21764: Oven bakes model materials directly to separate material description
 2019-04-05 17:08:22 -07:00
luiscuenca
39b58a44ee Fix error on sim joints for new flow app 2019-04-05 16:38:38 -07:00
Angus Antley
09e2da4c93 fixed out of range error in the two bone IK computation 2019-04-05 16:31:18 -07:00
Sam Gondelman
19b109c1f7
Merge pull request #15333 from highfidelity/revert-15266-stencil 
Case 22070: Revert "Case 20060: Grab correct stencil masks from display plugins"
 2019-04-05 16:23:26 -07:00
SamGondelman
924bf53698 extra check to make sure we remove material from MyAvatar 2019-04-05 16:22:16 -07:00
Shannon Romano
1b72a514d3
Merge pull request #15328 from Atlante45/fix/injectors 
Case 21925: Warn mixer about stopped injectors
 2019-04-05 16:09:41 -07:00
Anthony Thibault
b8b7798ad9
Merge pull request #15296 from luiscuenca/kdopsRotOffsetFix 
Add joint rotation offset to the avatar multi-sphere shapes
 2019-04-05 15:55:34 -07:00
Anthony Thibault
0e2c5ea3c2
Merge pull request #15291 from luiscuenca/multiSpheresMixFix 
Fix avatar multi-sphere bad scaling on some avatars
 2019-04-05 15:55:13 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
raveenajain
d1d999dd72 init node order fix 2019-04-05 19:58:26 +01:00
Olivier Prat
1322fef568 Taking into account samuel's remarks 2019-04-05 20:15:58 +02:00
Olivier Prat
08aa133472 Fixed other compilation errors / warnings 2019-04-05 11:32:00 +02:00
Olivier Prat
b66aa4a742 Fixed compilation errors on Mac & Ubuntu 2019-04-05 11:03:41 +02:00
Olivier Prat
89ca7ac415 Fixed compilation errors 2019-04-05 10:22:57 +02:00
Olivier Prat
a45b91c4be Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-05 09:01:03 +02:00
Olivier Prat
361371b2a9 Added flag to enable / disable ambient fresnel LUT 2019-04-05 08:58:06 +02:00
David Rowe
ca2c8caddb Reinstate TextureCache.TextureType JSDoc 2019-04-05 17:53:19 +13:00
David Rowe
28dfac64ba Merge branch 'master' into M21460 
# Conflicts:
#	libraries/image/src/image/Image.h
 2019-04-05 17:50:46 +13:00
David Rowe
68f76851fd Updates per doc review 2019-04-05 17:10:52 +13:00
Seth Alves
cbc51b75f9 fix asan reported error when returning QString reference to refreshGroupsCache 2019-04-04 19:55:13 -07:00
Clement
5102702910 Warn mixer about stopped injectors 2019-04-04 18:55:35 -07:00
Roxanne Skelly
7f5a595ba7
Merge pull request #15326 from roxanneskelly/Case22059 
Lambda capture was referencing something on the local stack
 2019-04-04 17:21:53 -07:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco 
Case 21777: Locomotion Project
 2019-04-04 16:18:32 -07:00
Roxanne Skelly
029eab73cb Lambda capture was referencing something on the local stack 
which may go out of scope when lambda was called.
 2019-04-04 16:00:15 -07:00
Ryan Huffman
b9c81a3899
Merge pull request #15322 from huffman/fix/interactive-window-shutdown-crash 
Case 18299: Fix ScriptEngine not being destroyed on its own thread
 2019-04-04 15:00:50 -07:00
Sam Gateau
bda54c71ea
Merge pull request #15324 from AndrewMeadows/avoid-nan-model-scale 
Case 22054: flat models can introduce nan into geometry
 2019-04-04 14:51:19 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-04 13:36:25 -07:00
Ryan Huffman
cf3a9b1d48 Fix ScriptEngine not being destroyed on its own thread 2019-04-04 13:28:13 -07:00
Sam Gateau
eee5f87dcd
Merge pull request #15264 from Zvork/hdr 
Case 22045: Added support for OpenEXR files (mostly for skyboxes)
 2019-04-04 10:32:11 -07:00
Angus Antley
9afbf76ec1 removed unnecessary getFauxJointIndex call, this is handled in getJointIndex 2019-04-04 10:22:24 -07:00
Angus Antley
72264203db corrected the lock positions to cover the getJointIndex calls 2019-04-04 10:08:50 -07:00
Andrew Meadows
72ac35c6f7 avoid nan in Model::_scale 2019-04-04 08:28:03 -07:00
Olivier Prat
b71a8f7902 Switched to split sum model for ambient (as Unreal) 2019-04-04 16:10:33 +02:00
Olivier Prat
acded5488e Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-04 08:58:49 +02:00
David Rowe
1bc38cab28 Camera JSDoc polish 2019-04-04 18:03:14 +13:00
r3tk0n
17e559f8e8 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 16:17:00 -07:00
Sam Gateau
5730e92871
Merge pull request #15317 from jherico/fix/21911_alt 
Case 21730:  Restore composite framebuffer to display plugins
 2019-04-03 16:02:47 -07:00
NissimHadar
3ba5f8e574 Use place holder instead of RCC file. 
(cherry picked from commit 709515dd74)
(cherry picked from commit 4e4526fbb2)
 2019-04-03 15:25:34 -07:00
David Rowe
93f917527d Merge branch 'master' into M21956 
# Conflicts:
#	interface/src/scripting/Audio.h
 2019-04-04 11:06:09 +13:00
SamGondelman
2b376f7881 handle weird material name case 2019-04-03 14:26:45 -07:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
maspring
05cab9a3cc
Merge pull request #15122 from raveenajain/gltf_skinning 
Case 21502: skinned gltf
 2019-04-03 13:45:41 -07:00
Brad Davis
44fc0d21db Revert "Remove _compositeFramebuffer from display plugins" 
This reverts commit cb311408c6.
 2019-04-03 13:43:39 -07:00
Angus Antley
857a4ab739 enabled MyAvatar.get and .set rotation 2019-04-03 13:04:55 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
SamGondelman
cf7230f023 fix non-embedded textures 2019-04-03 11:26:07 -07:00
Shannon Romano
451b2eb391
Merge pull request #15308 from roxanneskelly/Case20410 
Case 20410 - Automatic Content Archives doesn't restore correctly with old Tutorial content set
 2019-04-03 11:07:16 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes 
Case 21859: Particle Entity emitter shapes, including model
 2019-04-03 11:03:33 -07:00
Shannon Romano
f2ff5bebc7
Merge pull request #15275 from howard-stearns/ddv-all 
DDV all, including domainUnlimited
 2019-04-03 11:03:16 -07:00
Olivier Prat
eadace70f8 Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-03 18:19:46 +02:00
Olivier Prat
150508dc18 Fixed gamma with ETC SRGB8 2019-04-03 18:19:27 +02:00
Andrew Meadows
1860e61a30 more correct collision group during grabs 2019-04-03 07:42:56 -07:00
Olivier Prat
6b876e6a27 Fixed warnings on Mac & Ubuntu 2019-04-03 12:05:29 +02:00
Olivier Prat
50fecf5e01 Ambient map has different hash than sky map to prevent using one instead of the other, even if they are using the same source texture. 2019-04-03 11:29:59 +02:00
Olivier Prat
a79e7a2587 Fixed warning 2019-04-03 11:18:15 +02:00
Olivier Prat
e3355cd6a4 Trying to work uniformly with Image 2019-04-03 10:26:39 +02:00
SamGondelman
770b863604 fixing embedded textures and materialMapping priority 2019-04-02 19:04:23 -07:00
Roxanne Skelly
ac97a82bad Address a CR comment. 2019-04-02 17:25:00 -07:00
SamGondelman
14bd5ed687 remove need for destination path 2019-04-02 16:53:49 -07:00
Roxanne Skelly
959b8bfbed Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410 2019-04-02 16:48:32 -07:00
raveenajain
fcc7e9af30 minor syntax fix 2019-04-03 00:09:36 +01:00
Anthony Thibault
dd2f8ff2d6
Merge pull request #15309 from hyperlogic/bug-fix/case22010 
Case 22010: Bump protocol number to fix joint order mismatch
 2019-04-02 16:06:11 -07:00
raveenajain
7e5375d40a Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_skinning 2019-04-02 23:38:19 +01:00
Ryan Huffman
6a16a37339
Merge pull request #15286 from huffman/fix/oven-query-param-in-model-url 
Case 20928: Fix some URLs with query params not working with model baker
 2019-04-02 15:03:59 -07:00
SamGondelman
7b0854c121 support selecting material in json by name with ? 2019-04-02 14:13:00 -07:00
Anthony J. Thibault
782b8f5da6 Case 22010: Bump protocol number to fix joint order mismatch 
The joint order change was introduced in PR #15178, to fix an FBX Serializer bug.
 2019-04-02 13:26:50 -07:00
Roxanne Skelly
cf9fe00fd6 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410 2019-04-02 13:21:52 -07:00
Roxanne Skelly
2d71ec1c75 Case20410 Automatic Content Archives doesn't restore correctly with old Tutorial content set 
The tutorial content set had a content set Id of Null, which caused a failure
to parse the content set.
 2019-04-02 13:19:06 -07:00
raveenajain
1435245279 root cluster 2019-04-02 21:18:16 +01:00