godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,183 Commits 15 Branches 59 Tags 2.2 GiB
Commit Graph

4183 Commits

Author SHA1 Message Date
marcelofg55 4e0f2389c3 Merge remote-tracking branch 'upstream/master' 2016-06-02 18:56:28 -03:00
Rémi Verschelde bc25492e63 Update to libpng 1.5.27 
No security relevant fix as far as I can see, but the version bump
does not hurt either.
 2016-06-02 23:28:54 +02:00
Rémi Verschelde fa4a82a867 Merge pull request #5001 from derderder77/master 
Add some french translation.
 2016-06-02 22:38:40 +02:00
derderder 6829b4b57b Improve french translation 2016-06-02 22:22:37 +02:00
Rémi Verschelde b38ee6b1f9 Merge pull request #4989 from volzhs/fix-texture-atlas-error 
fix crash and error with texture atlas
 2016-06-02 22:07:05 +02:00
Rémi Verschelde 25800e958c Merge pull request #5003 from volzhs/translation-korean 
Add Korean translation
 2016-06-02 22:04:32 +02:00
volzhs d9eab56bf0 Add Korean translation 2016-06-03 04:55:31 +09:00
Rémi Verschelde da950fcc3f Merge pull request #4995 from Warlaan/tooltips_in_create_dialog 
Added classes' short descriptions as tooltips in the create dialog.
 2016-06-02 21:43:37 +02:00
Warlaan fe3a68c4c2 Added classes' short descriptions as tooltips in the create dialog. 2016-06-02 21:02:48 +02:00
volzhs 9073dc9963 change invalid characters when get user data dir on Windows & Unix 
Can't create user data folder when project name has ``\ / : * ? " < > |`` characters on OS_Windows & OS_Unix.
So, change it to ``-`` to be able to make folder.

fixes #4928 and it's altanative to #4986.
 2016-06-03 03:39:37 +09:00
volzhs ee7d94bf11 fix invalid texture plugin name 
EditorTextureImportPlugin had ``texture_2d``, ``texture_3d``, ``texture_atlas`` and ``larget_texture``.
These are now just ``texture``.
 2016-06-02 22:13:55 +09:00
volzhs fc73f0c8b0 fix crash and error with texture atlas 
- crashes at Project Export Settings > Preview Atlas
- error message when export project

```
ERROR: EditorImportExport::get_import_plugin_by_name: Condition ' !by_idx.has(p_string) ' is true. returned: Ref<EditorImportPlugin>()
   At: tools\editor\editor_import_export.cpp:1548
```

it is caused by 8be2fabbe5 (diff-67a74bd708380c6b3baa717bb178dd47R802)
 2016-06-02 22:03:58 +09:00
Rémi Verschelde 182ee80b7d Merge pull request #4926 from Paulb23/fullscreen_and_distraction_free_mode 
Added fullscreen and distraction free modes
 2016-06-02 08:38:53 +02:00
Rémi Verschelde e57bca90ab Merge pull request #4982 from vnen/pr-android-flags 
Remove Make-related flags from Android build
 2016-06-02 07:23:41 +02:00
George Marques 408c26ce0b
Remove Make-related flags from Android build 
They were wrongly placed, creating a file named "-fpic" instead of
applying "-fpic" to the build. This file was in .gitignore, which made it
less noticiable.

This also adds build.gradle to .gitignore.
 2016-06-01 21:14:57 -03:00
Juan Linietsky cc0a7b24e7 missed ifdef that broke android build 2016-06-01 20:44:34 -03:00
Juan Linietsky 9e745b920f Ability to reload scripts on running game 2016-06-01 20:31:42 -03:00
Rémi Verschelde 45752eaae4 Merge pull request #4979 from neikeq/pr-fix-defval 
Removed invalid DEFVAL for HTTPClient::request_raw
 2016-06-01 23:43:29 +02:00
Ignacio Etcheverry cceb842a48 Removed invalid DEFVAL for HTTPClient::request_raw 2016-06-01 18:47:04 +02:00
Juan Linietsky 4ec2b1434f removed dependency on shcore.dll to get DPI 
fixes #4973
 2016-06-01 12:43:52 -03:00
Rémi Verschelde 5b9ff5f494 Merge pull request #4976 from J08nY/issue-4947 
Sort translations
 2016-06-01 17:18:44 +02:00
