Juan Linietsky
62b568ebbf
Merge branch 'master' of https://github.com/godotengine/godot
2016-05-21 22:35:09 -03:00
Juan Linietsky
eacb8f04c4
Merge remote-tracking branch 'origin/master'
2016-05-21 22:34:55 -03:00
Ariel Manzur
dbb4c0c9b7
fixes android drivers build
2016-05-21 21:47:21 -03:00
Juan Linietsky
a75f896338
First version of Profiler
...
It is now possible to profile GDScript as well as some parts of Godot
internals.
2016-05-21 21:18:16 -03:00
Ariel Manzur
4c4d79e3c9
fix drivers build on ios
2016-05-21 21:07:34 -03:00
Ariel Manzur
12bd9ee6f2
fix
2016-05-21 20:07:32 -03:00
Ariel Manzur
6cf2353305
using 1 env for all drivers
2016-05-21 19:31:58 -03:00
Rémi Verschelde
87e8e8d372
i18n: Add gettext header template to the POT
2016-05-21 20:37:13 +02:00
Rémi Verschelde
10a50853df
i18n: Recreate template with improved script
2016-05-21 19:02:18 +02:00
Rémi Verschelde
8d300cc8a8
i18n: Disable line numbers in location context
...
Can be toggled on with --with-line-nb.
2016-05-21 18:59:27 +02:00
Rémi Verschelde
1c8a447cb6
i18n: Add location of duplicate strings to the context
2016-05-21 18:59:27 +02:00
Rémi Verschelde
bcd4d8a8a0
i18n: Cosmetic fixes to extract script
2016-05-21 18:33:40 +02:00
Rémi Verschelde
21f965f249
i18n: Fix another %i in vformat
2016-05-21 16:53:23 +02:00
Rémi Verschelde
be053e6286
i18n: Use %d instead of %i in vformat
...
Fixes #4742 .
2016-05-21 16:34:56 +02:00
Rémi Verschelde
a65a66b2a3
Merge pull request #4740 from Marqin/whitespace
...
remove trailing whitespace
2016-05-21 16:28:46 +02:00
Hubert Jarosz
33403d91f7
remove trailing whitespace
2016-05-21 15:29:25 +02:00
Rémi Verschelde
b0a5347a1c
Merge pull request #4737 from Geequlim/filesystem-show_in_explore
...
Changes to open dir in native explorer RMB option
2016-05-21 14:17:51 +02:00
Geequlim
83fe6a6bdb
Changes to open dir in native explorer RMB option
...
Rename 'Show In System' to 'Show In File Manager'
Replace path from DirAccess::get_full_path to Globals::globalize_path
2016-05-21 20:12:21 +08:00
Rémi Verschelde
da24bc8f3f
VehicleBody: Cosmetic fixes to previous commit
2016-05-21 11:52:21 +02:00
Agustin Benavidez
97da9f14ab
Add get_linear_velocity() method to VehicleBody class
...
Doc added also.
2016-05-21 11:35:55 +02:00
Rémi Verschelde
436debb045
Merge pull request #4733 from akien-mga/pr-i18n-proofreading
...
i18n: Proofreading of all strings
2016-05-21 11:34:19 +02:00
Rémi Verschelde
2b29e7ba6f
Merge pull request #4732 from marcelofg55/master
...
Added 'fat' option for bits param on scons for osx, this will produce…
2016-05-21 11:34:12 +02:00
Rémi Verschelde
2a6bd0c357
Merge pull request #4722 from MarianoGnu/master
...
Add Drag&Drop to ShaderGraphEditor's texture uniform graph node.
2016-05-21 11:33:16 +02:00
Rémi Verschelde
8061be1465
Merge pull request #4719 from Paulb23/multiline_duplication
...
Multiline duplication, issue #4661
2016-05-21 11:32:04 +02:00
Rémi Verschelde
674cfe21d3
Merge pull request #4700 from Geequlim/filesystem-show_in_explore
...
Add 'Show In System' option into filesystem RMB menu
2016-05-21 11:29:40 +02:00
Rémi Verschelde
00d8f86044
i18n: Second pass at proofreading
...
Mostly removing commented out strings, plus a few critical ones
that should not be translated.
2016-05-21 01:27:27 +02:00
Rémi Verschelde
c2d754516f
i18n: Sync template with previous commit
2016-05-21 00:21:57 +02:00
Rémi Verschelde
94c34ff890
i18n: Proofreading of all strings
...
Done to ensure that no important identifiers are translatable,
to fix compound strings using the new vformat() function, and
some general English proofreading here and there.
2016-05-21 00:21:57 +02:00
marcelofg55
eeb83982e2
Added 'fat' option for bits param on scons for osx, this will produce a fat binary that contains both 32 bits and 64 bits binaries
2016-05-20 17:31:30 -03:00
Rémi Verschelde
bc8df8feaa
Merge pull request #4728 from Geequlim/classref-edit
...
Document the FileDialog and partial OS methods
2016-05-20 15:49:33 +02:00
Geequlim
a92652d578
Document the FileDialog and partial OS methods
2016-05-20 21:39:31 +08:00
Rémi Verschelde
dfc50c06d6
Merge pull request #4726 from bojidar-bg/fix-docs
...
Fix a XML error with the documentation
2016-05-20 14:04:48 +02:00
captainwasabi
4b80895082
Fix for tooltip blinking ( #4713 )
...
Moved where active tooltips are canceled to wait until the mouse actually moves off the control.
2016-05-20 13:56:42 +02:00
Bojidar Marinov
d208572906
Fix a XML error with the documentation
2016-05-20 14:54:33 +03:00
MarianoGNU
5eaf0bcc20
Add Drag&Drop to ShaderGraphEditor's texture uniform graph node.
2016-05-19 17:38:06 -03:00
Paulb23
2eb4e7c103
Multiline duplication, issue #4661
2016-05-19 15:32:41 +01:00
Rémi Verschelde
5e0f0a962a
Android buildsystem: Drop obsolete NDK_TOOLCHAIN argument
...
It was a duplicate of NDK_TARGET, and not used for anything.
2016-05-19 10:44:18 +02:00
Rémi Verschelde
d7c9bb2565
Merge pull request #4707 from nounoursheureux/master
...
Check the save path before importing a 3D Mesh
2016-05-18 21:30:59 +02:00
Wilhem Barbier
f38473f65b
Check the save path before importing a 3D Mesh
2016-05-18 20:55:24 +02:00
Geequlim
5ad6480979
Add 'Show In System' option into filesystem RMB menu
2016-05-18 15:48:40 +08:00
Rémi Verschelde
926495d8eb
Merge pull request #4698 from volzhs/compile-no-tools
...
fix compile failure when tools=no
2016-05-18 07:34:24 +02:00
volzhs
ebcf04ff1f
fix compile failure when tools=no
2016-05-18 14:29:53 +09:00
Rémi Verschelde
3e61927790
i18n: Sync template with source
2016-05-17 23:49:42 +02:00
Rémi Verschelde
be4d95c19a
CanvasModulate: fix build issue with GCC
...
Bug from c195c0d
.
2016-05-17 23:47:26 +02:00
Rémi Verschelde
f33460aa23
i18n: Make .pot paths hopefully platform-independent
2016-05-17 23:37:20 +02:00
Juan Linietsky
c195c0df6b
-Added configuration warning system for nodes
...
-Added a new "add" and "instance" buttons for scene tree
-Added a vformat() function to ease translation work
2016-05-17 18:28:44 -03:00
Rémi Verschelde
3a26e14a2b
i18n: Simple extract.py improvements
...
Also sync the template with current source.
2016-05-17 19:29:32 +02:00
punto-
433de90564
Removing round from int interpolation
...
This might break some animations that use int tracks in continuous mode, but it should provide a more uniform interpolation for things like sprite frames.
2016-05-17 13:27:49 -03:00
Rémi Verschelde
8cb2e1be1b
Merge pull request #4690 from volzhs/dnd-visual
...
Scenetree Nodes drag and drop visual representation
2016-05-17 17:24:36 +02:00
volzhs
3dd722d92f
Scenetree Nodes drag and drop visual representation
...
fixes #4684
2016-05-17 23:27:35 +09:00