diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 19:13:05 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 19:13:05 -0300 |
| commit | 6aa95e77f3bae35fb136eb00e271362c1707058e (patch) | |
| tree | bac0c7d5fd84e991107bbedf3eeb9491c9a76812 | |
| parent | 1ceefd47598bea8669da3a1fa48c3af7adf56ded (diff) | |
| parent | 580a88c3ced6aa59db50fea6b7b5e02330689b09 (diff) | |
Merge pull request #2652 from firefly2442/fix-icons
Fix icons (default location and in demos)
| -rw-r--r-- | demos/2d/fog_of_war/engine.cfg | 2 | ||||
| -rw-r--r-- | demos/2d/polygon_path_finder_demo/engine.cfg | 2 | ||||
| -rw-r--r-- | demos/gui/input_mapping/engine.cfg | 1 | ||||
| -rw-r--r-- | demos/misc/tween/engine.cfg | 2 | ||||
| -rw-r--r-- | demos/misc/window_management/engine.cfg | 2 | ||||
| -rw-r--r-- | tools/editor/project_manager.cpp | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/demos/2d/fog_of_war/engine.cfg b/demos/2d/fog_of_war/engine.cfg index 5c4307b5bc..1f56851c58 100644 --- a/demos/2d/fog_of_war/engine.cfg +++ b/demos/2d/fog_of_war/engine.cfg @@ -2,7 +2,7 @@ name="Fog of War" main_scene="res://fog.scn" -icon="icon.png" +icon="res://icon.png" [input] diff --git a/demos/2d/polygon_path_finder_demo/engine.cfg b/demos/2d/polygon_path_finder_demo/engine.cfg index 41c4adf701..de5593c417 100644 --- a/demos/2d/polygon_path_finder_demo/engine.cfg +++ b/demos/2d/polygon_path_finder_demo/engine.cfg @@ -2,4 +2,4 @@ name="polygon_path_finder_demo" main_scene="res://new_scene_poly_with_holes.scn" -icon="icon.png" +icon="res://icon.png" diff --git a/demos/gui/input_mapping/engine.cfg b/demos/gui/input_mapping/engine.cfg index 959c0ac7d5..6470ec6cd8 100644 --- a/demos/gui/input_mapping/engine.cfg +++ b/demos/gui/input_mapping/engine.cfg @@ -2,7 +2,6 @@ name="Input Mapping GUI" main_scene="res://controls.scn" -icon="icon.png" [display] diff --git a/demos/misc/tween/engine.cfg b/demos/misc/tween/engine.cfg index f97e540dbd..3d3d639964 100644 --- a/demos/misc/tween/engine.cfg +++ b/demos/misc/tween/engine.cfg @@ -2,7 +2,7 @@ name="Tween Demo" main_scene="res://main.xml" -icon="icon.png" +icon="res://icon.png" target_fps=60 [display] diff --git a/demos/misc/window_management/engine.cfg b/demos/misc/window_management/engine.cfg index 0a34231673..911d3fd4a1 100644 --- a/demos/misc/window_management/engine.cfg +++ b/demos/misc/window_management/engine.cfg @@ -2,7 +2,7 @@ name="Window Management" main_scene="res://window_management.scn" -icon="icon.png" +icon="res://icon.png" [display] diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index 9f47291433..ee5521b8e1 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -193,7 +193,7 @@ class NewProjectDialog : public ConfirmationDialog { f->store_line("\n"); f->store_line("[application]"); f->store_line("name=\""+project_name->get_text()+"\""); - f->store_line("icon=\"icon.png\""); + f->store_line("icon=\"res://icon.png\""); memdelete(f); |