1a8f94edd4
Merge pull request #8370 from volzhs/fix-stylebox-master
...
Fix editor style box for ToolButton
2017-04-14 17:51:30 +02:00
6871ec708f
Merge pull request #8393 from hpvb/fix-8081
...
Correct Variant::hash_compare()
2017-04-14 17:51:05 +02:00
4e7c5eb498
Merge pull request #8356 from volzhs/texture-view-master
...
Prevent to take too much space for long vertical texture
2017-04-14 17:50:29 +02:00
58edf26500
Merge pull request #8374 from nunodonato/killimport
...
Removed the deprecated Import menu from the main editor.
2017-04-14 17:50:16 +02:00
8ff6e53833
Correct Variant::hash_compare()
...
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.
2017-04-14 11:31:18 +02:00
a96e795241
Merge pull request #8402 from neikeq/pr-fix-binds
...
PackedScene: Fix wrong DEFVAL
2017-04-14 03:14:01 +02:00
34a8547722
Merge pull request #8399 from mbrickn/patch-1
...
Changed a link from http to https
2017-04-14 02:19:38 +02:00
30835f9d37
PackedScene: Fix wrong DEFVAL
2017-04-14 02:18:38 +02:00
984aeffd79
Changed a link from http to https
...
This is a really minor change. I just changed the link to the IRC channel login from http to https.
Thank you! ^ _ ^
2017-04-13 17:54:16 -04:00
c4d3dd1a48
Merge pull request #8379 from karroffel/obj-import-reenable
...
re-enabled obj import
2017-04-12 22:27:19 +02:00
3bc09da0b1
re-enabled obj import
2017-04-12 22:22:13 +02:00
2025672e7b
Removed the deprecated Import menu from the main editor.
2017-04-12 13:32:22 +01:00
25a4daa5ce
Fix editor style box for ToolButton
2017-04-12 12:40:16 +09:00
e46af1e236
Merge pull request #8362 from bojidar-bg/fix-llvm-marshalls
...
Fix a pesky bug in marshalls.cpp/encode_variant
2017-04-11 20:07:58 +02:00
c37840c69f
Fix a pesky bug in marshalls.cpp/encode_variant
...
Fixes #7556 running game from editor on LLVM builds.
2017-04-11 20:17:56 +03:00
faee2fbf62
Merge pull request #8360 from karroffel/gdnative-string-c-functions
...
[GDNative] made string functions more C-friendly
2017-04-11 15:47:12 +02:00
be2ad4f155
[GDNative] made string functions more C-friendly
2017-04-11 14:58:59 +02:00
c3e6759ca1
Prevent to take too much space for long vertical texture
2017-04-11 20:37:22 +09:00
09ed1113fa
Merge pull request #8352 from karroffel/gdnative-misc-fixes
...
[GDNative] misc fixes
2017-04-11 02:25:18 +02:00
544940c175
[GDNative] C API and generator fixes
2017-04-11 01:45:58 +02:00
7919ec6d89
[GDNative] re-enabled some init options
2017-04-11 01:45:58 +02:00
200c84b6b2
Fix joystick crash when mapping is -1
2017-04-10 23:41:47 +02:00
2ac0cf568d
Merge pull request #8350 from karroffel/gdnative-api-reference-field
...
[GDNative] added is_reference filed to api.json
2017-04-10 22:30:57 +02:00
a1413b9a68
Merge pull request #8349 from karroffel/gdnative-constructor
...
[GDNative] function to get class constructor
2017-04-10 22:30:45 +02:00
c562cc9ea0
[GDNative] added is_reference filed to api.json
2017-04-10 21:32:20 +02:00
cf45f3ab4b
[GDNative] function to get class constructor
2017-04-10 19:56:12 +02:00
246dfc65ca
Fix crash on exit.
...
First it crashed in the thread that checks for android devices, then in the audio driver.
2017-04-10 19:51:07 +02:00
551e64728f
.gitignore: Add app_icon.h and splash.h generated headers
...
Also sort alphabetically for clarity.
2017-04-10 18:34:45 +02:00
31a80ded89
Re-add ouya gamepad mapping.
...
Also adds yet another type of ps4 controller.
2017-04-10 16:35:12 +02:00
61a27601f7
Merge pull request #8341 from RameshRavone/master
...
Android: avoiding duplicates in build.gradle
2017-04-10 08:58:15 +02:00
5598040e43
Merge pull request #8339 from karroffel/gdnative-reload-fix
...
[GDNative] Didn't iterate over all scripts
2017-04-10 08:53:49 +02:00
8764659234
Merge pull request #8342 from volzhs/error-signal-dnd
...
Fix signal error when starting editor
2017-04-10 08:29:41 +02:00
8589ca3903
Rename [gs]et_pos to [gs]et_position for Controls
...
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-10 08:27:34 +02:00
519c03e932
Fix signal error when starting editor
...
need to merge #8198 to work properly
2017-04-10 13:00:08 +09:00
f8309f86c2
Android: avoiding duplicates in build.gradle
2017-04-10 08:34:40 +05:30
0486645c39
[GDNative] Didn't iterate over all scripts
2017-04-10 04:30:08 +02:00
1c480698ce
-Fixed crash with splash screen on windows
...
-properly show editor without having to resize window on windows
2017-04-09 20:40:48 -03:00
7ba71fb243
Restored (And auto-generated) splash image
2017-04-09 20:03:38 -03:00
d596946a45
Merge pull request #8271 from MattUV/master
...
Add methods to get and set bits of collision layers and masks for TileMaps (3.0)
2017-04-09 23:37:56 +02:00
93b417fe17
Android: Support to change minSdkVersion ( #8313 )
2017-04-09 23:35:34 +02:00
fccf2816d4
-Fix eternal black screen on Windows
...
-Disabled warnings on windows, need to properly set up warnings
2017-04-09 17:59:17 -03:00
2cca9b0631
Merge pull request #8338 from karroffel/dlscript-gdnative-rename
...
renamed dlscript module to gdnative
2017-04-09 22:08:56 +02:00
c7f8b22ba0
renamed dlscript module to gdnative
2017-04-09 21:07:53 +02:00
0198d2e03c
Merge pull request #8329 from touilleMan/dlscript-godot_get_global_constants
...
GlobalConstants support in DLScript & api.json
2017-04-09 19:40:54 +02:00
b423529481
Change dlscript's godot_get_global_constants signature to return godot_dictionary
2017-04-09 19:04:10 +02:00
cd9e96c835
Merge pull request #8336 from RayKoopa/ignore_vs_folder
...
Ignore Visual Studio 2017 workspace folder
[ci skip]
2017-04-09 18:29:56 +02:00
ac6ef54500
Ignore .vs folder, fix .vscode comment
2017-04-09 17:50:46 +02:00
f29dc079dc
Merge pull request #8333 from touilleMan/classdb-class_sget_property-binding
...
Add _ClassDB.class_[g|s]et_property to ClassDB exposed methods
2017-04-09 17:46:35 +02:00
769bec26a7
Merge pull request #8321 from RandomShaper/zero-preprocess-particles2d
...
Allow zero preprocess time for Particles2D
2017-04-09 17:44:40 +02:00
d463b6e3d0
libpng: Update to upstream version 1.6.29
2017-04-09 15:47:25 +02:00
Andreas Haas
Hein-Pieter van Braam
Ignacio Etcheverry
Maxwell Paul Brickner
Rémi Verschelde
Karroffel
Nuno Donato
volzhs
Bojidar Marinov
Thomas Herzog
darkoff9
Andreas Haas
Sergey Pusnei
Ramesh Ravone
Juan Linietsky
Emmanuel Leblond
Ray Koopa