godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

-improved physics ccd

Browse Source 
-html5 exporter works again
-disable repeat on image loader by default
-can change shape offset en tileset, texture offset was broken
This commit is contained in:
Juan Linietsky
2014-02-19 11:57:14 -03:00
parent 8c1731b679
commit d7d65fa2f2
65 changed files with 69974 additions and 68330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127704
tools/editor/doc_data_compressed.h
View File

File diff suppressed because it is too large Load Diff

15
tools/editor/io_plugins/editor_texture_import_plugin.cpp
View File

@@ -150,6 +150,11 @@ void EditorImportTextureOptions::_notification(int p_what) {
}
}
void EditorImportTextureOptions::show_2d_notice() {
notice_for_2d->show();
}
EditorImportTextureOptions::EditorImportTextureOptions() {
@@ -206,6 +211,14 @@ EditorImportTextureOptions::EditorImportTextureOptions() {
add_margin_child("Texture Options",flags,true);
notice_for_2d = memnew( Label );
notice_for_2d->set_text("NOTICE: You are not forced to import textures for 2D projects. Just copy your .jpg or .png files to your project, and change export options later. Atlases can be generated on export too.");
notice_for_2d->set_custom_minimum_size(Size2(0,50));
notice_for_2d->set_autowrap(true);
add_child(notice_for_2d);
notice_for_2d->hide();
}
///////////////////////////////////////////////////////////
@@ -530,6 +543,7 @@ EditorTextureImportDialog::EditorTextureImportDialog(EditorTextureImportPlugin*
texture_options->set_flags(EditorTextureImportPlugin::IMAGE_FLAG_FIX_BORDER_ALPHA|EditorTextureImportPlugin::IMAGE_FLAG_NO_MIPMAPS|EditorTextureImportPlugin::IMAGE_FLAG_FILTER);
texture_options->set_quality(0.7);
texture_options->set_format(EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY);
texture_options->show_2d_notice();
set_title("Import Textures for Atlas (2D)");
} else if (p_2d) {
@@ -537,6 +551,7 @@ EditorTextureImportDialog::EditorTextureImportDialog(EditorTextureImportPlugin*
texture_options->set_flags(EditorTextureImportPlugin::IMAGE_FLAG_NO_MIPMAPS|EditorTextureImportPlugin::IMAGE_FLAG_FIX_BORDER_ALPHA|EditorTextureImportPlugin::IMAGE_FLAG_FILTER);
texture_options->set_quality(0.7);
texture_options->set_format(EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY);
texture_options->show_2d_notice();
set_title("Import Textures for 2D");
} else {

3
tools/editor/io_plugins/editor_texture_import_plugin.h
View File

@@ -116,6 +116,7 @@ class EditorImportTextureOptions : public VBoxContainer {
HSlider *quality;
Tree *flags;
Vector<TreeItem*> items;
Label *notice_for_2d;
bool updating;
@@ -140,6 +141,8 @@ public:
void set_quality(float p_quality);
float get_quality() const;
void show_2d_notice();
EditorImportTextureOptions();

2
tools/editor/plugins/tile_set_editor_plugin.cpp
View File

@@ -73,7 +73,7 @@ void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_me
p_library->tile_set_texture(id,texture);
if (mi->is_centered()) {
p_library->tile_set_offset(id,texture->get_size()/2);
p_library->tile_set_texture_offset(id,texture->get_size()/2);
}
if (mi->is_region()) {
p_library->tile_set_region(id,mi->get_region_rect());