godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

-fixed export templates not loading/exporting on Windows

Browse Source 
-fixed TouchScreenButton with stretch2d
-fixed(?) OSX crash on startup (test!!)
-compilation fixes on windows
-CollisionPolygon editor works again
-find buttons en find dialog
-TileMap editor cleanup (removed "error", made nicer)
-viewport flicker fixed
-make .scn default extension for saving scenes
-export the rest of the network classes to gdscript
This commit is contained in:
Juan Linietsky
2014-02-13 18:03:28 -03:00
parent 1adc330b68
commit 58cda02a38
54 changed files with 1454 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/editor/editor_node.cpp
View File

@@ -1111,10 +1111,20 @@ void EditorNode::_dialog_action(String p_file) {
}
int ret = unzGoToFirstFile(pkg);
int fc=0; //coun them
EditorProgress p("ltask","Loading Export Templates",1);
while(ret==UNZ_OK) {
fc++;
ret = unzGoToNextFile(pkg);
}
ret = unzGoToFirstFile(pkg);
EditorProgress p("ltask","Loading Export Templates",fc);
print_line("BEGIN IMPORT");
fc=0;
while(ret==UNZ_OK) {
@@ -1123,19 +1133,25 @@ void EditorNode::_dialog_action(String p_file) {
char fname[16384];
ret = unzGetCurrentFileInfo(pkg,&info,fname,16384,NULL,0,NULL,0);
String file=fname;
Vector<uint8_t> data;
data.resize(info.uncompressed_size);
//read
unzOpenCurrentFile(pkg);
unzReadCurrentFile(pkg,data.ptr(),data.size());
ret = unzOpenCurrentFile(pkg);
ret = unzReadCurrentFile(pkg,data.ptr(),data.size());
unzCloseCurrentFile(pkg);
print_line(fname);
//for(int i=0;i<512;i++) {
// print_line(itos(data[i]));
//}
file=file.get_file();
p.step("Importing: "+file,0);
p.step("Importing: "+file,fc);
print_line("IMPORT "+file);
FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_settings_path()+"/templates/"+file,FileAccess::WRITE);
@@ -1146,6 +1162,7 @@ void EditorNode::_dialog_action(String p_file) {
memdelete(f);
ret = unzGoToNextFile(pkg);
fc++;
}
unzClose(pkg);