virtualx-engine/tools/editor/io_plugins
Juan Linietsky 6974823288 Merge remote-tracking branch 'origin/master'
Conflicts:
	tools/editor/io_plugins/editor_texture_import_plugin.cpp
2015-06-06 10:12:09 -03:00
..
editor_atlas.cpp Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
editor_atlas.h Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
editor_font_import_plugin.cpp new file dialog! 2015-06-06 09:44:38 -03:00
editor_font_import_plugin.h Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
editor_import_collada.cpp Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-24 15:09:47 -03:00
editor_import_collada.h Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
editor_mesh_import_plugin.cpp new file dialog! 2015-06-06 09:44:38 -03:00
editor_mesh_import_plugin.h A bit of everything: 2014-05-14 01:22:15 -03:00
editor_sample_import_plugin.cpp new file dialog! 2015-06-06 09:44:38 -03:00
editor_sample_import_plugin.h Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
editor_scene_import_plugin.cpp new file dialog! 2015-06-06 09:44:38 -03:00
editor_scene_import_plugin.h Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
editor_scene_importer_fbxconv.cpp Small Issues & Maintenance 2014-08-01 22:10:38 -03:00
editor_scene_importer_fbxconv.h Small Issues & Maintenance 2014-08-01 22:10:38 -03:00
editor_texture_import_plugin.cpp Merge remote-tracking branch 'origin/master' 2015-06-06 10:12:09 -03:00
editor_texture_import_plugin.h -fixes to navigation, so edge-merging is more flexible on conflict 2015-06-01 19:42:34 -03:00
editor_translation_import_plugin.cpp new file dialog! 2015-06-06 09:44:38 -03:00
editor_translation_import_plugin.h Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
SCsub GODOT IS OPEN SOURCE 2014-02-09 22:10:30 -03:00