summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-04-14Merge pull request #8402 from neikeq/pr-fix-bindsAndreas Haas
PackedScene: Fix wrong DEFVAL
2017-04-14Merge pull request #8399 from mbrickn/patch-1Andreas Haas
Changed a link from http to https
2017-04-14PackedScene: Fix wrong DEFVALIgnacio Etcheverry
2017-04-13Changed a link from http to httpsMaxwell Paul Brickner
This is a really minor change. I just changed the link to the IRC channel login from http to https. Thank you! ^ _ ^
2017-04-12Merge pull request #8379 from karroffel/obj-import-reenableRémi Verschelde
re-enabled obj import
2017-04-12re-enabled obj importKarroffel
2017-04-11Merge pull request #8362 from bojidar-bg/fix-llvm-marshallsRémi Verschelde
Fix a pesky bug in marshalls.cpp/encode_variant
2017-04-11Fix a pesky bug in marshalls.cpp/encode_variantBojidar Marinov
Fixes #7556 running game from editor on LLVM builds.
2017-04-11Merge pull request #8360 from karroffel/gdnative-string-c-functionsThomas Herzog
[GDNative] made string functions more C-friendly
2017-04-11[GDNative] made string functions more C-friendlyKarroffel
2017-04-11Merge pull request #8352 from karroffel/gdnative-misc-fixesThomas Herzog
[GDNative] misc fixes
2017-04-11[GDNative] C API and generator fixesKarroffel
2017-04-11[GDNative] re-enabled some init optionsKarroffel
2017-04-10Fix joystick crash when mapping is -1darkoff9
2017-04-10Merge pull request #8350 from karroffel/gdnative-api-reference-fieldThomas Herzog
[GDNative] added is_reference filed to api.json
2017-04-10Merge pull request #8349 from karroffel/gdnative-constructorThomas Herzog
[GDNative] function to get class constructor
2017-04-10[GDNative] added is_reference filed to api.jsonKarroffel
2017-04-10[GDNative] function to get class constructorKarroffel
2017-04-10Fix crash on exit.Andreas Haas
First it crashed in the thread that checks for android devices, then in the audio driver.
2017-04-10.gitignore: Add app_icon.h and splash.h generated headersRémi Verschelde
Also sort alphabetically for clarity.
2017-04-10Re-add ouya gamepad mapping.Andreas Haas
Also adds yet another type of ps4 controller.
2017-04-10Merge pull request #8341 from RameshRavone/masterRémi Verschelde
Android: avoiding duplicates in build.gradle
2017-04-10Merge pull request #8339 from karroffel/gdnative-reload-fixRémi Verschelde
[GDNative] Didn't iterate over all scripts
2017-04-10Merge pull request #8342 from volzhs/error-signal-dndRémi Verschelde
Fix signal error when starting editor
2017-04-10Rename [gs]et_pos to [gs]et_position for ControlsSergey Pusnei
Control set_pos -> set_position Control set_global_pos -> set_global_position [gs]et_mouse_pos -> [gs]et_mouse_position [gs]et_global_mouse_pos -> [gs]et_global_mouse_position fixes #8005
2017-04-10Fix signal error when starting editorvolzhs
need to merge #8198 to work properly
2017-04-10Android: avoiding duplicates in build.gradleRamesh Ravone
2017-04-10[GDNative] Didn't iterate over all scriptsKarroffel
2017-04-09-Fixed crash with splash screen on windowsJuan Linietsky
-properly show editor without having to resize window on windows
2017-04-09Restored (And auto-generated) splash imageJuan Linietsky
2017-04-09Merge pull request #8271 from MattUV/masterRémi Verschelde
Add methods to get and set bits of collision layers and masks for TileMaps (3.0)
2017-04-09Android: Support to change minSdkVersion (#8313)Ramesh Ravone
2017-04-09-Fix eternal black screen on WindowsJuan Linietsky
-Disabled warnings on windows, need to properly set up warnings
2017-04-09Merge pull request #8338 from karroffel/dlscript-gdnative-renameRémi Verschelde
renamed dlscript module to gdnative
2017-04-09renamed dlscript module to gdnativeKarroffel
2017-04-09Merge pull request #8329 from touilleMan/dlscript-godot_get_global_constantsRémi Verschelde
GlobalConstants support in DLScript & api.json
2017-04-09Change dlscript's godot_get_global_constants signature to return ↵Emmanuel Leblond
godot_dictionary
2017-04-09Merge pull request #8336 from RayKoopa/ignore_vs_folderRémi Verschelde
Ignore Visual Studio 2017 workspace folder [ci skip]
2017-04-09Ignore .vs folder, fix .vscode commentRay Koopa
2017-04-09Merge pull request #8333 from touilleMan/classdb-class_sget_property-bindingRémi Verschelde
Add _ClassDB.class_[g|s]et_property to ClassDB exposed methods
2017-04-09Merge pull request #8321 from RandomShaper/zero-preprocess-particles2dRémi Verschelde
Allow zero preprocess time for Particles2D
2017-04-09libpng: Update to upstream version 1.6.29Rémi Verschelde
2017-04-09opus: Update to upstream version 1.1.4Rémi Verschelde
2017-04-09squish: Update to upstream version 1.15Rémi Verschelde
Also fix clang-format pre-commit hook to ignore thirdparty files.
2017-04-09Style: Apply clang-format (3.9.1) to Obj-C++ filesRémi Verschelde
2017-04-09Merge pull request #8332 from BastiaanOlij/format-mmRémi Verschelde
Formatting of mm files
2017-04-09Add return value in ClassDB.class_[g|s]et_property bindingsEmmanuel Leblond
2017-04-09Add _ClassDB.class_[g|s]et_property to ClassDB exposed methodsEmmanuel Leblond
2017-04-09Formatting of mm filesBastiaanOlij
2017-04-09Add GlobalConstants entry to the dlscript's api.json generatorEmmanuel Leblond