Merge branch 'master' into dev
This commit is contained in:
commit
32df131204
@ -25,7 +25,8 @@ local function idx2str(idx, key)
|
||||
end
|
||||
if #keys == 1 then
|
||||
local k = keys[1]
|
||||
parts[#parts + 1] = key .. "_" .. idx2str(idx[k], k)
|
||||
parts[#parts + 1] = (key and (key .. "_") or "")
|
||||
.. idx2str(idx[k], k)
|
||||
elseif #keys > 1 then
|
||||
table_sort(keys)
|
||||
for i = 1, #keys do
|
||||
|
@ -230,7 +230,8 @@ local function anim(name, len)
|
||||
aspect_w = 16,
|
||||
aspect_h = 16,
|
||||
length = len
|
||||
}
|
||||
},
|
||||
backface_culling = false
|
||||
}
|
||||
end
|
||||
local function gray(suff)
|
||||
|
Loading…
x
Reference in New Issue
Block a user