From df43d71f197d055365b00a8fd937d403e2c3390c Mon Sep 17 00:00:00 2001 From: Frederik De Bleser Date: Mon, 10 Feb 2014 09:14:06 +0100 Subject: [PATCH 1/9] Fix typo in font import plugin. --- tools/editor/io_plugins/editor_font_import_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp index d64a2fd42ae..7c38b105fdf 100644 --- a/tools/editor/io_plugins/editor_font_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp @@ -439,7 +439,7 @@ class EditorFontImportDialog : public ConfirmationDialog { } if (dest->get_line_edit()->get_text()=="") { - error_dialog->set_text("No tatget font resource!"); + error_dialog->set_text("No target font resource!"); error_dialog->popup_centered(Size2(200,100)); return; } From a29bfdf91251a41be7eadacae0e0f0c2f63568a7 Mon Sep 17 00:00:00 2001 From: rafalcieslak Date: Mon, 10 Feb 2014 13:55:12 +0100 Subject: [PATCH 2/9] Implemented Camera2D.Rotating property --- scene/2d/camera_2d.cpp | 26 +++++++++++++++++++++++++- scene/2d/camera_2d.h | 4 ++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 1920ce00816..dea3e578941 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -131,9 +131,14 @@ Matrix32 Camera2D::get_camera_transform() { } - Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());; + Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());; screen_offset+=offset; + float angle = get_global_transform().get_rotation(); + if(rotating){ + screen_offset = screen_offset.rotated(angle); + } + Rect2 screen_rect(-screen_offset+ret_camera_pos,screen_size); if (screen_rect.pos.x + screen_rect.size.x > limit[MARGIN_RIGHT]) screen_rect.pos.x = limit[MARGIN_RIGHT] - screen_rect.size.x; @@ -151,6 +156,9 @@ Matrix32 Camera2D::get_camera_transform() { camera_screen_center=screen_rect.pos+screen_rect.size*0.5; Matrix32 xform; + if(rotating){ + xform.set_rotation(angle); + } xform.scale_basis(zoom); xform.set_origin(screen_rect.pos/*.floor()*/); @@ -251,6 +259,17 @@ bool Camera2D::is_centered() const { return centered; } +void Camera2D::set_rotating(bool p_rotating){ + + rotating=p_rotating; + _update_scroll(); +} + +bool Camera2D::is_rotating() const { + + return rotating; +} + void Camera2D::_make_current(Object *p_which) { @@ -394,6 +413,9 @@ void Camera2D::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_centered","centered"),&Camera2D::set_centered); ObjectTypeDB::bind_method(_MD("is_centered"),&Camera2D::is_centered); + ObjectTypeDB::bind_method(_MD("set_rotating","rotating"),&Camera2D::set_rotating); + ObjectTypeDB::bind_method(_MD("is_rotating"),&Camera2D::is_rotating); + ObjectTypeDB::bind_method(_MD("make_current"),&Camera2D::make_current); ObjectTypeDB::bind_method(_MD("_make_current"),&Camera2D::_make_current); @@ -436,6 +458,7 @@ void Camera2D::_bind_methods() { ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"offset"),_SCS("set_offset"),_SCS("get_offset")); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"centered"),_SCS("set_centered"),_SCS("is_centered")); + ADD_PROPERTY( PropertyInfo(Variant::BOOL,"rotating"),_SCS("set_rotating"),_SCS("is_rotating")); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"current"),_SCS("_set_current"),_SCS("is_current")); ADD_PROPERTY( PropertyInfo(Variant::REAL,"smoothing"),_SCS("set_follow_smoothing"),_SCS("get_follow_smoothing") ); ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"zoom"),_SCS("set_zoom"),_SCS("get_zoom") ); @@ -462,6 +485,7 @@ Camera2D::Camera2D() { centered=true; + rotating=false; current=false; limit[MARGIN_LEFT]=-10000000; limit[MARGIN_TOP]=-10000000; diff --git a/scene/2d/camera_2d.h b/scene/2d/camera_2d.h index 9d06df2d1b8..116169cac1b 100644 --- a/scene/2d/camera_2d.h +++ b/scene/2d/camera_2d.h @@ -50,6 +50,7 @@ protected: Vector2 offset; Vector2 zoom; bool centered; + bool rotating; bool current; float smoothing; int limit[4]; @@ -79,6 +80,9 @@ public: void set_centered(bool p_centered); bool is_centered() const; + void set_rotating(bool p_rotating); + bool is_rotating() const; + void set_limit(Margin p_margin,int p_limit); int get_limit(Margin p_margin) const; From 0366d6cb83e0da170a9647714edf1e6bce38c953 Mon Sep 17 00:00:00 2001 From: rafalcieslak Date: Mon, 10 Feb 2014 14:00:26 +0100 Subject: [PATCH 3/9] Fixed accidentally broken identation --- scene/2d/camera_2d.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index dea3e578941..acae3e62c43 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -131,7 +131,7 @@ Matrix32 Camera2D::get_camera_transform() { } - Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());; + Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());; screen_offset+=offset; float angle = get_global_transform().get_rotation(); From 555d3761dbb1047017909f939eae9979f887214e Mon Sep 17 00:00:00 2001 From: Trent McPheron Date: Mon, 10 Feb 2014 16:42:46 -0500 Subject: [PATCH 4/9] Disabled the slider for numeric values on the tree view. --- scene/gui/tree.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index ca6a1e812e6..9be3c979014 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1575,7 +1575,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_ } else { editor_text=String::num( p_item->cells[col].val, Math::decimals( p_item->cells[col].step ) ); - bring_up_value_editor=true; + bring_up_value_editor=false; if (select_mode==SELECT_MULTI && get_scene()->get_last_event_id() == focus_in_id) bring_up_editor=false; From 335d963031bc081166b3a73d9be4bd2bef2661fc Mon Sep 17 00:00:00 2001 From: Jeremy Williams Date: Mon, 10 Feb 2014 22:27:50 -0500 Subject: [PATCH 5/9] Fix mouse coordinates on OS X retina displays --- platform/osx/os_osx.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 86d1dbb4c27..8c224ad2dba 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -378,8 +378,8 @@ static int button_mask=0; prev_mouse_y=mouse_y; const NSRect contentRect = [OS_OSX::singleton->window_view frame]; const NSPoint p = [event locationInWindow]; - mouse_x = p.x; - mouse_y = contentRect.size.height - p.y; + mouse_x = p.x * [[event window] backingScaleFactor]; + mouse_y = (contentRect.size.height - p.y) * [[event window] backingScaleFactor]; ev.mouse_motion.x=mouse_x; ev.mouse_motion.y=mouse_y; ev.mouse_motion.global_x=mouse_x; From 5abc0bbcf604e516f70b19fa999c4c56c86507e9 Mon Sep 17 00:00:00 2001 From: marynate Date: Tue, 11 Feb 2014 23:44:32 +0800 Subject: [PATCH 6/9] Fixed build rule file for proper MSVC release build --- platform/windows/detect.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 490f048f264..b8b0509da71 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -84,6 +84,7 @@ def configure(env): env.Append(CCFLAGS=['/O2']) env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS']) + env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup']) elif (env["target"]=="test"): @@ -92,8 +93,9 @@ def configure(env): elif (env["target"]=="debug"): - env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO','/O1']) + env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO','/O1']) env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE']) + env.Append(LINKFLAGS=['/DEBUG']) elif (env["target"]=="profile"): @@ -113,8 +115,7 @@ def configure(env): env.Append(CCFLAGS=['/DGLES1_ENABLED']) env.Append(CCFLAGS=['/DGLEW_ENABLED']) env.Append(LIBS=['winmm','opengl32','dsound','kernel32','ole32','user32','gdi32','wsock32']) - env.Append(LINKFLAGS=['/DEBUG']) - + env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"]) if (os.getenv("DXSDK_DIR")): DIRECTX_PATH=os.getenv("DXSDK_DIR") From 0bb71e723fe63ef95e6a68bd7faf186c6a7d0e32 Mon Sep 17 00:00:00 2001 From: Matthew Casey Date: Tue, 11 Feb 2014 14:19:52 -0500 Subject: [PATCH 7/9] Make math_funcs.h use lrint on msvc 2013 --- core/math/math_funcs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index 6a60a7f7908..c98a088912f 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -136,7 +136,7 @@ public: static int b; -#if defined(_MSC_VER) +#if defined(_MSC_VER) && _MSC_VER < 1800 __asm fld a __asm fistp b /*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) @@ -148,7 +148,7 @@ public: : "=m" (b) : "m" (a));*/ #else - b=lrintf(a); //assuming everything but msvc has lrint + b=lrintf(a); //assuming everything but msvc 2012 or earlier has lrint #endif return b; } From c85146e112df17e3064d372ae2a349143f14538d Mon Sep 17 00:00:00 2001 From: imgxx Date: Wed, 12 Feb 2014 22:08:27 +0700 Subject: [PATCH 8/9] Create README.md --- README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000000..c3813a360f1 --- /dev/null +++ b/README.md @@ -0,0 +1,27 @@ +![GODOT](/logo.png) + +### The Engine + +Godot is a fully featured, open source, MIT licensed, game engine. It focuses on having great tools, and a visual oriented workflow that can export to PC, Mobile and Web platforms with no hassle. +The editor, language and APIs are feature rich, yet simple to learn, allowing you to become productive in a matter of hours. + +### About + +Godot has been developed by Juan Linietsky and Ariel Manzur for several years, and was born as an in-house engine, used to publish several work-for-hire titles. +Development is sponsored by OKAM Studio (http://www.okamstudio.com). + +### Godot is BETA. Collaborate!! + +Having been developed as in-house means that the user experience may still not be ideal for everyone. The features needed to make a great game are there, but we really need your help to fix all the rough edges and improve usability (via feedback and/or code contributions). +We know we are close to having an awesome, open source, game engine with nothing to envy from the best commercial offerings, but we can't do this alone. This is why Godot is now open source, so everyone can help us reach this goal. + +### Binary Downloads, Documentation, Community, etc. + +Binary downloads, documentation, community, etc. can be found in Godot homepage: + +http://www.godotengine.org + +### Compiling from Source + +Compilation instructions for every platform can be found in the Wiki: +http://www.godotengine.org/wiki/doku.php?id=advanced From 03fd40149f2b3e74cfb8c9e2cbc521f340fa932e Mon Sep 17 00:00:00 2001 From: ImGxx Date: Wed, 12 Feb 2014 22:21:47 +0700 Subject: [PATCH 9/9] logo.png --- logo.png | Bin 0 -> 3682 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 logo.png diff --git a/logo.png b/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..affc21cf848be203c3a90a6c18d48b880cf2b58b GIT binary patch literal 3682 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 Au>b%7 literal 0 HcmV?d00001