Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-12 13:51:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/okamstudio/godot

Browse Source
This commit is contained in:
Juan Linietsky 2015-05-16 17:13:25 -03:00
commit 8482611f81
10 changed files with 2460 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitignore vendored
View File

@ -265,3 +265,18 @@ Desktop.ini
$RECYCLE.BIN/
logo.h
*.autosave
# https://github.com/github/gitignore/blob/master/Global/Tags.gitignore
# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
TAGS
!TAGS/
tags
!tags/
gtags.files
GTAGS
GRTAGS
GPATH
cscope.files
cscope.out
cscope.in.out
cscope.po.out

2432
Doxyfile Normal file
View File

File diff suppressed because it is too large Load Diff

2
README.md
View File

@ -1,4 +1,4 @@
![GODOT](/logo.png)
![GODOT](../../logo.png)
### The Engine

5
demos/3d/kinematic_char/cubio.gd
View File

@ -46,9 +46,8 @@ func _fixed_process(delta):
vel.x=hvel.x;
vel.z=hvel.z
var motion = vel*delta
motion=move(vel*delta)
var motion = move(vel*delta)
var on_floor = false
var original_vel = vel

2
drivers/theora/codec.h
View File

@ -15,7 +15,7 @@
********************************************************************/
/**\mainpage
/**\file
*
* \section intro Introduction
*

BIN
logo_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

3
platform/android/java/src/com/android/godot/Godot.java
View File

@ -747,7 +747,8 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
//}
} break;
case MotionEvent.ACTION_POINTER_UP: {
int pointer_idx = event.getActionIndex();
final int indexPointUp = event.getAction() >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
final int pointer_idx = event.getPointerId(indexPointUp);
GodotLib.touch(4,pointer_idx,evcount,arr);
//System.out.printf("%d - s.up at: %f,%f\n",pointer_idx, event.getX(pointer_idx),event.getY(pointer_idx));
} break;

2
tools/editor/editor_help.cpp
View File

@ -353,7 +353,7 @@ void EditorHelp::_search(const String&) {
String stext=search->get_text();
bool keep = prev_search==stext && class_list->get_selected() && prev_search_page==class_list->get_selected()->get_text(0);
class_desc->search(stext);
class_desc->search(stext, keep);
prev_search=stext;
if (class_list->get_selected())

1
tools/editor/editor_settings.cpp
View File

@ -264,6 +264,7 @@ void EditorSettings::create() {
singleton = Ref<EditorSettings>( memnew( EditorSettings ) );
singleton->config_file_path=config_file_path;
singleton->settings_path=config_path+"/"+config_dir;
singleton->_load_defaults();
singleton->scan_plugins();

5
tools/editor/project_export.cpp
View File

@ -479,6 +479,11 @@ Error ProjectExportDialog::export_platform(const String& p_platform, const Strin
if (err!=OK) {
error->set_text("Error exporting project!");
error->popup_centered_minsize();
ERR_PRINT("Exporting failed!");
if (p_quit_after) {
OS::get_singleton()->set_exit_code(255);
get_tree()->quit();
}
return ERR_CANT_CREATE;
} else {
if (p_quit_after) {