Commit graph

18999 commits

Author SHA1 Message Date
Rémi Verschelde
0f5a4fa7d5 Fix version in osx_tools.app 2019-02-10 17:01:25 +01:00
Rémi Verschelde
1aa7fc09eb TSCN: Remove extra newline after [resource]/[ext_resource]
Some cases had been handled in #17602, but those two were missed.
Fixes #24677.
2019-02-10 16:58:45 +01:00
Rémi Verschelde
17809ca9a9
Merge pull request #25764 from akien-mga/scons-relative-import
SCons: Fix import clash between Godot and system modules
2019-02-10 15:39:32 +01:00
Rémi Verschelde
5892b12281
Merge pull request #25763 from akien-mga/scons-decider
SCons: Make MD5-timestamp decider and implicit_cache debug-only
2019-02-10 15:36:55 +01:00
Rémi Verschelde
26a547f7fc
Merge pull request #25762 from akien-mga/tests-gdscript
Be explicit about usage of GDScript tests
2019-02-10 15:24:32 +01:00
Rémi Verschelde
644b266bae SCons: Fix import clash between Godot and system modules
See #24965 for details. `sys.path.insert` is hacky, but should work
relatively well for both Python 2 and Python 3. When we eventually
deprecate Python 2 support, we could look into using importlib.

Fixes #24965.
2019-02-10 15:22:36 +01:00
Rémi Verschelde
2be62587ee SCons: Make MD5-timestamp decider and implicit_cache debug-only
As advised by @bdbaddog in #25403, those options reduce the certainty
that all everything will be rebuilt as it should, so they are not advised
for release builds.
2019-02-10 15:13:03 +01:00
Rémi Verschelde
c363857426 Be explicit about usage of GDScript tests
Also drop empty "image" test, and print proper error when passing wrong
test name.

