Commit graph

13171 commits

Author SHA1 Message Date
Rémi Verschelde
75c7e66c5e
Merge pull request #15641 from neikeq/mono-is-picky-regarding-corlib-so-we-must-make-sure-to-ship-the-right-version-otherwise-something-bad-may-happen
Mono: Buildsystem improvements
2018-02-27 11:08:17 +01:00
Rémi Verschelde
4972269c86
Merge pull request #17027 from IndicaInkwell/doc-contrib
[DOCS] added docs on Control's drag and drop api
2018-02-27 11:05:37 +01:00
indicainkwell
7154a96d3f added docs on Control's drag and drop api 2018-02-26 15:54:08 -08:00
Rémi Verschelde
1bd0fd90cc
Merge pull request #17046 from NathanWarden/fixed_mono_marshalling
[Mono] The marshalling *in* of Transform was also incorrect.
2018-02-26 22:42:31 +01:00
Rémi Verschelde
636e48b707
Merge pull request #17048 from hpvb/fix-17028
Allow running with a custom resource without a main scene
2018-02-26 19:38:07 +01:00
Hein-Pieter van Braam
b4215c991a Allow running with a custom resource without a main scene
After 3f8a4cc719 trying to run an
individual scene on a project without a main scene fails. We move the
check until after we've determined whether or not we're trying to run an
individual scene.

We also stop trying to show the project manager if any game pack is
found at all, unless the user explicitly asks for the project manager to
be shown.
2018-02-26 18:48:47 +01:00
Nathan Warden
60daa9d718 The marshalling in was also incorrect. 2018-02-26 10:01:21 -05:00
Rémi Verschelde
7568a45539
Merge pull request #17020 from neikeq/cs-api-asm-checks
Mono: Better versioning and gracefully unloading of Godot API assemblies
2018-02-25 21:51:11 +01:00
Ignacio Etcheverry
f37090ccf4 Mono: Better versioning and gracefully unloading of Godot API assemblies 2018-02-25 20:56:27 +01:00
Juan Linietsky
125fc8cc44 Add a split editor to polygon 2D UV editor, moving an inch closer to adding support for in the future 2018-02-25 12:07:13 -03:00
Rémi Verschelde
eec9261a75 Fix version.txt validation logic for export templates .tpz
It assumed that the version would always be `x.y-status`,
with no dot possible in `status`, so:
- It would not work for 3.0.1-stable (nor 3.0.1.stable with new version logic)
- It would not support Mono templates when we provide them

The validation it did was not really useful anyway, so we just use the raw
string.
2018-02-25 15:24:33 +01:00
Rémi Verschelde
08584b7e22
Merge pull request #16804 from Valentactive/fix_mono_template_compiling
fix template builds with mono
2018-02-25 10:11:10 +01:00
Rémi Verschelde
2df206e6a8
Merge pull request #17003 from Noshyaar/docs
[DOCS] Sync classref with current source
2018-02-25 10:06:16 +01:00
Rémi Verschelde
ea1a83776e
Merge pull request #16996 from Zylann/line2d_tile_fix
Fix Line2D tile mode for non-square textures
2018-02-25 09:45:22 +01:00
Poommetee Ketson
eb63f7b071 [DOCS] Sync classref with current source 2018-02-25 15:14:25 +07:00
Marc Gilleron
d2fae5c9a6 Fix Line2D tile mode for non-square textures 2018-02-25 01:49:10 +01:00
Rémi Verschelde
6f322b2aec
Merge pull request #16993 from bruvzg/fix-missing-returns
Add missing return statements (iOS and server).
2018-02-25 00:23:52 +01:00
bruvzg
e3c2778d7e
Add missing return statements (iOS and server). 2018-02-25 01:11:03 +02:00
Ignacio Etcheverry
3647ebc834
Merge pull request #16981 from paulloz/mono-nested-exceptions
[mono] show whole trace of nested exceptions
2018-02-24 21:44:33 +01:00
Paul Joannon
3ee4ce51a9
only show information we have in stacktrace
do not show line number and/or file if not defined
2018-02-24 21:18:57 +01:00
Paul Joannon
89af6c2cd7
[mono] get stacktraces for all inner exceptions 2018-02-24 21:18:06 +01:00
Ignacio Etcheverry
71602c7491
Merge pull request #16986 from neikeq/issue-16983
Mono: Fix bindings for parameters in vararg methods
2018-02-24 20:06:41 +01:00
Ignacio Etcheverry
0c82858121 Mono: Fix bindings for parameters in vararg methods 2018-02-24 20:03:16 +01:00
Rémi Verschelde
d356bd605b
Merge pull request #16952 from Noshyaar/datadir
[DOCS] clarify that OS.get_user_data_dir needs project name
2018-02-24 18:33:27 +01:00
Rémi Verschelde
95b8984d5f Add --quit option to help output and update manpage 2018-02-24 18:22:29 +01:00
Hein-Pieter van Braam
8cde69f5f2 Fix Windows file case changing
Windows APIs don't really provide a way to change a filename case. This
implements a little juggling to make this work. We first create a
guaranteed unique temporary file, we then replace the original file with
the temporary file and we finally rename it to the desired filename
case.

(cherry picked from commit d69d58deea)
2018-02-24 18:09:20 +01:00
Rémi Verschelde
bc4b7bc82e
Merge pull request #16973 from JFonS/fix_initial_gizmo_visibility
Fix visibility of gizmos on scene load
2018-02-24 14:06:50 +01:00
JFonS
99d740c46e Fix visibility of gizmos on scene load 2018-02-24 12:05:43 +01:00
Poommetee Ketson
2c22c9dcfb [DOCS] clarify that OS.get_user_data_dir needs project name
[ci skip]
2018-02-24 17:15:06 +07:00
Rémi Verschelde
36285cd82f
Merge pull request #16970 from Noshyaar/inp
(Magnify|Pan)Gesture: implement as_text
2018-02-24 10:55:03 +01:00
Poommetee Ketson
67e20dc2b6 (Magnify|Pan)Gesture: implement as_text 2018-02-24 10:35:25 +07:00
anakimluke
bd3b958a25 Removed whitespaces around arguments of functions.
Functions automatically generated by conneting
signals via GUI put whitespaces around the
arguments of the generated function. This is
inconsistent with the style guide.

This commit fixes that.

(cherry picked from commit 370f84f41c)
2018-02-24 01:34:26 +01:00
Rémi Verschelde
eedb85e618
Merge pull request #16932 from groud/fix_collision_shape_selection
Fixes collisions shape selection
2018-02-24 01:32:16 +01:00
Rémi Verschelde
6b32e96d6e
Merge pull request #16930 from PJB3005/18-02-22-styleboxtexture-texture
StyleBoxTexture: Texture instead of RES for texture and normal_map.
2018-02-24 01:29:35 +01:00
Rémi Verschelde
c91ddf721f
Merge pull request #16925 from Noshyaar/envi
Fix error spam when using PanoramaSky without texture
2018-02-24 01:25:04 +01:00
Rémi Verschelde
6e3ba43457
Merge pull request #16901 from jandrewlong/ios-restore-purchases
add restore purchases for ios
2018-02-24 01:24:37 +01:00
Rémi Verschelde
ed0d1a4404
Merge pull request #16957 from akien-mga/version-macros
Refactor version macros and fix related bugs
2018-02-24 01:20:50 +01:00
Rémi Verschelde
0712acec1c
Merge pull request #16920 from neikeq/mono-project-export
Mono project export
2018-02-23 22:04:50 +01:00
Rémi Verschelde
23ebae01dc Refactor version macros and fix related bugs
The previous logic with VERSION_MKSTRING was a bit unwieldy, so there were
several places hardcoding their own variant of the version string, potentially
with bugs (e.g. forgetting the patch number when defined).

The new logic defines:

- VERSION_BRANCH, the main 'major.minor' version (e.g. 3.1)
- VERSION_NUMBER, which can be 'major.minor' or 'major.minor.patch',
  depending on whether the latter is defined (e.g. 3.1.4)
- VERSION_FULL_CONFIG, which contains the version status (e.g. stable)
  and the module-specific suffix (e.g. mono)
- VERSION_FULL_BUILD, same as above but with build/reference name
  (e.g. official, custom_build, mageia, etc.)
  Note: Slight change here, as the previous format had the build name
  *before* the module-specific suffix; now it's after
- VERSION_FULL_NAME, same as before, so VERSION_FULL_BUILD prefixed
  with "Godot v" for readability

Bugs fixed thanks to that:

- Export templates version matching now properly takes VERSION_PATCH
  into account by relying on VERSION_FULL_CONFIG.
- ClassDB hash no longer takes the build name into account, but limits
  itself to VERSION_FULL_CONFIG (build name is cosmetic, not relevant
  for the API hash).
- Docs XML no longer hardcode the VERSION_STATUS, this was annoying.
- Small cleanup in Windows .rc file thanks to new macros.
2018-02-23 20:15:29 +01:00
Rémi Verschelde
b6bf572e02
Merge pull request #16929 from Calinou/add-changelog
Add a project changelog
2018-02-23 09:29:20 +01:00
Juan Linietsky
92ece2e727 Ability to edit Polygon2D shape from within the UV editor, this will eventually make it possible to in the future. 2018-02-22 17:40:54 -03:00
Michele Valente
3c7d9001bc fix release builds with mono
"_signals" and "signals_invalidated" were moved out of the
"TOOLS_ENABLED" directive. Updated also the two "update_signals" and
"_update_signals" methods so it makes sense.
2018-02-22 21:23:47 +01:00
Gilles Roudiere
c250a9a9f9 Fixes collisions shape selection 2018-02-22 20:48:25 +01:00
J Andrew Long
da652c1539 add restore purchases for iOS 2018-02-22 14:28:37 -05:00
Pieter-Jan Briers
b51a86a57a StyleBoxTexture: Texture instead of RES for texture and normal_map. 2018-02-22 19:27:35 +01:00
Rémi Verschelde
be7bfdfac3 server: Add support for statically linking libgcc and libstdc++ 2018-02-22 19:06:11 +01:00
Rémi Verschelde
270ef3a189 i18n: Sync translation templates with 3.0 source
Currently staying in sync with the 3.0 branch to give translators a chance
to increase the completion rate of their 3.0 translations for the stable
branch (translation template is synced with the master branch).

(cherry picked from commit 07e2461995)
2018-02-22 18:47:42 +01:00
Rémi Verschelde
661ab3c88e i18n: Sync translations with Weblate 2018-02-22 18:42:07 +01:00
Hugo Locurcio
f00b2dfc55
Add a project changelog 2018-02-22 18:25:40 +01:00
Poommetee Ketson
7a1b7ddf6c Fix error spam when using PanoramaSky without texture 2018-02-22 21:43:17 +07:00