aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Implement HTML5 touch eventsL. Krause2017-04-262-206/+109
|
* Reimplement HTML5 mouse input without GLUTL. Krause2017-04-253-93/+113
| | | | Fixes inverted scrolling on Chromium
* Merge pull request #8362 from bojidar-bg/fix-llvm-marshallsRémi Verschelde2017-04-111-1/+1
|\ | | | | Fix a pesky bug in marshalls.cpp/encode_variant
| * Fix a pesky bug in marshalls.cpp/encode_variantBojidar Marinov2017-04-111-1/+1
|/ | | | Fixes #7556 running game from editor on LLVM builds.
* Merge pull request #8360 from karroffel/gdnative-string-c-functionsThomas Herzog2017-04-112-7/+7
|\ | | | | [GDNative] made string functions more C-friendly
| * [GDNative] made string functions more C-friendlyKarroffel2017-04-112-7/+7
|/
* Merge pull request #8352 from karroffel/gdnative-misc-fixesThomas Herzog2017-04-113-3/+2
|\ | | | | [GDNative] misc fixes
| * [GDNative] C API and generator fixesKarroffel2017-04-112-1/+2
| |
| * [GDNative] re-enabled some init optionsKarroffel2017-04-111-2/+0
|/
* Fix joystick crash when mapping is -1darkoff92017-04-101-0/+1
|
* Merge pull request #8350 from karroffel/gdnative-api-reference-fieldThomas Herzog2017-04-101-3/+3
|\ | | | | [GDNative] added is_reference filed to api.json
| * [GDNative] added is_reference filed to api.jsonKarroffel2017-04-101-3/+3
| |
* | Merge pull request #8349 from karroffel/gdnative-constructorThomas Herzog2017-04-102-0/+11
|\ \ | | | | | | [GDNative] function to get class constructor
| * | [GDNative] function to get class constructorKarroffel2017-04-102-0/+11
| |/
* | Fix crash on exit.Andreas Haas2017-04-102-0/+11
| | | | | | | | First it crashed in the thread that checks for android devices, then in the audio driver.
* | .gitignore: Add app_icon.h and splash.h generated headersRémi Verschelde2017-04-101-19/+20
| | | | | | | | Also sort alphabetically for clarity.
* | Re-add ouya gamepad mapping.Andreas Haas2017-04-101-0/+2
|/ | | | Also adds yet another type of ps4 controller.
* Merge pull request #8341 from RameshRavone/masterRémi Verschelde2017-04-102-23/+21
|\ | | | | Android: avoiding duplicates in build.gradle
| * Android: avoiding duplicates in build.gradleRamesh Ravone2017-04-102-23/+21
| |
* | Merge pull request #8339 from karroffel/gdnative-reload-fixRémi Verschelde2017-04-101-13/+11
|\ \ | | | | | | [GDNative] Didn't iterate over all scripts
| * | [GDNative] Didn't iterate over all scriptsKarroffel2017-04-101-13/+11
| | |
* | | Merge pull request #8342 from volzhs/error-signal-dndRémi Verschelde2017-04-101-1/+1
|\ \ \ | | | | | | | | Fix signal error when starting editor
| * | | Fix signal error when starting editorvolzhs2017-04-101-1/+1
| | |/ | |/| | | | | | | need to merge #8198 to work properly
* / | Rename [gs]et_pos to [gs]et_position for ControlsSergey Pusnei2017-04-1082-330/+330
|/ / | | | | | | | | | | | | | | 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
* | -Fixed crash with splash screen on windowsJuan Linietsky2017-04-093-1/+3
| | | | | | | | -properly show editor without having to resize window on windows
* | Restored (And auto-generated) splash imageJuan Linietsky2017-04-099-1425/+112
| |
* | Merge pull request #8271 from MattUV/masterRémi Verschelde2017-04-092-1/+43
|\ \ | | | | | | Add methods to get and set bits of collision layers and masks for TileMaps (3.0)
| * | Add set/get_collision_layer/mask_bit() to TileMapsMattUV2017-04-062-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add four methods to the TileMap node to make collision layers and masks be modified bit by bit (like PhysicBody2Ds and RayCast2Ds: * set_collision_layer_bit() * set_collision_mask_bit() * get_collision_layer_bit() * get_collision_mask_bit() To comply with collision layers' renaming from https://github.com/godotengine/godot/issues/5696 , the method names are NOT set/get_layer_mask_bit()
* | | Android: Support to change minSdkVersion (#8313)Ramesh Ravone2017-04-092-2/+14
| | |
* | | -Fix eternal black screen on WindowsJuan Linietsky2017-04-096-6/+10
| | | | | | | | | | | | -Disabled warnings on windows, need to properly set up warnings
* | | Merge pull request #8338 from karroffel/dlscript-gdnative-renameRémi Verschelde2017-04-0971-1300/+2448
|\ \ \ | | |/ | |/| renamed dlscript module to gdnative
| * | renamed dlscript module to gdnativeKarroffel2017-04-0971-1300/+2448
|/ /
* | Merge pull request #8329 from touilleMan/dlscript-godot_get_global_constantsRémi Verschelde2017-04-093-0/+34
|\ \ | | | | | | GlobalConstants support in DLScript & api.json
| * | Change dlscript's godot_get_global_constants signature to return ↵Emmanuel Leblond2017-04-092-4/+7
| | | | | | | | | | | | godot_dictionary
| * | Add GlobalConstants entry to the dlscript's api.json generatorEmmanuel Leblond2017-04-092-2/+20
| | |
| * | Add godot_get_global_constants function to dlscriptEmmanuel Leblond2017-04-082-0/+13
| | |
* | | Merge pull request #8336 from RayKoopa/ignore_vs_folderRémi Verschelde2017-04-091-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Ignore Visual Studio 2017 workspace folder [ci skip]
| * | | Ignore .vs folder, fix .vscode commentRay Koopa2017-04-091-2/+2
| | | |
* | | | Merge pull request #8333 from touilleMan/classdb-class_sget_property-bindingRémi Verschelde2017-04-092-0/+21
|\ \ \ \ | | | | | | | | | | Add _ClassDB.class_[g|s]et_property to ClassDB exposed methods
| * | | | Add return value in ClassDB.class_[g|s]et_property bindingsEmmanuel Leblond2017-04-091-2/+2
| | | | |
| * | | | Add _ClassDB.class_[g|s]et_property to ClassDB exposed methodsEmmanuel Leblond2017-04-092-0/+21
| | |/ / | |/| |
* | | | Merge pull request #8321 from RandomShaper/zero-preprocess-particles2dRémi Verschelde2017-04-091-1/+1
|\ \ \ \ | | | | | | | | | | Allow zero preprocess time for Particles2D
| * | | | Allow zero preprocess time for Particles2DPedro J. Estébanez2017-04-081-1/+1
| | | | |
* | | | | libpng: Update to upstream version 1.6.29Rémi Verschelde2017-04-098-40/+138
| | | | |
* | | | | opus: Update to upstream version 1.1.4Rémi Verschelde2017-04-092-2/+3
| | | | |
* | | | | squish: Update to upstream version 1.15Rémi Verschelde2017-04-094-9/+31
| | | | | | | | | | | | | | | | | | | | Also fix clang-format pre-commit hook to ignore thirdparty files.
* | | | | Style: Apply clang-format (3.9.1) to Obj-C++ filesRémi Verschelde2017-04-0914-694/+629
| | | | |
* | | | | Merge pull request #8332 from BastiaanOlij/format-mmRémi Verschelde2017-04-0912-1190/+1067
|\ \ \ \ \ | |_|_|/ / |/| | | | Formatting of mm files
| * | | | Formatting of mm filesBastiaanOlij2017-04-0912-1190/+1067
|/ / / /
* | | | Merge pull request #8319 from bojidar-bg/gdscript-inline-block-indentRémi Verschelde2017-04-091-3/+3
|\ \ \ \ | | | | | | | | | | Fixup #8123, seems like I forgot a few things