mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-07 20:11:50 +00:00
Merge branch 'dev' into generated-pcm-stream
This commit is contained in:
commit
96f9c9f382
8 changed files with 68 additions and 26 deletions
|
|
@ -110,7 +110,7 @@ function unlock_access()
|
|||
end
|
||||
|
||||
local function reload_model(filename, name)
|
||||
assets.parse_model("xml", document.editor.text, name)
|
||||
assets.parse_model(file.ext(filename), document.editor.text, name)
|
||||
end
|
||||
|
||||
function run_current_file()
|
||||
|
|
|
|||
|
|
@ -33,5 +33,4 @@
|
|||
onup="on_history_up()"
|
||||
ondown="on_history_down()">
|
||||
</textbox>
|
||||
<textbox size="200" margin="20" multiline="true" text-wrap="true" autoresize="false"/>
|
||||
</container>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue