Commit Graph

647 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
Ansariel 642d28245f Merge Firestorm LGPL 2019-08-31 14:30:14 +02:00
Ansariel 529569cdd9 Merge viewer-neko 2019-08-04 12:09:33 +02:00
andreykproductengine 87be5f7997 SL-4150 Rename htonmemcpy 2019-07-24 16:58:24 +03:00
Ansariel 3df9aff40f Merge Firestorm LGPL 2019-05-09 23:48:20 +02:00
Ansariel 19a91edc1c Merge Firestorm LGPL 2019-04-04 19:35:58 +02:00
Ansariel 84d721c678 Merge Firestorm LGPL 2019-04-02 23:01:30 +02:00
Ansariel 0984f0c299 Merge Firestorm LGPL 2019-02-07 22:49:33 +01:00
Ansariel 892d224446 Merge Firestorm LGPL 2019-01-31 21:10:17 +01:00
Ansariel f9ec853f4a Merge viewer-neko 2019-01-03 19:07:09 +01:00
maxim_productengine 0acab8ba2d SL-10283 Allow changing "Repeats per meter" on face 6 of hollowed cube 2018-12-24 15:57:04 +02:00
maxim_productengine 1dbc638d38 SL-10283 Allow changing "Repeats per meter" on face 6 of hollowed cube 2018-12-24 15:57:04 +02:00
Ansariel 0e36db79e1 Merge viewer-neko 2018-12-01 16:34:33 +01:00
andreykproductengine d9fdb948d9 SL-9747 [Mesh Uploader] Remove confusing model_metric from upload 2018-11-29 21:04:35 +02:00
Ansariel f04189ed9f Merge Firestorm LGPL 2018-11-17 01:03:38 +01:00
Ansariel 62e77ba1b2 Merge Firestorm LGPL 2018-11-15 21:24:16 +01:00
Beq b42d0ab6ef Merge rig to attach points removal back to axon 2018-09-12 16:24:30 +01:00
Beq 772524fc8e Remove redundant code for bone joint mapping with spaces. Not able to reproduce the issue with spaces in bones. This may need to be reviewed if further feedback is received. 2018-09-12 16:19:39 +01:00
Ansariel 258ca74893 Merge axon 2018-08-22 12:51:42 +02:00
Ansariel 8ab2169efb Merge viewer-cougar 2018-08-22 10:15:24 +02:00
Graham Linden 3237923e10 MAINT-3699 new shaders supporting alpha blend/mask rigged content.
Make shader loading debug logging of uniforms use ShaderUniform to make supression simpler.
2018-08-16 00:31:39 +01:00
Brad Payne (Vir Linden) 791979c553 SL-928 - in mesh upload, warn if bind shape is non-identity and skin weights are enabled. 2018-08-08 13:34:02 +01:00
Ansariel 022d3946db Merge viewer-cougar 2018-08-01 17:51:52 +02:00
Graham Linden 60d256e80f MAINT-8915
Fix sync of material rotation and offset values when using aligned planar faces.

Make it possible to set a specific TE's normal/spec offset/rotation values.

Eliminate redundant conversions in LLSD -> struct handler.
2018-07-30 22:38:30 +01:00
Graham Linden ba31900ea8 MAINT-8891 viewer-side fix for redundant setting of specular offset in LLSD to struct translation 2018-07-20 19:17:59 +01:00
Ansariel 457d9792c0 Merge axon 2018-07-15 12:32:06 +02:00
Brad Payne (Vir Linden) 73c76fdccf MAINT-8863 - more diagnostics and possible fix 2018-07-13 18:56:08 +01:00
Ansariel d2963a5e60 Merge viewer-cougar 2018-07-11 20:48:32 +02:00
Graham Linden 3008962f0c Convert tabs to spaces in llprimitive/llmaterial.* for sanity 2018-06-29 21:21:46 +01:00
Graham Linden 82a097b06f MAINT-8676 modify XUI to allow negative offsets again and fix up material handling of normal/specular offsets 2018-06-29 00:47:13 +01:00
Ansariel c1f3b20f55 Merge axon 2018-06-20 19:07:46 +02:00
Anchor Linden cb4ba0b15e fix line endings 2018-06-19 23:04:29 +05:30
Ansariel 4aa45cb8e1 Merge viewer-baking-updates 2018-06-16 13:22:49 +02:00
Brad Payne (Vir Linden) edf6795eda SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output 2018-06-13 21:49:24 +01:00
Anchor Linden 7abb0c99be [DRTVWR-476] - add universal head,upper,lower tattoos 2018-06-13 01:09:27 +05:30
Brad Payne (Vir Linden) 6862190500 SL-915 - face-level caching, bug fix 2018-06-08 19:56:34 +01:00
Ansariel 5560f13b4b Merge axon 2018-06-07 19:15:42 +02:00
Brad Payne (Vir Linden) 2a2046fd07 merge 2018-06-05 22:44:04 +01:00
Anchor Linden 6e1cbd04b4 Merge 2018-06-05 23:21:30 +05:30
Ansariel 2de275724b Merge Firestorm LGPL 2018-06-01 22:29:06 +02:00
Ansariel acfe7e625e Merge Firestorm LGPL 2018-06-01 22:10:21 +02:00
Brad Payne (Vir Linden) e86839fac1 SL-915 - WIP on dynamic joint box tracking 2018-06-01 15:08:59 +01:00
Ansariel 1b485c97e6 Merge viewer-baking-updates 2018-05-31 12:21:16 +02:00
Anchor Linden f277aed218 [DRTVWR-455] - add new bake testure and tattoo slots 2018-05-24 01:17:07 -07:00
Ansariel f9d432a570 Merge Firestorm LGPL 2018-05-08 19:29:46 +02:00
Ansariel a2879b80a6 Merge Firestorm LGPL 2018-05-08 17:13:44 +02:00
Nicky 8a81a43161 Merge. 2018-04-10 11:42:59 +02:00
Ansariel cb586aeb1b Merge Firestorm LGPL 2018-04-07 14:35:29 +02:00
Ansariel d30bb9b7c4 Merge Firestorm LGPL 2018-04-07 14:10:32 +02:00
Nicky b96bd81ff5 Replace hardcoded 16 with UUID_BYTES where apropriate (Nat gets sad from hardcoded 16). 2018-04-03 22:06:45 +02:00
Nicky 4e598848f6 Out of bounds read: lod is not supposed to be bigger than MODEL_LODS-1 as there is only LOD values from [0,4]. 2018-04-03 13:35:19 +02:00