asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

-try to avoid errors when path using ".." is present in script include, fixes #1703

Browse source
This commit is contained in:
Juan Linietsky 2015-04-18 16:17:33 -03:00
parent fdaa2920eb
commit 4661a6e126
12 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/allocators.h
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

2
core/balloon_allocator.h
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

2
core/math/vector3.cpp
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

2
core/math/vector3.h
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

2
modules/gdscript/gd_compiler.cpp
View file

@ -1386,7 +1386,7 @@ Error GDCompiler::_parse_class(GDScript *p_script,GDScript *p_owner,const GDPars
_set_error("Could not resolve relative path for parent class: "+path,p_class); _set_error("Could not resolve relative path for parent class: "+path,p_class);
return ERR_FILE_NOT_FOUND; return ERR_FILE_NOT_FOUND;
} }
path=base.get_base_dir().plus_file(path); path=base.get_base_dir().plus_file(path).simplify_path();
} }
script = ResourceLoader::load(path); script = ResourceLoader::load(path);
if (script.is_null()) { if (script.is_null()) {

9
scene/2d/tile_map.cpp
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */
@ -348,8 +348,8 @@ void TileMap::_update_dirty_quadrants() {
rect.pos=offset.floor(); rect.pos=offset.floor();
rect.size=s; rect.size=s;
rect.size.x+=fp_adjust; /* rect.size.x+=fp_adjust;
rect.size.y+=fp_adjust; rect.size.y+=fp_adjust;*/
if (c.flip_h) if (c.flip_h)
rect.size.x=-rect.size.x; rect.size.x=-rect.size.x;
@ -1154,8 +1154,7 @@ TileMap::TileMap() {
navigation=NULL; navigation=NULL;
y_sort_mode=false; y_sort_mode=false;
fp_adjust=0.01; fp_adjust=0.00001;
fp_adjust=0.01;
tile_origin=TILE_ORIGIN_TOP_LEFT; tile_origin=TILE_ORIGIN_TOP_LEFT;
} }

2
scene/2d/tile_map.h
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

10
scene/gui/text_edit.cpp
View file

@ -26,16 +26,6 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
/*****f********************************************/
/* text_edit.cpp */
/*************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/*************************************************/
/* Source code within this file is: */
/* (c) 2007-2010 Juan Linietsky, Ariel Manzur */
/* All Rights Reserved. */
/*************************************************/
#include "text_edit.h" #include "text_edit.h"
#include "os/keyboard.h" #include "os/keyboard.h"

2
servers/physics_server.cpp
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

2
servers/physics_server.h
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

2
servers/visual/visual_server_raster.cpp
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

2
servers/visual/visual_server_raster.h
View file

@ -5,7 +5,7 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */