62a3dcdc72
Merge pull request #12467 from marcelofg55/emscripten_detect
...
Detect javascript platform using EMSCRIPTEN env as well
[ci skip]
2017-10-30 11:43:03 +01:00
80427c1aa2
Merge pull request #12489 from groud/fix_moving_control_with_direction_key
...
Fixes keybord directionnal keys not moving nodes in the 2D editor
2017-10-30 09:15:34 +01:00
04ec76c828
Merge pull request #12495 from Paulb23/line_edit_multi_level_undo
...
Added multi level undo redo to line edit
2017-10-30 09:12:46 +01:00
8fb223fb15
Merge pull request #12492 from akien-mga/locale-no
...
Add support for non-ISO "no" locale on Windows
2017-10-30 09:09:25 +01:00
9dddce75d0
Added multi level undo redo to line edit
2017-10-29 23:21:06 +00:00
981ef0be59
Add support for non-ISO locale identifiers via renames map
...
Windows apparently uses "no" for Norwegian Bokmål, even though its
ISO 639-1 language code is "nb"... Closes #12479 .
Also did some non-intrusive cleanup while at it.
2017-10-30 00:02:55 +01:00
619e4eb23d
Merge pull request #12491 from neikeq/waitasecond···
...
Fix FrameworkPathOverride and assemblies path loop
2017-10-29 22:33:27 +01:00
aa5a0b550f
Fix FrameworkPathOverride and assemblies path loop
2017-10-29 22:22:38 +01:00
df0610e9e6
Merge pull request #12490 from nbcks/master
...
added support for paths with spaces for VSBUILDS
2017-10-29 22:17:29 +01:00
ad8d8491cd
added support for paths with spaces for VSBUILDS
...
There was a problem with MSBuild in that windows file paths
end with a backslash, which was escaping the last of the double quotes which
surround the $(ProjectDir) directive. This was fixed by removing the
last backslash through changing it to $(ProjectDir.TrimEnd('\')).
2017-10-29 21:10:44 +00:00
32502a4b68
Fixes keybord directionnal keys not moving nodes in the 2D editor
2017-10-29 22:00:03 +01:00
cb5f2b258e
Merge pull request #12485 from hoelzl/pr-python3-build
...
Fix build with Python 3 on Windows
2017-10-29 19:39:54 +01:00
a6d53effa5
Fix build with Python 3 on Windows
2017-10-29 19:27:12 +01:00
277e730d34
Fix typo in project manager
...
[ci skip]
2017-10-29 18:48:42 +01:00
23740c8a91
Mono: Fix Windows build
2017-10-29 17:28:53 +01:00
e9d1d648cd
libpng: Cosmetic update to upstream 1.6.34
...
No code change in the part we are using, it only affected contrib code.
[ci skip]
2017-10-29 17:06:48 +01:00
87694d1884
Disable logging until the logs location is sorted out
...
Temporary workaround for #12277 .
2017-10-29 15:50:27 +01:00
f327fba627
i18n: Sync translation templates with current source
...
[ci skip]
2017-10-29 14:04:00 +01:00
d3939dcddb
i18n: Sync translations with Weblate
2017-10-29 14:03:22 +01:00
9f4f630adf
Merge pull request #12437 from mhilbrunner/astar-setpointweightscale
...
AStar: Add setters for point position and scale weight, cleanup
2017-10-29 13:32:08 +01:00
d4d12eba53
classref: Apply doctool to fix formatting
...
Fixes regression from #12396 which caused #12466 .
[ci skip]
2017-10-29 12:09:20 +01:00
c193286186
Merge pull request #12475 from neikeq/ohuiii
...
Fix regression from #12473 and #12388
2017-10-29 11:32:00 +01:00
6ea8ffc12f
Merge pull request #12474 from neikeq/s
...
Mono: Add build project button and reload interval
2017-10-29 11:09:49 +01:00
15e30187ee
Fix regression from #12473 and #12388
2017-10-29 10:11:20 +01:00
8fca54fb0d
Merge pull request #12473 from neikeq/Alpha2?-Let'sDoThis
...
BindingsGenerator cleanup and improved error messages
2017-10-29 05:58:26 +01:00
27b7fb8e66
Mono: Add build project button and reload interval
2017-10-29 05:57:38 +01:00
09a1e11765
Merge pull request #12388 from neikeq/r
...
Buildsystem improvements for the Mono module
2017-10-29 04:28:36 +01:00
9f469887fc
Buildsystem improvements for the Mono module
...
- Make sure to search the mono installation directory for the right architecture in the windows registry.
- Do not build GodotSharpTools directly to #bin dir. Instead build to the default output path and copy it. This way we avoid MSBuild adding files we don't want to #bin.
- Add hint path for MSBuild in OSX.
- Copy shared library on Unix if not statically linking.
- Use vswhere to search MSBuild and search for 14.0 tools version in the registry instead of 4.0.
- SCons will only fallback xbuild when msbuild is not found if 'xbuild_fallback=yes' is passed to the command.
- Use mono's assembly path as FrameworkPathOverride if using with system's MSBuild (not mono's fork).
- Cleanup.
2017-10-29 04:26:13 +01:00
84edb58dea
Merge pull request #12445 from MattUV/docs-editing
...
[DOCS]Completed LineEdit.xml
[ci skip]
2017-10-29 10:22:35 +07:00
452313ffb1
BindingsGenerator cleanup and improved error messages
...
If there is an error generating a property or a method, the error message will include the member and class names.
2017-10-29 02:37:13 +01:00
24e047f91d
[DOCS]Completed LineEdit.xml
2017-10-28 23:54:10 +02:00
33daf4d8bc
Detect javascript platform using EMSCRIPTEN env as well
2017-10-28 16:24:44 -03:00
c93a3c1bd9
Merge pull request #12396 from AntiSC2/master
...
[DOCS] Add and polish up documentation for Image methods
2017-10-28 09:48:21 -07:00
5f24a0b250
Merge pull request #12389 from Chaosus/continuehotkey
...
Added hotkey for Continue action in Script editor
[ci skip]
2017-10-28 17:52:02 +02:00
feb30bf329
Merge pull request #12448 from larsonjj/fix/property_editor_hidpi
...
Fixed scaling issues with editor action button and value editor popovers
2017-10-28 14:19:11 +02:00
00168e3e33
Merge pull request #12457 from Noshyaar/buffer
...
Refactor bufer to buffer
[ci skip]
2017-10-28 14:16:41 +02:00
83f5d7e40a
Refactor bufer to buffer
2017-10-28 19:15:51 +07:00
87dbb716d9
Merge pull request #12443 from mhilbrunner/appnoname
...
Mono: Use "UnnamedProject" if "application/config/name" is empty
2017-10-28 11:35:15 +02:00
44d4898a64
Merge pull request #12430 from sersoong/master-test
...
3.0 Add copy button to sprite_frames_editor_plugin
2017-10-28 11:32:29 +02:00
8f2a4cc6a7
Merge pull request #12449 from Noshyaar/ab
...
ProjectSettings: show error msg in a label instead
2017-10-28 10:42:59 +02:00
9449a34f4f
ProjectSettings: show error msg in a label instead
2017-10-28 09:35:09 +07:00
5e641153a6
Fixed interface scaling issues with editor action button and value editor popovers
2017-10-27 19:22:52 -05:00
831d601a83
Add copy button to sprite_frames_editor_plugin
2017-10-28 08:03:49 +08:00
a2247d45fc
Mono: Use "UnnamedProject" if application/config/name is empty
2017-10-27 21:22:54 +02:00
0c043bc257
Merge pull request #12442 from mhilbrunner/patch-1
...
detect.py: Fix KeyError if using MinGW and LTO
2017-10-27 21:22:37 +02:00
0407c2ac46
detect.py: Fix KeyError if using MinGW and LTO
2017-10-27 21:04:27 +02:00
70c3ea5a82
Fixing vsproj generation for paths with spaces
...
Fixing vsproj generation by adding quotes arounnd $(ProjectDir). Otherwise the build will fail if the name has spaces in it
[ci skip]
2017-10-27 20:48:06 +02:00
e00a9eeb98
Merge pull request #12440 from akien-mga/master
...
Travis: Simplify matrix, disable iphone and add X11 tools=no/clang
2017-10-27 20:33:39 +02:00
568e905604
Merge pull request #12423 from tagcup/zstd_1.3.2
...
Update zstd to 1.3.2.
2017-10-27 20:28:59 +02:00
37f1bb3298
Travis: Simplify matrix, disable iphone and add X11 tools=no/clang
...
Travis always has massive backlog of macOS builds, so we can't rely on them
too much.
The iphone build was mostly useful to spot tools=no or target=release_debug
issues, so replacing it by an appropriate X11 build.
2017-10-27 19:56:37 +02:00
Rémi Verschelde
Paulb23
Ignacio Etcheverry
Ignacio Etcheverry
nicholasbuckner
Gilles Roudiere
Matthias Hoelzl
Poommetee Ketson
MattUV
Marcelo Fernandez
Chris Bradfield
Andreas Haas
Jake Larson
sersoong
Unknown
mhilbrunner
Daniel Alexandru Radu