Commit Graph

13139 Commits

Author SHA1 Message Date
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
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
Rémi Verschelde edd07270c2
Merge pull request #16924 from Noshyaar/anim
AnimationEditor: fix time indicator offset
2018-02-22 15:07:18 +01:00
Poommetee Ketson acf54f8bdc AnimationEditor: fix time indicator offset 2018-02-22 20:51:28 +07:00
Ignacio Etcheverry a38b59b656 EditorExport: Allow export plugins to add shared libraries 2018-02-22 13:39:52 +01:00
Ignacio Etcheverry 9fd606c549 Mono: Add project export plugin 2018-02-22 13:39:41 +01:00
Rémi Verschelde 79a225ac2a
Merge pull request #16914 from bruvzg/missing_return_error
[Build] Abort compilation on missing return values (CGG/clang)
2018-02-22 11:16:30 +01:00
Rémi Verschelde bd01fb5367
Merge pull request #16916 from Noshyaar/color
Color:fix setting V switch S to old V value
2018-02-22 10:55:30 +01:00
Poommetee Ketson f4f92b55e1 Color:fix setting V switch S to old V value 2018-02-22 16:43:00 +07:00
bruvzg 5ec09455ed
Abort compilation on missing return values (CGG/clang) 2018-02-22 11:23:05 +02:00
Poommetee Ketson fef49cadcb
Merge pull request #16915 from sudoio/master
Insert proper copy icon to debugger
2018-02-22 15:17:49 +07:00
Rémi Verschelde 742d01b888
Merge pull request #16888 from GodotExplorer/debugger-improvement-2
Fix builtin script cannot open from debug stacks
2018-02-22 08:51:24 +01:00
Artem Varaksa db2a1544c0 Insert proper copy icon to debugger 2018-02-22 10:50:38 +03:00
Rémi Verschelde 9d82c82a63
Merge pull request #16913 from BastiaanOlij/vehicle_docs
Added documentation for VehicleBody
2018-02-22 08:46:50 +01:00
Rémi Verschelde 49cf747faf
Merge pull request #16909 from djrm/pr_visual_improvements
Icons update
2018-02-22 08:44:21 +01:00
Rémi Verschelde e349cedb6e Skeleton2D: Fix missing return value in comparator 2018-02-22 08:18:25 +01:00
BastiaanOlij 234b86e6b2 Added documentation for VehicleBody 2018-02-22 17:39:25 +11:00
Daniel J. Ramirez cecf274364 Icons update
includes new enum, MeshInstance2D, Skeleton2D, Cut, Copy and Paste icons.
2018-02-21 19:05:50 -06:00
Rémi Verschelde 24cf4fe062 Update warning about C# support 2018-02-21 22:47:44 +01:00
Juan Linietsky 7cd867c3fe 2D Skeletons WORK IN PROGRESS 2018-02-21 17:24:00 -03:00
luz.paz 612ab4bbc6 Fix typos with codespell
Found via `codespell -q 3 --skip="./thirdparty,./editor/translations" -I ../godot-word-whitelist.txt`
Whitelist consists of:
```
ang
doubleclick
lod
nd
que
te
unselect
```
2018-02-21 19:46:06 +01:00
Rémi Verschelde 6afaf83de3
Merge pull request #16890 from Chaosus/ctrlsnap
Enable snapping in 3D when control key pressed
2018-02-21 16:05:23 +01:00
Chaosus 24c170555d Enable snapping when control key pressed 2018-02-21 17:36:25 +03:00
Rémi Verschelde 08fbe0d944
Merge pull request #16889 from maksloboda/filedialog-button-text
Fixed disappearing text on filedialog buttons
2018-02-21 15:23:01 +01:00
Max 6a48f952ca Fixed disappearing text on filedialog buttons 2018-02-21 16:04:51 +02:00
Rémi Verschelde ff3e1eaeb3
Merge pull request #16881 from fzwoch/gltf_embedded
gltf: improve embedded data discovery
2018-02-21 14:15:06 +01:00
geequlim 095e2bcc26 Fix builtin script cannot open from debug stacks 2018-02-21 21:10:32 +08:00
Juan Linietsky b2412c72a0 Was missing clearing computed UVs, sorry, realized late. 2018-02-21 09:40:01 -03:00
Juan Linietsky 9e3a1e5401 Add base support for 2D meshes in Godot, including Sprite -> Mesh2D conversion. 2018-02-21 09:39:09 -03:00
Rémi Verschelde 1c77fdcc85
Merge pull request #16882 from GodotExplorer/debugger-improvement-1
Small improvements for the debugger
2018-02-21 13:31:20 +01:00
Rémi Verschelde 35053e57ab
Merge pull request #16710 from YeldhamDev/filedialog_nothing_disabled
Fixed "Open" button being enabled when nothing is selected in a FileDialog while in "Open folder" mode
2018-02-21 13:25:27 +01:00
Ignacio Etcheverry 0667f2acbb
Merge pull request #16884 from paulloz/fix-csharp-signal-attribute-fix
[mono] fix signals parameter retrieval
2018-02-21 13:07:30 +01:00
Paul Joannon 7a72395412
[mono] fix signals parameter retrieval 2018-02-21 12:50:05 +01:00