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

7047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
5c7e6c9212 Merge pull request #8537 from volzhs/tr-fallback-master 
Fix wrong fallback for locale
 2017-04-26 08:15:05 +02:00
Rémi Verschelde
4856613109 Merge pull request #8535 from volzhs/android-obb-master 
Fix error or download again if use obb for Android
 2017-04-26 08:14:45 +02:00
Rémi Verschelde
88d362b232 Merge pull request #8531 from RameshRavone/patch-5 
Settings: Moving Poly Editor into Editors category
 2017-04-26 08:14:04 +02:00
Rémi Verschelde
1a47087a73 Merge pull request #8530 from volzhs/auto-accept-quit-master 
Fix auto_accept_quit option to work
 2017-04-26 08:13:52 +02:00
Rémi Verschelde
cdf0fbd8e8 Merge pull request #8522 from NNesh/mus 
Fix AudioPlayer bugs with OGG
 2017-04-26 08:13:30 +02:00
Rémi Verschelde
95683f051c Merge pull request #8519 from Paulb23/change_case_issue_8079 
Ability to Convert Case, issue 8079
 2017-04-26 08:11:41 +02:00
Rémi Verschelde
692b99fa0c Merge pull request #8539 from clayjohn/doc_surfacetool 
Added documentation for SurfaceTool
 2017-04-26 07:38:07 +02:00
clayjohn
478817abad added documentation for SurfaceTool 2017-04-25 21:35:25 -06:00
volzhs
ec1c7ce6c3 Fix wrong fallback for locale 2017-04-26 04:48:03 +09:00
volzhs
889ce29fc2 Fix error or download again if use obb for Android 2017-04-26 04:06:45 +09:00
Ramesh Ravone
ff282571c6
Settings: Moving Poly Editor into Editors category 2017-04-25 17:48:08 +05:30
NNesh
6cf0c62221 Fix AudioPlayer.get_pos() always returns 0 2017-04-25 17:02:45 +05:00
volzhs
de4267fc99 Fix auto_accept_quit option to work 
auto_accept_quit value is set first properly with GLOBAL_DEF("application/auto_accept_quit", true) in main.cpp
after that it's reset to true in SceneTree:init() whatever value was.
 2017-04-25 20:05:22 +09:00
Paulb23
4b8152d599 Ability to Convert Case, issue 8079 2017-04-25 10:18:57 +01:00
Rémi Verschelde
7dba15b83f Merge pull request #8527 from RameshRavone/patch-3 
GDScript: Updating new script template with Indent settings
 2017-04-25 07:39:00 +02:00
Ramesh Ravone
924bccdbd1
Honoring the Indent setting for gdscript 2017-04-25 06:57:49 +05:30
Rémi Verschelde
d9eae920a9 Merge pull request #8518 from clayjohn/doc_worldenvironment 
Added descriptions for WorldEnvironment node in documentation

[ci skip]
 2017-04-24 23:48:08 +02:00
NNesh
0edc3d7208 Fix AudioPlayer.play() bug when music always starts from 0 pos 2017-04-25 01:57:05 +05:00
Rémi Verschelde
214222d37d Merge pull request #8516 from karroffel/gdscript-save-fix 
fixed a bug where saving a GDScript file crashed the editor
 2017-04-24 22:36:51 +02:00
clayjohn
5fdc7ac88a added descriptions for WorldEnvironment node in documentation 2017-04-24 13:45:57 -06:00
Karroffel
67886bab1e fixed a bug where saving a GDScript file crashed the editor 
I changed the loop in #8502, turns out it fixed the error I was facing but introduced a new one. This fixes both
 2017-04-24 19:26:32 +02:00
Rémi Verschelde
b6e0eaf3ca Merge pull request #8509 from nunodonato/fixspatialmaterial 
Fixed #8102, by renaming FixedSpatialMaterial to SpatialMaterial
 2017-04-24 12:05:43 +02:00
Rémi Verschelde
1dc689b513 Merge pull request #8506 from iam13islucky/patch-1 
[3.0] Fix bug in Image::_get_pixelb
 2017-04-24 12:02:10 +02:00
Rémi Verschelde
8c4b7fcbb6 Merge pull request #8500 from Paulb23/space_indent_fixes 
Space indent fixes
 2017-04-24 12:01:29 +02:00
Rémi Verschelde
16f532a202 Merge pull request #8499 from Melix19/patch-3 
Fix "Save/Delete Layout" text field goes outside of the popup
 2017-04-24 12:01:00 +02:00
Rémi Verschelde
bd885ed704 Merge pull request #8469 from Melix19/patch-2 
Update snake_case splitting
 2017-04-24 11:38:36 +02:00
Rémi Verschelde
9acfb0782c Merge pull request #8444 from magyar123/pr-complete-paths 
Script editor now automatically completes file paths in GDScript
 2017-04-24 11:37:57 +02:00
Rémi Verschelde
68870af214 Merge pull request #8420 from magyar123/pr-script-files-as-base 
Added the ability to select files as base when creating scripts
 2017-04-24 11:28:36 +02:00
Rémi Verschelde
8032dd18dd Merge pull request #8408 from 20kdc/bugfix-kine-mas 
Apply is_ceiling/is_wall swap fix to 2D move_and_slide
 2017-04-24 11:25:08 +02:00
Nuno Donato
c1e771dfe9 Fixed #8102, by renaming FixedSpatialMaterial to SpatialMaterial 2017-04-24 10:20:32 +01:00
Rémi Verschelde
05d35bb156 Merge pull request #8395 from 20kdc/master 
Ported move_and_slide to KinematicBody (3D)
 2017-04-24 11:20:10 +02:00
Rémi Verschelde
5939a9b8e8 Merge pull request #8343 from volzhs/prevent_uncheck 
Prevent to uncheck selected item with button group
 2017-04-24 11:19:14 +02:00
Rémi Verschelde
5ae1e172da Merge pull request #8277 from tagcup/math_checks 
Added various functions basic math classes. Also enabled math checks …
 2017-04-24 11:16:20 +02:00
Rémi Verschelde
90ef1fd03d Merge pull request #8102 from bd339/iss3172 
Show 3D raycasts when debugging collisions
 2017-04-24 11:11:04 +02:00
Rémi Verschelde
d7578792ca Merge pull request #8496 from akien-mga/stdout-cleanup 
Fix property warnings and hide some debug prints
 2017-04-24 11:04:16 +02:00
Rémi Verschelde
4c147008f3 Merge pull request #8502 from karroffel/multiscript 
re-added MultiScript
 2017-04-24 11:03:19 +02:00
iam13islucky
73a9a85bc9 [3.0] Fix bug in Image::_get_pixelb 
Fixes issue:
 https://github.com/godotengine/godot/issues/8158
 2017-04-23 22:51:35 -06:00
Karroffel
885239fb09 re-added MultiScript 
The very first Godot version (when it was open sourced) had "MultiScript" which lets you use multiple scripts on one object.
With the addition of mulitple new scripting languages (VisualScript, soon C# and GDNative) it can be of use to combine scripts rather than delegating (with huge maintainance cost) or creating child nodes
which could impact performance.

I used the code from 0b806ee as the base and made it work with the current master.
 2017-04-24 01:49:40 +02:00
Marco Melorio
d4082a8d92 Added a container to EditorNameDialog 2017-04-23 23:36:59 +02:00
Marco Melorio
4677c0fbb8 Update snake_case splitting 2017-04-23 23:03:16 +02:00
Paulb23
165b7bab63 Fixed convert indent and trim whitespace on save 2017-04-23 19:19:30 +01:00
Paulb23
e7e1d65eb0 Fix cursor position on indent convert 2017-04-23 19:05:51 +01:00
Rémi Verschelde
515f92d03b Fix property warnings and hide some debug prints 
"ALL IS GOOD" was a lie.

In particular, removes verbose "path not recognized" false positive.

The actual logic is to (somewhat naively) check all ResourceFormatLoaders
and to pick the first good match, so no need to warn about the formats
that do not match the type hint.
 2017-04-23 11:17:32 +02:00
20kdc
e2df5d661d Ported/fixed move_and_slide to KinematicBody (3D+floor/ceiling args) 
This version of the commit has the on_ceiling/on_wall fix without any
 explaination of that code, since apparently it wasn't complicated enough.

As for the notes at the top of the function, they're still there.

move_and_slide is rather useful for character-controllers, etc.
It reduces the amount of boilerplate code.
Not having move_and_slide makes the APIs somewhat inconsistent.

(It might be nice to figure out a way to share the code between the two
move_and_slide implementations, but that's for someone who knows what
the policy is on shared code like that.)
 2017-04-21 21:19:41 +01:00
Rémi Verschelde
b474646de0 i18n: Add more assetlib strings to translate 
Fixes #8463.
 2017-04-20 14:52:46 +02:00
Rémi Verschelde
cd69343ff1 i18n: Sync translation templates with current source 2017-04-20 14:52:46 +02:00
Thomas Herzog
80329157a0 Merge pull request #8464 from karroffel/gdnative-msvc-fix 
[GDNative] fixed msvc build
 2017-04-20 13:59:04 +02:00
Karroffel
a6e75c9437 [GDNative] fixed msvc build 2017-04-20 13:15:45 +02:00
Rémi Verschelde
99529fb80d Move VERSION_MKSTRING logic to version.h 
Fixes a bug where the VERSION_PATCH define is not yet in scope if
typedefs.h is included before version.h at compilation time.

(cherry picked from commit 3b687c5474)
 2017-04-20 12:14:34 +02:00
Rémi Verschelde
22b9c0207b Merge pull request #8417 from neikeq/hello-there 
External editor improvements and fixes
 2017-04-20 02:20:04 +02:00