summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-26Merge pull request #137 from marynate/PR-expose-f-key-to-center-selokamstudio
Add F key to center 3d viewport to selected node
2014-02-26Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-26Merge branch 'freebsd-cleanup' of https://github.com/robmessick/godot into ↵Juan Linietsky
robmessick-freebsd-cleanup
2014-02-26Merge pull request #141 from vinzenz/texture-import-plugin-typookamstudio
Typo in 'Atlas Texture' import menu entry
2014-02-26Merge pull request #144 from C4NCER/masterokamstudio
move away from deprecated Options class and update .gitignore
2014-02-26-Added ATITC texture supportJuan Linietsky
-Fixed bug of some tabs showing wrong names -Exported properties for viewport
2014-02-25-scripts are converted to bytecode on exportJuan Linietsky
-fix bug in doc where touchscreen events were not documented
2014-02-25add logo.h to .gitignoreC4NCER
2014-02-25Switch from using deprecated Options class to VariablesC4NCER
2014-02-24fixie readmeJuan Linietsky
2014-02-24-moved script to modulesJuan Linietsky
2014-02-24Typo in 'Atlas Texture' import menu entryVinzenz Feenstra
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-23Unused comparison causes error on clang. Suspect this was a typo.Rob Messick
2014-02-23ifdef out body of probe_joystick and process_joysticks on freebsd until a ↵Rob Messick
working implementation is completed
2014-02-23Only include linux/joystick.h on linuxRob Messick
2014-02-23alloca() lives in stdlib.h on FreeBSDRob Messick
2014-02-23-fixed bug importing skeletonsJuan Linietsky
2014-02-23-Fix for parsing XML headerJuan Linietsky
2014-02-23hoJuan Linietsky
2014-02-23Add F key to center 3d viewport to selected nodemarynate
2014-02-22Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-22-added kinematic bodyJuan Linietsky
-added kinematic body demos
2014-02-21Merge pull request #132 from samsaga2/masterokamstudio
Removed OF
2014-02-21Removed OFVictor M
2014-02-20Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-20-run script in editorJuan Linietsky
-add search docs dialog that returns places string was found -added flash
2014-02-20Merge pull request #74 from rrockru/masterokamstudio
Fixed build issue on linux (missing webp include path).
2014-02-20Merge pull request #88 from marynate/PR-More_gitignoreokamstudio
More gitignore
2014-02-20Merge pull request #89 from marynate/PR-Fix_iOS_Simulator_Buildokamstudio
Fix iOS Simulator Build
2014-02-20Merge pull request #104 from Nr7/masterokamstudio
Fixed two incorrect bindings in Physics2DServer
2014-02-20Merge pull request #107 from bscranton/masterokamstudio
Windows StreamPeerWinsock::set_nodelay implementation
2014-02-20Merge pull request #109 from vinzenz/project-exportokamstudio
tools/editor/project_export: tree_vb already has a parent
2014-02-20Merge pull request #116 from olifly/masterokamstudio
Added function "get_tiles_ids" to TreeSet.
2014-02-20Merge pull request #123 from Terseus/fix-113_editor-settings-xml-corruptionokamstudio
Fix #113 editor_settings.xml corruption
2014-02-20Merge pull request #124 from kevinhartman/masterokamstudio
Fixed OS X retina initial videomode size
2014-02-20Merge pull request #128 from marynate/PR-stop-tracking-logo-hokamstudio
Stop tracking platform/server/logo.h for it will be autogenerated
2014-02-20Merge pull request #110 from vinzenz/108-fixokamstudio
Fix for Issue #108
2014-02-19wtfJuan Linietsky
2014-02-19Merge remote-tracking branch 'upstream/master'Olafur Haukur Flygenring
2014-02-19Stop tracking platform/server/logo.h for it will be autogeneratedmarynate
2014-02-19Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-19-improved physics ccdJuan Linietsky
-html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
2014-02-18OSX current_videomode size is now initialized with correct resolution based ↵Kevin Hartman
on backing store. Fixes issue where content does not correctly fit in window on retina displays.
2014-02-18Fix #113 editor_settings.xml corruptionTerseus
In the `parse_tag` method of the `class ResourceInteractiveLoaderXML`, the class responsible of loading the editor_settings.xml file, the properties' values are loaded directly into an `String` object but the file contents are always UTF-8, which leads to garbage in the XML file when saved. This patch reads the properties' values in a `CharString` and translate them to UTF-8.
2014-02-18Merge pull request #111 from vinzenz/obsolete-editor-plugin-removalreduz
Removal of obsolete editor plugins Fixes #64
2014-02-18Merge pull request #118 from Terseus/fix-19_non-ascii-pathsreduz
Fix #19 Can't open project (with non-ASCII path)
2014-02-18Merge pull request #115 from marynate/PR-open-pm-in-editorreduz
Able to open project manager inside editor (Scene->Project Manager)
2014-02-18Fix #19 Can't open project (with non-ASCII path)Terseus
In `class OS_Unix` the arguments in the `execute` method are converted to UTF-8, but in the `main` program's method they're inserted into a wide-char `Vector` before translating them from UTF-8 and thus the non-ASCII characters are lost. This fix converts the `argv` elements to UTF-8 using `String::utf8` before inserting them in the `Vector`.
2014-02-18Added function "get_tiles_ids" to TreeSet.Olafur Haukur Flygenring
2014-02-18Able to open project manager inside editor (Scene->Project Manager)marynate
Remove unnecessary include of project_manager.h