Fixes #25638.
2019-02-10 15:11:32 +01:00
Rémi Verschelde
f614f15506 doc: Misc formatting fixes 2019-02-10 13:30:48 +01:00
Rémi Verschelde
ba0a4a942e i18n: Sync translation template with current source 2019-02-10 13:19:03 +01:00
Rémi Verschelde
dc239b47b3 i18n: Sync translations with Weblate 2019-02-10 13:03:59 +01:00
Rémi Verschelde
74932b905e doc: Sync classref with current source 2019-02-10 13:01:03 +01:00
Rémi Verschelde
2975f6e3c4
Merge pull request #25412 from toger5/Doc_impulse_fore
[DOCS] rephrased impulse
2019-02-10 12:56:12 +01:00
Rémi Verschelde
67f801f523
Merge pull request #25465 from Calinou/update-changelog
Update the changelog with new features added in 3.1
2019-02-10 12:51:44 +01:00
Rémi Verschelde
b6e03d927e
Merge pull request #25727 from aaronfranke/matrix3-basis
[Core] Rename Matrix3 file to Basis
2019-02-10 12:32:32 +01:00
Rémi Verschelde
6c57bdf6ff
Merge pull request #25746 from akien-mga/gpu-particles-gles2
Warn when using GPU particles with GLES2
2019-02-10 12:16:45 +01:00
Rémi Verschelde
3b3bb8c578
Merge pull request #25728 from clayjohn/doc_multimesh
[DOC] Filled in MultiMesh doc
2019-02-10 11:36:21 +01:00
Rémi Verschelde
034cd62a77 Warn when using GPU particles with GLES2
Closes #25733.
2019-02-09 20:49:58 +01:00
clayjohn
975c3fd157 filled in multimesh doc 2019-02-09 11:47:25 -08:00
Aaron Franke
3f837d5cc5 [Core] Rename Matrix3 file to Basis
The code already referred to "Basis", it's just the file name that was different for some reason.
2019-02-09 14:42:23 -05:00
Rémi Verschelde
33b64ec3fd
Merge pull request #25739 from qarmin/fix_scan_folders_after_deleting
Fix rescan files and folders after deleting them
2019-02-09 20:37:59 +01:00
Rémi Verschelde
5fa5678eb7
Merge pull request #25736 from qarmin/fix_sprie_frames_editor
Fix latest regression error in SpriteFramesEditor
2019-02-09 18:27:40 +01:00
Rémi Verschelde
ae1ac55409
Merge pull request #25712 from QbieShay/issue_25609
Root node of a scene is now selected when the scene is opened.
2019-02-09 18:22:28 +01:00
Rémi Verschelde
41798cbb6f
Merge pull request #25709 from vnen/submodule-hash
Get Git commit hash when Godot is a submodule
2019-02-09 18:13:04 +01:00
Rémi Verschelde
7d5c6f4c7a
Merge pull request #25710 from Calinou/add-hint-output-font-size
Add a setting hint for the Output panel font size
2019-02-09 17:46:39 +01:00
qarmin
5b9662a2c5 Rescan files and folders deleting them 2019-02-09 14:36:16 +01:00
Rémi Verschelde
8908bdc7f2
Merge pull request #25653 from BastiaanOlij/fix_hide_skyrotation
Hide new sky properties if we don't have sky as a background
2019-02-09 13:09:39 +01:00
Rémi Verschelde
2a0c9faac2
Merge pull request #25614 from QbieShay/issue_25425
Fix generating GDNative API struct for 1.1
2019-02-09 13:09:13 +01:00
qarmin
c8f084b0d5 Fix latest regression error in SpriteFramesEditor 2019-02-09 12:50:19 +01:00
Rémi Verschelde
b462fdf1cb
Merge pull request #25685 from Calinou/doc-improve-resourcepreloader
Improve the ResourcePreloader documentation
2019-02-09 12:45:27 +01:00
Rémi Verschelde
6c243326bd
Merge pull request #25650 from willnationsdev/script-icon
Fix script class icons looking for paths at runtime
2019-02-09 12:22:51 +01:00
Rémi Verschelde
4912f578d1 clang-format: Set standard for ObjC++ 2019-02-09 12:20:24 +01:00
Rémi Verschelde
6d98ce281f
Merge pull request #25671 from vnen/physics-material-2d
Include PhysicsMaterial when 3D is disabled
2019-02-09 12:10:12 +01:00
Ignacio Etcheverry
4fd579b271
Merge pull request #25716 from neikeq/vv
Mono: Create player script metadata when building manually
2019-02-08 23:56:18 +01:00
QbieShay
fe046de216 Root node of a scene is now selected when the scene is opened. 2019-02-08 22:50:39 +01:00
Ignacio Etcheverry
5f8c30fbca Mono: Create player script metadata when building manually
Previously this was only done when building the script for running the game. This was a problem because the user could want to build the project manually with the "Build project" button, to then run the game from the command line or similar.
2019-02-08 22:49:27 +01:00
Rémi Verschelde
e190589f3d
Merge pull request #25627 from clayjohn/visual_shader_texture_bug
Change hint_color to hint_albedo for sampler2ds
2019-02-08 20:19:28 +01:00
Rémi Verschelde
8253cdbda3
Merge pull request #25692 from YeldhamDev/spriteframes_editor_changes
Small changes to the SpriteFrames editor
2019-02-08 19:52:20 +01:00
Rémi Verschelde
865d7983e0
Merge pull request #25701 from Chaosus/fix_particles_gizmo
Fix undo for Particles 3D gizmo
2019-02-08 19:51:40 +01:00
Rémi Verschelde
d16b6a2dac
Merge pull request #25706 from akien-mga/fix-etc2-decompress
Image: Fix decompressing ETC2
2019-02-08 19:51:20 +01:00
Hugo Locurcio
07e87f6ec0
Add a setting hint for the Output panel font size
This closes #21237.
2019-02-08 19:34:43 +01:00
Karroffel
682bc07035 Fix generating GDNative API struct for 1.1
Fixes #25425.
2019-02-08 19:28:40 +01:00
George Marques
874cbefa26 Get Git commit hash when Godot is a submodule
Submodules don't have a .git folder in the same place, but a .git file
that points to the actual folder. This change take this into account.
2019-02-08 16:17:07 -02:00
Rémi Verschelde
1772d6fa23 Image: Fix decompressing ETC2
Thanks to @Rriik for finding the bug and its cause.

Fixes #25595.
2019-02-08 17:26:47 +01:00
Rémi Verschelde
5e837b3f13
Merge pull request #25552 from groud/better_error_message
Displays errors and warnings in a better way in the script editor
2019-02-08 17:03:55 +01:00
Rémi Verschelde
b867ef0eec
Merge pull request #25570 from Kanabenki/windows-relative-icon
Use relative path property hint for windows export icon
2019-02-08 16:50:14 +01:00
Chaosus
43a3db4c00 Fix undo for Particles 3D gizmo 2019-02-08 14:26:52 +03:00
Rémi Verschelde
17d92c2b09
Merge pull request #25551 from JFonS/fix_rogue_cpu_particles
Fix local_delta when resetting CPUParticles
2019-02-08 12:17:16 +01:00
Rémi Verschelde
da18307a53
Merge pull request #25562 from IronicallySerious/fix-empty-project
Fix prompt for empty project files when loaded
2019-02-08 12:16:01 +01:00
Rémi Verschelde
39bc758bb5
Merge pull request #25549 from Zylann/fix_game_font_size_forced_to_13
Don't modify font which could potentially not be the editor one yet
2019-02-08 12:13:05 +01:00