Commit graph

28292 commits

Author SHA1 Message Date
Rémi Verschelde
845ac76b23
Merge pull request #38687 from Calinou/tweak-editor-icons-readme
Update the editor icons README to remove outdated information
2020-05-12 10:09:44 +02:00
Rémi Verschelde
6731e1f98b
Merge pull request #38661 from Ashesh3/patch-1
Better file naming for AppVeyor artifacts
2020-05-12 09:50:53 +02:00
Hugo Locurcio
0325e9e03b Mark *.tza files as binary in .gitattributes for old Git versions
This prevents `thirdparty/oidn/weights/rtlightmap_hdr.tza` from always being
considered as modified when using an old Git version (such as the one on
Ubuntu 16.04).
2020-05-12 09:49:19 +02:00
Hugo Locurcio
c6afb9f6ea Update the editor icons README to remove outdated information
This closes #38684.
2020-05-12 09:46:56 +02:00
Rémi Verschelde
66b0b0c153
Merge pull request #38635 from Calinou/tilemap-rename-ysort-index
Rename various TileMap methods/properties for clarity and consistency
2020-05-11 23:05:15 +02:00
Rémi Verschelde
17099ecae7
Merge pull request #38677 from Calinou/tweak-post-import-script-message
Tweak the error message displayed when a post-import script fails
2020-05-11 23:03:44 +02:00
Rémi Verschelde
92022cd47f
Merge pull request #38676 from qarmin/fix_leak_lightmaps
Fix memory leak with light maps
2020-05-11 23:02:57 +02:00
Hugo Locurcio
0d7b627936
Tweak the error message displayd when a post-import script fails
See #38662.
2020-05-11 21:11:17 +02:00
qarmin
84867275bb Fix memory leak with light maps 2020-05-11 21:04:39 +02:00
Rémi Verschelde
6d46d2fe27
Merge pull request #38672 from madmiraal/fix-physicsw-warning
Fix 'physicsw' may be used uninitialized warning in csg_shape.cpp
2020-05-11 20:12:15 +02:00
Rémi Verschelde
0a695456e3
Merge pull request #38670 from Faless/js/fix_dummy_renderer_after_lightmapper
Fix DummyRenderer after new lightmapper merge.
2020-05-11 19:31:06 +02:00
Fabio Alessandrelli
2dbd227c9a Fix DummyRenderer after new lightmapper merge. 2020-05-11 18:26:06 +02:00
Ashesh3
4f055c93a5 Better file naming for AppVeyor artifacts
This builds upon https://github.com/godotengine/godot/pull/38625 and improves the file name format as mentioned in https://github.com/godotengine/godot/pull/38189#issuecomment-626585363