Saracen 4bcc60008d Expose Vector2 abs method to scripts 2016-06-01 15:47:53 +01:00
Saracen 445909c1e1 Exposed remaining PROPERTY_USAGE constants to script 2016-06-01 15:47:49 +01:00
Saracen 7ebc422945 Expose string 'erase' method to script 2016-06-01 15:47:46 +01:00
J08nY 4192d6d551
Sort l18n while building 2016-06-01 15:56:19 +02:00
Juan Linietsky 33bb0491f8 Merge pull request #4952 from sanikoyes/Pr-fix-stb-font-prop 
fix stb font property names
 2016-06-01 10:33:28 -03:00
Rémi Verschelde 9b3319b70d Merge pull request #4974 from DimOkGamer/added_3_more_translatable_strings 
Added 3 more translatable strings
 2016-06-01 13:53:17 +02:00
DimOkGamer 4a1a6c0d06 1 changed string 2016-06-01 14:36:02 +03:00
DimOkGamer f7d0110cdf Added 3 more translatable strings 
and fixed russian localization based on user feedback.

Added strings already contained in the current version of the
localization.
 2016-06-01 14:32:20 +03:00
Rémi Verschelde f2efa22c96 Merge pull request #4971 from P-GLEZ/master 
StaticBody documentation
 2016-06-01 12:47:55 +02:00
Rémi Verschelde bca3864492 Merge pull request #4972 from hyperglow/master 
i18n: Improve existing german translations. Merged two po files.
 2016-06-01 12:44:41 +02:00
P-GLEZ 35cb75220d StaticBody documentation 
Documented StaticBody. Also corrected an error in StaticBody2D
documentation
 2016-06-01 12:35:25 +02:00
hyperglow ec3d23c323 i18n: Improve existing german translations. Merged two po files. 2016-06-01 12:13:29 +02:00
Rémi Verschelde 9d036f51a3 Merge pull request #4968 from ajacobsen/german-translation-fix 
i18n: Improve existing german translations
 2016-06-01 08:37:25 +02:00
atze 195a76632a i18n: Improve existing german translations 2016-06-01 08:28:00 +02:00
Rémi Verschelde 0dc6ee9c1e Merge pull request #4964 from toby3d/patch-1 
Morphological and stylistic corrections in ru.po
 2016-06-01 07:27:21 +02:00
Rémi Verschelde 4e6f452c52 Merge pull request #4933 from J08nY/classref 
Added RigidBody and finished Resource class-reference
 2016-06-01 07:23:53 +02:00
Juan Linietsky df139f57b3 Some cleanup to GDScript 
separated GDFunction (VM) from GDScript in two different files
 2016-05-31 22:33:43 -03:00
Maxim Lebedev 8f6b5ffdc7 Morphological and stylistic corrections in ru.po 
I just corrected a small errors and has added missed signs.
 2016-06-01 04:47:55 +06:00
Rémi Verschelde 1ae9ff1919 Merge pull request #4960 from Hinsbart/fix_color8 
Make Color.{rgba}8 return int instead float
 2016-05-31 21:40:50 +02:00
P-GLEZ 0325944ee4 classref: Area documentation 
One method was missing.
 2016-05-31 21:17:35 +02:00
Andreas Haas da3247a500 Make Color.{rgba}8 return int instead float 
According to the class doc, these should be int.
Also fixed a little bug: the setter for 'r8' changed the green value
 2016-05-31 20:50:19 +02:00
Rémi Verschelde d77f465bd0 Merge pull request #4958 from P-GLEZ/master 
Area Documentation
 2016-05-31 19:34:15 +02:00
Andreas Hirschauer da25b76aa1 i18n: Add more German translation 2016-05-31 19:27:49 +02:00
P-GLEZ 617530832b Area Documentation 
Ported the Area2D documentation into its 3D counterpart. Also fixed some
typos
 2016-05-31 19:24:27 +02:00
Rémi Verschelde 68e35b6beb Merge pull request #4956 from volzhs/fix-error-scene-update 
fix error when open scene or switch to another scene
 2016-05-31 19:00:45 +02:00
volzhs e4f68d08eb fix error when open scene or switch to another scene 
## Error message on console ##
```
no access to ID:18723
ERROR: FileAccessWindows::_get_modified_time: Method/Function Failed, returning: 0
   At: drivers\windows\file_access_windows.cpp:251
```
 2016-06-01 01:48:49 +09:00
Rémi Verschelde f4ee46124a i18n: Sort files to parse alphabetically 
This should ensure that python produces the same tools.pot for every user,
and thus that the .po will not get useless diffs upon merge.
 2016-05-31 18:24:41 +02:00
Rémi Verschelde bbaaf03200 Merge pull request #4955 from Geequlim/translation-zh_CN 
Sync and more translation for zh_CN
 2016-05-31 18:19:23 +02:00
Geequlim 7e18de6b6a More translation for zh_CN 2016-06-01 00:17:35 +08:00