Commit graph

2018 commits

Author SHA1 Message Date
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
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
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
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
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
Daniel J. Ramirez
cecf274364 Icons update
includes new enum, MeshInstance2D, Skeleton2D, Cut, Copy and Paste icons.
2018-02-21 19:05:50 -06: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
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
geequlim
cfde737478 Don't print error message when select debugger stacks if the debugger is stopped.
Clear debugger stack inspector if the debugger is stopped when selected stack changed.
2018-02-21 19:28:26 +08:00
Florian Zwoch
1abf464b59 gltf: improve embedded data discovery
Some editors seems to use the image resource's mime type (e.g. "image/png") for data embedded uris instead of "application/octet-stream".
2018-02-21 12:18:52 +01:00
Rémi Verschelde
c291fc39ad
Merge pull request #16772 from damarindra/tileset_editor_improvement
Tileset Editor Improvement
2018-02-21 10:40:43 +01:00
Anish
1fdb8251d2 Godot now allows built-in irrespective of the filepath.
Since the file in the filepath is irrelevant when setting the file
as built-in, changes have been made to allow setting to built-in
even if the file in the path exists.

Fixes #16425
2018-02-21 14:47:23 +05:30
Rémi Verschelde
5d6c64969c
Merge pull request #16805 from Overblob/Dont_reset_viewport_on_debug
Fix Automatic switch to viewport when playing a scene
2018-02-21 09:59:45 +01:00
Michael Alexsander Silva Dias
0d13eb4225 Fixed Remote Tree not drawing relationship lines unless the setting is changed. 2018-02-20 18:12:44 -03:00
Damar Indra
e69dd47501 Tileset Editor Improvement 2018-02-20 22:33:59 +07:00
volzhs
36aa62802a Draw relationship line on scene tree dock if option is on 2018-02-20 22:26:40 +09:00
Rémi Verschelde
55f00d9655
Merge pull request #16455 from volzhs/close-docs
Keep to show current script when closing all docs
2018-02-20 09:40:29 +01:00
volzhs
df84290a7e Keep to show current script when closing all docs
also fix error when removing multiple tabs from TabContainer at same frame.
like closing multiple docs at once.

Fix #16403
2018-02-20 14:39:52 +09:00
Michael Alexsander Silva Dias
32e3f257ac Made the Debugger's Stack Frames items reselectable. 2018-02-20 00:02:37 -03:00
Nathan Warden
4bfb504c2f Added an auto quit and auto build flag to the command line options. 2018-02-19 16:22:55 -05:00
Rémi Verschelde
693f5426d4
Merge pull request #16709 from willnationsdev/autoload-edit
Enable EditorPlugin to add/remove autoloads
2018-02-19 22:04:42 +01:00
Rémi Verschelde
e7fb143515
Merge pull request #14433 from PJB3005/17-12-08-3d_grid_color_setting_update
Makes 3D editor grid color update without restart.
2018-02-19 22:02:02 +01:00
Bernhard Liebl
1d2d08da5b Add show path button to project manager 2018-02-19 21:56:28 +01:00
Stephen Traskal
e790ca084d Fixing folder/file case sensitive renaming issue
Example:
Could not rename "Objects" to "objects" or vice versa
2018-02-19 21:46:58 +01:00
Rémi Verschelde
f163b0e4b4
Merge pull request #16241 from Chaosus/zoomlabel
Added zoom label to code editor
2018-02-19 21:35:11 +01:00
Rémi Verschelde
3564895b63
Merge pull request #16430 from dragmz/download_tpl_to_file
Download export templates to a file (instead of memory) using separate thread
2018-02-19 21:31:26 +01:00
Rémi Verschelde
2a723519c0
Merge pull request #16491 from Chaosus/update_status_bar_font
Make status bar label fonts updateable
2018-02-19 21:28:55 +01:00
Rémi Verschelde
691d5d807c
Merge pull request #16583 from ShyRed/obj-import-scale
Add import option "scale_mesh" to obj file importer
2018-02-19 20:55:23 +01:00
Rémi Verschelde
3925e6a543
Merge pull request #16696 from BTaskaya/master
PEP3101 applied with changing old type string formatting as new ones
2018-02-19 20:38:37 +01:00
Rémi Verschelde
5efbb08a7a
Merge pull request #16697 from ianb96/script_list_no_sort
Add Option to disable sort in script list
2018-02-19 20:37:15 +01:00
Rémi Verschelde
b93d6a001b
Merge pull request #16566 from groud/gui_input_rework
2D Editor GUI input rework
2018-02-19 20:05:35 +01:00
Rémi Verschelde
959b3e6d8c
Merge pull request #16752 from Yanpas/dellines
Delete all selected lines using the "delete line" shortcut in script editor
2018-02-19 19:54:24 +01:00
Rémi Verschelde
7839076f95 Improve error reporting of ProjectSettings::setup()
And use it to better report errors in the console and project manager
when a project.godot file is corrupted.

Fixes #14963.
2018-02-19 16:41:43 +01:00
Unknown
d002b7d24a Fix Automatic switch to viewport when playing a scene #16357 2018-02-18 23:37:30 +01:00
George Marques
95f7879923
Fix infinite recursion with editor import plugins 2018-02-18 16:24:50 -03:00
Rémi Verschelde
3fd4a35ce6
Merge pull request #15235 from sersoong/master-batchtoggle
Enhanced Toggle Visibility button in scene tree editor
2018-02-18 17:20:15 +01:00
Poommetee Ketson
d5eba83fd5
Merge pull request #16774 from sudoio/fix-16773
Fix #16773 (Rename "Install" to "Download" in AssetLib)
2018-02-18 11:25:44 +07:00
Yan Pas
7368978a48 Delete all selected lines using the delete line shortcut in script editor 2018-02-17 17:56:13 +03:00