summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-02-20Merge pull request #104 from Nr7/masterokamstudio
2014-02-20Merge pull request #107 from bscranton/masterokamstudio
2014-02-20Merge pull request #109 from vinzenz/project-exportokamstudio
2014-02-20Merge pull request #116 from olifly/masterokamstudio
2014-02-20Merge pull request #123 from Terseus/fix-113_editor-settings-xml-corruptionokamstudio
2014-02-20Merge pull request #124 from kevinhartman/masterokamstudio
2014-02-20Merge pull request #128 from marynate/PR-stop-tracking-logo-hokamstudio
2014-02-20Merge pull request #110 from vinzenz/108-fixokamstudio
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
2014-02-18OSX current_videomode size is now initialized with correct resolution based o...Kevin Hartman
2014-02-18Fix #113 editor_settings.xml corruptionTerseus
2014-02-18Merge pull request #111 from vinzenz/obsolete-editor-plugin-removalreduz
2014-02-18Merge pull request #118 from Terseus/fix-19_non-ascii-pathsreduz
2014-02-18Merge pull request #115 from marynate/PR-open-pm-in-editorreduz
2014-02-18Fix #19 Can't open project (with non-ASCII path)Terseus
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
2014-02-17Removal of obsolete editor plugins Fixes #64Vinzenz Feenstra
2014-02-17Fix for Issue #108Vinzenz Feenstra
2014-02-17tools/editor/project_export: tree_vb already has a parentVinzenz Feenstra
2014-02-17windows StreamPeerWinsock::set_nodelay implementationBenjamin Scranton
2014-02-17Fixed two incorrect bindings in Physics2DServerNr7
2014-02-16Merge pull request #94 from marynate/PR-Fixed_Issue_93okamstudio
2014-02-16Fixed #93 Build error with latest commitmarynate
2014-02-15-project settings are saved when changedJuan Linietsky
2014-02-15-fixed bug in Button now exporting font propertyJuan Linietsky
2014-02-14Merge pull request #77 from vinzenz/shaderlang-test-crash-fixreduz
2014-02-14Merge pull request #69 from vinzenz/icon-issuereduz
2014-02-14Fixed crash bug in the shaderlang testVinzenz Feenstra
2014-02-14Addressed comments by Terseus to match the specVinzenz Feenstra
2014-02-14x11: Set icon issue fixVinzenz Feenstra
2014-02-14Merge pull request #62 from vinzenz/ccflags-handlingreduz
2014-02-14Merge pull request #59 from marynate/masterreduz
2014-02-14Merge pull request #23 from thetron/masterreduz
2014-02-13Fix CCFLAGS handlingVinzenz Feenstra
2014-02-13Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-13-fixed export templates not loading/exporting on WindowsJuan Linietsky
2014-02-13Add .gitignore to ignore autogenerated files in source repositorymarynate
2014-02-13Merge pull request #7 from fdb/font-import-typookamstudio
2014-02-13Merge pull request #34 from marynate/masterokamstudio
2014-02-13Merge pull request #11 from rafalcieslak/rotating-camera2dokamstudio
2014-02-13Merge pull request #17 from TiZ-EX1/masterokamstudio
2014-02-13Merge pull request #24 from jeremycw/osx-retinaokamstudio
2014-02-13Merge pull request #41 from mdcasey/masterreduz
2014-02-13Merge pull request #50 from imgxx/masterreduz
2014-02-12logo.pngImGxx