aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ScriptEditor: Fixes bug where menu option would be handled twiceIgnacio Etcheverry2017-04-171-19/+20
|
* Merge pull request #8394 from eska014/fbo-depth-formatAndreas Haas2017-04-151-2/+2
|\ | | | | Fix FBO depth texture format
| * Fix FBO depth texture formatL. Krause2017-04-151-2/+2
| |
* | Merge pull request #8411 from touilleMan/gdnative-vector2-vector3Thomas Herzog2017-04-155-96/+346
|\ \ | | | | | | [GDnative] Implement missing functions in gdnative vector2 and vector3 bindings
| * | Correct indentation in gdnative vector2/3Emmanuel Leblond2017-04-154-139/+168
| | |
| * | Implement missing functions in gdnative vector2 and vector3 bindingsEmmanuel Leblond2017-04-155-82/+303
|/ /
* | Merge pull request #8389 from volzhs/inspector-button-margin-masterAndreas Haas2017-04-141-0/+1
|\ \ | | | | | | Make buttons closer in Inspector panel
| * | Make buttons closer in Inspector panelvolzhs2017-04-141-0/+1
| | |
* | | Merge pull request #8370 from volzhs/fix-stylebox-masterAndreas Haas2017-04-141-10/+4
|\ \ \ | | | | | | | | Fix editor style box for ToolButton
| * | | Fix editor style box for ToolButtonvolzhs2017-04-121-10/+4
| |/ /
* | | Merge pull request #8393 from hpvb/fix-8081Andreas Haas2017-04-142-19/+1
|\ \ \ | | | | | | | | Correct Variant::hash_compare()
| * | | Correct Variant::hash_compare()Hein-Pieter van Braam2017-04-142-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a logic error in #7815 which made Variant.hash_compare() == Variant.hash_compare() always true. In an attempt to short-circuit the NaN check I made an (in hindsight) obvious error: 10 == 12 || is_nan(10) == is_nan(12) This will be true for all inputs, except for the NaN, not-NaN case. The macro has been updated to now generate: (10 == 12) || (is_nan(10) && is_nan(10)) so: (10 == 12) || (is_nan(10) && is_nan(12)) = false False or (False and False) is False (10 == 10) || (is_nan(10) && is_nan(10)) = true True or (False and False) is True (Nan == 10) || (is_nan(NaN) && is_nan(10)) = false False or (True and False) is False (Nan == Nan) || (is_nan(NaN) && is_nan(NaN)) = true False or (True and True) is True Which is correct for all cases. This bug was triggered because the hash function for floating point numbers can very easily generate collisions for the tested Vector3(). I've also added an extra hashing step to the float hash function to make this less likely to occur. This fixes #8081 and probably many more random weirdness.
* | | | Merge pull request #8356 from volzhs/texture-view-masterAndreas Haas2017-04-141-0/+8
|\ \ \ \ | | | | | | | | | | Prevent to take too much space for long vertical texture
| * | | | Prevent to take too much space for long vertical texturevolzhs2017-04-111-0/+8
| | |/ / | |/| |
* | | | Merge pull request #8374 from nunodonato/killimportAndreas Haas2017-04-142-26/+0
|\ \ \ \ | | | | | | | | | | Removed the deprecated Import menu from the main editor.
| * | | | Removed the deprecated Import menu from the main editor.Nuno Donato2017-04-122-26/+0
| | |_|/ | |/| |
* | | | Merge pull request #8402 from neikeq/pr-fix-bindsAndreas Haas2017-04-141-1/+1
|\ \ \ \ | | | | | | | | | | PackedScene: Fix wrong DEFVAL
| * | | | PackedScene: Fix wrong DEFVALIgnacio Etcheverry2017-04-141-1/+1
| | | | |
* | | | | Merge pull request #8399 from mbrickn/patch-1Andreas Haas2017-04-141-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Changed a link from http to https
| * | | | Changed a link from http to httpsMaxwell Paul Brickner2017-04-131-1/+1
|/ / / / | | | | | | | | | | | | | | | | This is a really minor change. I just changed the link to the IRC channel login from http to https. Thank you! ^ _ ^
* | | | Merge pull request #8379 from karroffel/obj-import-reenableRémi Verschelde2017-04-121-3/+3
|\ \ \ \ | |_|/ / |/| | | re-enabled obj import
| * | | re-enabled obj importKarroffel2017-04-121-3/+3
|/ / /
* | | 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
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-12 10:44:16 +0000