The resulting file stored has the name `godot.windows.opt.tools.64-$(VERSION_HASH).zip` where `VERSION_HASH` is obtained from `it rev-parse --short=9 HEAD` , the zip file contains the built exe file.
2020-05-11 15:54:36 +00:00
Rémi Verschelde
b8438a2122
Merge pull request #38663 from akien-mga/thirdparty-new-lightmapper
thirdparty: Cleanup after #38386, document provenance and copyright
2020-05-11 16:09:02 +02:00
Rémi Verschelde
83b630b8c2 thirdparty: Cleanup after #38386, document provenance and copyright
Also renamed `delaunay.h` to `delaunay_2d.h` to match the class name.
2020-05-11 14:50:06 +02:00
Rémi Verschelde
32133a11b5
Merge pull request #38386 from reduz/new-lightmapper
New GPU lightmapper
2020-05-11 13:45:48 +02:00
Marcel Admiraal
b835cfb551 Fix 'physicsw' may be used uninitialized warning in csg_shape.cpp 2020-05-11 12:40:16 +01:00
Rémi Verschelde
bbdfc7353c doc: Sync classref with current source 2020-05-11 13:23:39 +02:00
Eduardo Nunes Pereira
75f77f751e Using command + comma on macOS as default shortcut for editor settings 2020-05-11 13:04:34 +02:00
Rémi Verschelde
39da96e4d6
Merge pull request #38587 from Faless/js/improvements
DisplayServerJavaScript, improvements to HTML5 build (still dummy renderer).
2020-05-11 11:32:12 +02:00
Rémi Verschelde
70e39cc9a5
Merge pull request #38592 from Calinou/debugger-error-warning-icon
Use a different icon for the debugger tab with both warnings and errors
2020-05-11 11:31:59 +02:00
Rémi Verschelde
62bf8b4dd6
Merge pull request #38594 from Calinou/rename-clear-script-action
Rename the Clear Script editor action to Detach Script
2020-05-11 11:31:31 +02:00
Rémi Verschelde
845e2111ce
Merge pull request #38631 from Calinou/editor-log-selection-color-theme
Tweak the editor log selection color to match the current editor theme
2020-05-11 11:30:23 +02:00
Rémi Verschelde
1585690327
Merge pull request #38625 from Ashesh3/patch-1
Store build as artifact in appveyor
2020-05-11 11:24:44 +02:00
Rémi Verschelde
57e3d04ea2
Merge pull request #38656 from akien-mga/controllerdb-readd-default-android
Input: Readd 'Default Android Gamepad' magic binding
2020-05-11 11:22:08 +02:00
Rémi Verschelde
f7254cf43c
Merge pull request #38491 from eduardonunesp/input-line-osx-selection
Using the common behaviour when use command+shift on text line for osx
2020-05-11 11:13:12 +02:00
Rémi Verschelde
1c61b31109 Input: Readd 'Default Android Gamepad' magic binding
Removed by mistake in #38292 like the Windows `__XINPUT_DEVICE__`,
this magic binding is referenced directly in our code.
2020-05-11 11:07:04 +02:00
Rémi Verschelde
22db301009
Merge pull request #31938 from KoBeWi/a_welcome_lag
Fix VisibilityEnabler2D behavior on start
2020-05-11 10:27:42 +02:00
Eduardo Nunes Pereira
d8f8a3c606 Using the common behaviour when use command+shift on text line for osx
* On press left+command+shift or right+command+shift it should behave like shift+home or shift+end and select the text
* Using home and end events as reference
2020-05-11 10:25:07 +02:00
Rémi Verschelde
dbd90b9478
Merge pull request #38638 from pepegadeveloper123/mono_inherited_scene_bug
Fix inherited C# scene not inheriting parent's fields
2020-05-11 10:19:15 +02:00
Rémi Verschelde
54bb4cb6d6
Merge pull request #38650 from neikeq/dotnet-cli-support
C#: Support for building with the dotnet CLI
2020-05-11 10:16:01 +02:00
etienne.frank
72ab355945 Fix minimap selection offset
The minimap selection was shifted of 1 line too late.
2020-05-11 10:02:16 +02:00
Ignacio Etcheverry
dcf1dc4fe0 C#: Support for building with the dotnet CLI
By adding a reference to the 'Microsoft.NETFramework.ReferenceAssemblies' nuget
package, we can build projects targeting .NET Framework with the dotnet CLI.
By referencing this package we also don't need to install Mono on Linux/macOS
or .NET Framework on Windows, as the assemblies are taken from the package.
2020-05-11 08:17:37 +02:00
Ignacio Roldán Etcheverry
77a9334c58
Merge pull request #38640 from neikeq/csharpscript-inherits-script
Implement CSharpScript::inherits_script
2020-05-11 06:16:15 +02:00
Ignacio Etcheverry
840255a04b Implement CSharpScript::inherits_script 2020-05-10 21:49:15 +02:00
Juan Linietsky
1bea8e1eac New lightmapper
-Added LocalVector (needed it)
-Added stb_rect_pack (It's pretty cool, we could probably use it for other stuff too)
-Fixes and changes all around the place
-Added library for 128 bits fixed point (required for Delaunay3D)
2020-05-10 15:59:09 -03:00
pepegadeveloper123
4e00d8520d Inherited C# scene not inheriting parent's fields
When a child scene inherits a parent scene with a C# root node, the
parent scene's export variables appear to assume values set in the
parent scene, in the child scene's Inspector. However, when the child
scene is played, the parent scene's export variables assume default
values.
When a node is created, it inherits its parent C# script's fields from
the map CSharpScriptInstance::script->member_info. However this map was
not initialized outside the editor, and this commit ensured it is. This
fixes issues #36480 and #37581.
2020-05-11 03:20:11 +09:00
Hugo Locurcio
c64c45ccaf
Rename various TileMap methods/properties for clarity and consistency
The YSort renames were tracked in https://github.com/godotengine/godot/issues/16863.

This closes https://github.com/godotengine/godot-proposals/issues/814.
2020-05-10 19:16:38 +02:00
Fabio Alessandrelli
fd916342ec Re-enable travis CI for javascript platform. 2020-05-10 18:22:48 +02:00
Fabio Alessandrelli
6a49b83e39 Add drop files function 2020-05-10 18:22:48 +02:00
Fabio Alessandrelli
d2eef39731 Fix Closure compiler build, python style.
Move copyToFS into utils.js library included with '--pre-js'.
2020-05-10 18:22:48 +02:00
Fabio Alessandrelli
7411e7fd37 DisplayServerJavaScript implementation. 2020-05-10 18:22:48 +02:00
Fabio Alessandrelli
11a81341fa Restore RasterizerDummy. 2020-05-10 18:19:23 +02:00
Fabio Alessandrelli
ee99cd42d5 [HTML5] Locale, input fix, context, exit.
Add missing semicolumns in engine.js
Add optional extra args to JS Engine.startGame
Remove loader.js, explicit noExitRuntime.
Also add onExit callback (undocumented in emscripten)
2020-05-10 18:19:23 +02:00
thebestnom
d0ced7a481 Android: Migrate deprecated support library to AndroidX 2020-05-10 19:03:44 +03:00
Rémi Verschelde
6a0473bcc2
Merge pull request #38548 from kuruk-mm/add_string_join_to_gdscript
GDScript: Add join method on String
2020-05-10 16:54:45 +02:00
Rémi Verschelde
94721f5ab8 Revert "Renamed plane's d to distance"
This reverts commit ec7b481170.

This was wrong, `d` is not a distance but the `d` constant in the
parametric equation `ax + by + cz = d` describing the plane.
2020-05-10 16:47:11 +02:00
Hugo Locurcio
411af2c750
Tweak the editor log selection color to match the current editor theme
This overrides the default blue color.
2020-05-10 16:32:14 +02:00
Rémi Verschelde
6ab92464bc
Merge pull request #38621 from akien-mga/stylé-comme-jamais
Style: clang-format: Disable if statements and case labels on single line
2020-05-10 15:38:53 +02:00
Ashesh
7ae70625f3
Store build as artifact in appveyor
7z is already available in path in appveyor
zip the build .exe files and store them ( appveyor retains for ~6 months)
2020-05-10 17:19:47 +05:30