summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-06-23Merge pull request #2168 from KillerJaguar/input-helperJuan Linietsky
2015-06-23Merge pull request #2172 from jrimclean/developmentJuan Linietsky
2015-06-23Merge branch 'master' of github.com:okamstudio/godot into developmentJames McLean
2015-06-23Added helper methods to InputEventJaguar
2015-06-23Merge pull request #2166 from TheHX/collision_shape_editorJuan Linietsky
2015-06-23Merge pull request #2165 from TheHX/issue_2102Juan Linietsky
2015-06-23CollisionShape2D visual editorFranklin Sobrinho
2015-06-23Fix for issue related to GridMap editorFranklin Sobrinho
2015-06-23Merge pull request #1907 from tommy3/show-hidden-filesJuan Linietsky
2015-06-23Merge pull request #1972 from PeaceSells50/UsefulVSSconsEnvsJuan Linietsky
2015-06-23Merge pull request #2068 from Krzycho666/color_rampJuan Linietsky
2015-06-22Merge pull request #2058 from volzhs/create_from_fntJuan Linietsky
2015-06-22Merge pull request #2070 from Krzycho666/AnimationPlayer_fixJuan Linietsky
2015-06-22Merge pull request #2072 from jrimclean/masterJuan Linietsky
2015-06-22Merge pull request #2080 from bojidar-bg/patch-1Juan Linietsky
2015-06-22Merge pull request #2088 from KillerJaguar/setter-fixJuan Linietsky
2015-06-22Merge pull request #2090 from volzhs/pmr_virtualJuan Linietsky
2015-06-22Merge pull request #2101 from sanikoyes/Pr-script-editor-save-stateJuan Linietsky
2015-06-22Merge pull request #2132 from gber/masterJuan Linietsky
2015-06-22small in place fixesJuan Linietsky
2015-06-22Merge pull request #2144 from Krzycho666/UndoRedo_fixJuan Linietsky
2015-06-22Merge pull request #2145 from PeaceSells50/More_VS_Scons_ChangesJuan Linietsky
2015-06-22Merge pull request #2149 from TheHX/item_list_paletteJuan Linietsky
2015-06-22Merge pull request #2150 from guilhermefelipecgs/add_editor_configJuan Linietsky
2015-06-22Merge branch 'master' of github.com:okamstudio/godot into developmentJames McLean
2015-06-22ability to set process on parent nodes on visibility notifierJuan Linietsky
2015-06-22Add .editorconfigGuilherme Felipe
2015-06-22Small fixes for Grid/Tile map editor paletteFranklin Sobrinho
2015-06-22Grid/Tile map editor new item paletteFranklin Sobrinho
2015-06-22added some missing biddingskrzycho
2015-06-22Fixed compilation error on MacOS X.James McLean
2015-06-22Merge branch 'master' of github.com:okamstudio/godot into developmentJames McLean
2015-06-21Merge branch 'master' of github.com:okamstudio/godot into developmentJames McLean
2015-06-22Multiple scene editing *POTENTIALLY UNSTABLE*Juan Linietsky
2015-06-21- added GDscript bidings for UndoRedo class mechanizmkrzycho
2015-06-21Setting build vs properties in scons.Peace Sells
2015-06-20Fix typo that produced invalid markup for imagesGuido Berhoerster
2015-06-19Hide projects folder.Peace Sells
2015-06-16Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-06-16fix "v" pivot adjust functionJuan Linietsky
2015-06-16Script editor: restore line/column after script reloadsanikoyes
2015-06-15fix register Physics2DTestMotionResultvolzhs
2015-06-14fixed small refresh issue when moving docksJuan Linietsky
2015-06-14fixes for dock motionJuan Linietsky
2015-06-14missing changesJuan Linietsky
2015-06-13Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-06-13some editor window changesJuan Linietsky
2015-06-13Fixed variables being set before calling the setter methodJaguar
2015-06-13Delete .fscache from fog_of_war demo, closes #2079.Bojidar Marinov
2015-06-13Resolved a merge conflict.Bojidar Marinov