summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-17Merge pull request #1899 from guilhermefelipecgs/fix_#1897Juan Linietsky
Fix for scroll_to_line and search functions, fix #1897
2015-10-17Merge pull request #2053 from rodolforg/fix-import-button-labelJuan Linietsky
Small fix for Import Game dialog labels
2015-10-17Merge pull request #2203 from volzhs/fix_android_paymentsJuan Linietsky
Fix android payments
2015-10-17Merge pull request #2250 from PeaceSells50/AddedGridMapSettingsJuan Linietsky
Added GridMap settings which allows the user to enter a pick distance.
2015-10-17Merge pull request #2256 from sheepandshepherd/list-editsJuan Linietsky
List::move_before updates front/back pointers, fixes #2255
2015-10-17Merge pull request #2266 from MrGreenTea/masterJuan Linietsky
added floor() and ceil() to Vector3
2015-10-17Merge pull request #2330 from FEDE0D/parallax_fixJuan Linietsky
ParallaxBackground: added option to ignore camera zoom
2015-10-17Merge pull request #2357 from volzhs/prevent-to-change-tool-modeJuan Linietsky
prevent to change tool mode when control key is pressed
2015-10-17Merge pull request #2362 from AlexHolly/update-scene-tab-fixJuan Linietsky
[UI-FIX] - Update scene tabs on save
2015-10-17Merge pull request #2365 from Mavhod/patch-1Juan Linietsky
get_date on Linux
2015-10-17Merge pull request #2369 from Max-Might/masterJuan Linietsky
Haiku: platform support
2015-10-17Merge pull request #2380 from StraToN/tabs-buttonsJuan Linietsky
Tab close button + display policies + application on Scenes Tabs
2015-10-17Merge pull request #2395 from MrMormon/patch-1Juan Linietsky
Fixed misspelled local variable for code clarity
2015-10-17Merge pull request #2402 from ERIIX/masterJuan Linietsky
Properly free enemies after death in 3d platformer demo.
2015-10-17Merge pull request #2434 from cverdes/vsprojJuan Linietsky
Ignore some extension of files created by Visual Studio 2013
2015-10-17Merge pull request #2455 from firefly2442/hide-menu-fixJuan Linietsky
[UI fix] Hide opened menu when click on menu button
2015-10-17Merge pull request #2457 from firefly2442/doxygen-fixJuan Linietsky
Fix absolute paths used in doxygen, ignore generated documentation in Git
2015-10-17Merge pull request #2479 from firefly2442/cppcheck-unusedvarsJuan Linietsky
ran cppcheck, found unused variables
2015-10-17Merge pull request #2481 from firefly2442/cppcheck-arrayindexthencheckJuan Linietsky
ran cppcheck, fixed cases where array index is used before limits check
2015-10-17Merge pull request #2474 from masoudbh3/android-armeabi-v7aJuan Linietsky
Fix android build script
2015-10-17Merge pull request #2484 from firefly2442/add-physics-commandline-helpJuan Linietsky
add missing physics unit test to --help listing in main.cpp
2015-10-17Merge pull request #2485 from masoudbh3/fix-x11-editor-boot-splashJuan Linietsky
Fix X11 Editor Boot Splash (Maximized Boot Splash)
2015-10-17Merge pull request #2488 from slapin/remove-unimplemented-exporter-optionJuan Linietsky
Remove of use_exclude_ctrl_bones option
2015-10-17Merge pull request #2497 from vnen/fix-2490Juan Linietsky
Make dict2inst set internal members of instance
2015-10-17Merge pull request #2520 from bojidar-bg/patch-3Juan Linietsky
Add missing \n to world_wrap.
2015-10-17Merge pull request #2522 from ricpelo/masterJuan Linietsky
Disable filters for tilemap in 2D Platformer demo
2015-10-17Merge pull request #2531 from bojidar-bg/patch-4Juan Linietsky
Fix parameters of funcRef::call_func
2015-10-17Merge pull request #2549 from shackra/docdump-openprojJuan Linietsky
Documentation Converter from XML to Open Project wiki markup format
2015-10-17Merge pull request #2555 from jackmakesthings/class-reference-formattingJuan Linietsky
Readability improvements for the in-game class reference
2015-10-17Merge pull request #2556 from volzhs/fix_miss_bind_findnodeJuan Linietsky
fix miss bind for Node::find_node
2015-10-17Merge pull request #2569 from TheHX/issue_2567Juan Linietsky
Fix bug in EditorPlugin::add_custom_control
2015-10-17Merge pull request #2572 from leezh/clipping-fixJuan Linietsky
nested clipping of canvas items now works
2015-10-17Merge pull request #2584 from buresu/fix-parentheses-equality-warningsJuan Linietsky
[OSX Clang] Fix parentheses-equality warnings
2015-10-17Merge pull request #2587 from eska014/fix-area2d-mask-matchingJuan Linietsky
Fix Area/Area2D mask matching
2015-10-17Merge pull request #2589 from eska014/add-raycast2d-type_maskJuan Linietsky
Add type mask customization to RayCast2D
2015-10-17Merge pull request #2594 from Biliogadafr/PinSoftnessJuan Linietsky
Expose softness parameter of pin joint to the editor.
2015-10-17Merge pull request #2602 from sanikoyes/Pr-REUSE_ADDR_WIN32Juan Linietsky
Pr-REUSE_ADDR_WIN32
2015-10-17Merge pull request #2607 from StraToN/doc-updateJuan Linietsky
GraphEdit and GraphNode documentation
2015-10-17Merge pull request #2608 from didier-v/OSX_get_localeJuan Linietsky
Added specific get_locale to OSX platform
2015-10-17Haiku: fix buildKostadin Damyanov
2015-10-17Merge pull request #2609 from eska014/export-hintsJuan Linietsky
GDScript export hints: Add float w/ ease, remove duplicate, adapt multiline to established format
2015-10-16Merge branch 'master' of https://github.com/okamstudio/godotreduz
Conflicts: scene/resources/packed_scene.h
2015-10-16-fixes and more fixes to new scene system, seems stable now..reduz
BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
2015-10-16Add GDScript export hint for real numbers with easing `export(float, EASE)`eska
2015-10-16Added specific get_locale to OSX platformDidier Vandekerckhove
The default unix get_locale didn’t work. OS X requires a specific one.
2015-10-16Add multiline string GDScript export hint `export(String, MULTILINE)`eska
2015-10-16GraphEdit and GraphNode documentationJulian Murgia - StraToN
2015-10-16Revert "add flag and multiline hits in GDScript"eska
This reverts commit 7843ec6633625455e689e711aa62e9d8337689fa.
2015-10-13-A little More control about pixel snapping in 2DJuan Linietsky
2015-10-13REUSE_ADDR under windows platformsanikoyes