Commit graph

10516 commits

Author SHA1 Message Date
Rémi Verschelde
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
Matthias Hoelzl
a6d53effa5 Fix build with Python 3 on Windows 2017-10-29 19:27:12 +01:00
Rémi Verschelde
277e730d34 Fix typo in project manager
[ci skip]
2017-10-29 18:48:42 +01:00
Rémi Verschelde
23740c8a91 Mono: Fix Windows build 2017-10-29 17:28:53 +01:00
Rémi Verschelde
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
Rémi Verschelde
87694d1884 Disable logging until the logs location is sorted out
Temporary workaround for #12277.
2017-10-29 15:50:27 +01:00
Rémi Verschelde
f327fba627 i18n: Sync translation templates with current source
[ci skip]
2017-10-29 14:04:00 +01:00
Rémi Verschelde
d3939dcddb i18n: Sync translations with Weblate 2017-10-29 14:03:22 +01:00
Rémi Verschelde
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
Rémi Verschelde
d4d12eba53 classref: Apply doctool to fix formatting
Fixes regression from #12396 which caused #12466.
[ci skip]
2017-10-29 12:09:20 +01:00
Rémi Verschelde
c193286186
Merge pull request #12475 from neikeq/ohuiii
Fix regression from #12473 and #12388
2017-10-29 11:32:00 +01:00
Rémi Verschelde
6ea8ffc12f
Merge pull request #12474 from neikeq/s
Mono: Add build project button and reload interval
2017-10-29 11:09:49 +01:00
Ignacio Etcheverry
15e30187ee Fix regression from #12473 and #12388 2017-10-29 10:11:20 +01:00
Ignacio Etcheverry
8fca54fb0d
Merge pull request #12473 from neikeq/Alpha2?-Let'sDoThis
BindingsGenerator cleanup and improved error messages
2017-10-29 05:58:26 +01:00
Ignacio Etcheverry
27b7fb8e66 Mono: Add build project button and reload interval 2017-10-29 05:57:38 +01:00
Ignacio Etcheverry
09a1e11765
Merge pull request #12388 from neikeq/r
Buildsystem improvements for the Mono module
2017-10-29 04:28:36 +01:00
Ignacio Etcheverry
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
Poommetee Ketson
84edb58dea
Merge pull request #12445 from MattUV/docs-editing
[DOCS]Completed LineEdit.xml

[ci skip]
2017-10-29 10:22:35 +07:00
Ignacio Etcheverry
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
MattUV
24e047f91d [DOCS]Completed LineEdit.xml 2017-10-28 23:54:10 +02:00
Marcelo Fernandez
33daf4d8bc Detect javascript platform using EMSCRIPTEN env as well 2017-10-28 16:24:44 -03:00
Chris Bradfield
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
Rémi Verschelde
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
Rémi Verschelde
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
Rémi Verschelde
00168e3e33
Merge pull request #12457 from Noshyaar/buffer
Refactor bufer to buffer

[ci skip]
2017-10-28 14:16:41 +02:00
Poommetee Ketson
83f5d7e40a Refactor bufer to buffer 2017-10-28 19:15:51 +07:00
Rémi Verschelde
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
Rémi Verschelde
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
Andreas Haas
8f2a4cc6a7
Merge pull request #12449 from Noshyaar/ab
ProjectSettings: show error msg in a label instead
2017-10-28 10:42:59 +02:00
Poommetee Ketson
9449a34f4f ProjectSettings: show error msg in a label instead 2017-10-28 09:35:09 +07:00
Jake Larson
5e641153a6 Fixed interface scaling issues with editor action button and value editor popovers 2017-10-27 19:22:52 -05:00
sersoong
831d601a83 Add copy button to sprite_frames_editor_plugin 2017-10-28 08:03:49 +08:00
Unknown
a2247d45fc Mono: Use "UnnamedProject" if application/config/name is empty 2017-10-27 21:22:54 +02:00
Rémi Verschelde
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
mhilbrunner
0407c2ac46 detect.py: Fix KeyError if using MinGW and LTO 2017-10-27 21:04:27 +02:00
Daniel Alexandru Radu
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
Rémi Verschelde
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
Rémi Verschelde
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
Rémi Verschelde
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
Unknown
9b4c5989ad AStar: Add setters for point position and scale weight, cleanup 2017-10-27 19:19:01 +02:00
Ferenc Arn
f3436a841a Add an option to use zstd's recently introduced long range matching (off by default). 2017-10-27 12:26:13 -04:00
Rémi Verschelde
6fc2fffb45 Merge pull request #12435 from scayze/gl_frot_face
Fix shader compiler typo 'gl_FrotFace'
2017-10-27 16:04:41 +02:00
Scayze
2c00b68175 Fix shader compiler typo gl_FrotFace 2017-10-27 15:31:24 +02:00
Rémi Verschelde
ad85224ebc Merge pull request #12432 from larsonjj/fix/property_editor_action_buttons
Fix editor action button layout
2017-10-27 13:24:43 +02:00
Jake Larson
6c889a3ab5 Fix editor action button layout 2017-10-27 05:55:56 -05:00
Rémi Verschelde
3fe72c7f77 Merge pull request #12386 from zedutchgandalf/popup-text-margins
Fix text margins in property editor pop-up.
2017-10-27 12:47:31 +02:00
Rémi Verschelde
ebd472de3a Merge pull request #12408 from sheepandshepherd/pm_language
Add language option button to project manager
2017-10-27 12:46:00 +02:00
Nathan Lovato
bc4213b37d Merge pull request #12426 from MattUV/node2d-correction
[DOCS] Corrected some typing mistakes on Node2D.xml
2017-10-27 09:36:31 +02:00
MattUV
1c378f918d [DOCS] Corrected some typing mistakes on Node2D.xml 2017-10-27 08:27:29 +02:00
Rémi Verschelde
369a119963 Merge pull request #12339 from Ertain/master
Added descriptions for some methods.
2017-10-27 07:48:55 +02:00