maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6505 commits 10 branches 35 tags 1.1 GiB
Commit graph

202 commits

Author SHA1 Message Date
Rémi Verschelde
3070267c4c Merge pull request #9364 from Noshyaar/pr-genh21 
BuildSystem: generated files have .gen.ext (2.1)
 2017-06-25 16:08:26 +02:00
Poommetee Ketson
4a0dc529ce BuildSystem: generated files have .gen.ext 2017-06-25 20:31:56 +07:00
Rémi Verschelde
11dc3f8589 i18n: Update template and sync translations 2017-06-25 14:25:46 +02:00
Rémi Verschelde
3683d1501d i18n: Sync translations with Weblate 
Adds Finnish translation.
 2017-06-25 14:23:24 +02:00
Rémi Verschelde
c5a44eebf5 Merge pull request #8558 from RandomShaper/tilemap-one-way-collision-2.1 
Add one-way collision to tile-set/tile-map (2.1)
 2017-06-25 11:19:54 +02:00
Pedro J. Estébanez
5b4f40666b Fix regression in script debugger 2017-06-19 11:56:16 +02:00
Pedro J. Estébanez
2018db093c Add one-way collision to tile-set/tile-map 2017-06-17 22:26:50 +02:00
aswinmohanme
945f40303a Prevent Editor from hang when importing stl as mesh 
When Importing an stl file into Godot from the import mesh menu, the
editor hangs indefinitely. Since only Obj files are supported, the data
remains unparsed and hence the editor enters an infinte loop.

This commit fixes this issue by exiting the loop when godot has finished
parsing the file, irrespective of whether any meaningful data was
extracted out.

Fixes: #9200
 2017-06-17 12:55:46 +02:00
Kryptocron
cb2697e98e Added option to not save a scene when played. 
(cherry picked from commit 4bee1d98fa)
 2017-06-17 12:53:29 +02:00
Rémi Verschelde
f1af9f380b Merge pull request #9119 from pixelpicosean/improve-tileset-convert-shape-offset-2.1 
Subtract body position from shape offset during tileset convert
 2017-06-17 12:52:52 +02:00
Bojidar Marinov
9c44d72b3c Fix EditorFileSystem duplicating root folder in new folders 
Also, add some uninitialized variables into constructors (I like to applease cppcheck).
Also, remove unused md_count.
Fixes #3662.

(cherry picked from commit c89d9720f0)
 2017-06-17 12:31:27 +02:00
Hugo Locurcio
db2cb08057 Increase the default perspective camera FOV 
This does not affect existing projects, but will affect newly-created
editor settings and Camera nodes.

(cherry picked from commit cdcc3c919b)
 2017-06-17 12:31:27 +02:00
Fabio Alessandrelli
f6f8628ec9 Editor now shows error when debug port is in use 
(cherry picked from commit fc1368bee0)
 2017-06-17 12:09:09 +02:00
Poommetee Ketson
f1901d8e3f Fix unsaved scene not running after save 
(cherry picked from commit 6b7021ad90)
 2017-06-17 12:07:27 +02:00
Nuno Donato
575ee17779 Run project after selecting main scene. Fixes #9077 
(cherry picked from commit 1ab0a779d8)
 2017-06-17 12:07:18 +02:00
Nuno Donato
ef2a962bad Automatically open new project after creating it in project manager. 
Fixes #9075

(cherry picked from commit 9fd41416a9)
 2017-06-17 12:07:10 +02:00
toger5
314fa89978 project manager, fixed siing of sort button 
(cherry picked from commit c33eff4bf9)
 2017-06-17 12:03:59 +02:00
Poommetee Ketson
44864eb663 About: add contributors list 
(cherry picked from commit db439308e6)
 2017-06-17 12:03:19 +02:00
Poommetee Ketson
15ab3804df CreateDialog: fix activating recent item creates node selected in search result 
(cherry picked from commit db64fcdd5f)
 2017-06-17 11:52:45 +02:00
Poommetee Ketson
76955cc187 CreateDialog: select root if search exactly match 
(cherry picked from commit 9fb90d7aea)
 2017-06-17 11:52:23 +02:00
Sean Bohan
e513ecb7a1 Add setting to hide tile info on the tilemap menu 
Sometimes the tile info label is too long so that the right dock will be pushed off the view if runs Godot in a small screen. It’ll no longer be a problem if this tile info is hide.
 2017-06-13 13:02:26 +08:00
Andreas Haas
6ae8cbb850
EditorSettings: Default game window placement to Centered. 2017-06-12 21:10:31 +02:00
Sean Bohan
1028739690 Subtract body position from shape offset during tileset convert 
To be able to adjust tile offset by changing position of StaticBody instead of modifying it maunally from the tres file or by calling a script.
 2017-06-11 11:58:02 +08:00
Rémi Verschelde
fe78ebbcb4 Merge pull request #8920 from pixelpicosean/scroll-to-pan-canvas-item-editor 
Add settings to pan canvas editor instead of zoom with mouse/touchpad scrolling
 2017-06-09 10:49:25 +02:00
Andreas Haas
1033250001 Editor: Make "open 2d/3d/script editor" shortcuts configurable. 
Also adds shortcuts for opening the AssetLib and for switching to the next/prev editor.

(cherry picked from commit 3be8a94868)
 2017-05-27 00:42:59 +02:00
Andreas Haas
4d9d3819f0 Project Settings: Use capitalized properties. 
There's been some inconsistency between the ProjectSettings and EditorSettings:
One would use "snake_case_properties", the other "Capitalized Properties".

This fixes that by also using capitalized properties for the project settings.
(It's actually the default, so the line setting it to false was just removed..)

Was there a strong reason for using snake_case here in the first place?

(cherry picked from commit 162068640b)
 2017-05-26 23:59:03 +02:00
Rémi Verschelde
d432ad1e17 Improve documentation of thirdparty code snippets 
(cherry picked from commit c8aea60324)
 2017-05-26 23:53:14 +02:00
mbalint12
1ca67fd484 Make script debugger display all kinds of objects 
(cherry picked from commit be5e02708d)
 2017-05-26 23:43:09 +02:00
mbalint12
8eba737992 Make property editor display dictionaries (read only) 
(cherry picked from commit a542372642)
 2017-05-26 23:42:34 +02:00
Rémi Verschelde
8312d421c6 Move core thirdparty files to thirdparty/{minizip,misc} 
(cherry picked from commit 2398eb6ed4)
 2017-05-26 23:29:26 +02:00
Andreas Haas
66a1e049b0 Tree: Ability to add tooltips to TreeItem buttons. 
Adds a tooltip parameter to `TreeItem::add_button()` and set a few tooltips in the Project settings and SceneTree dock.

(cherry picked from commit 29999942a2)
 2017-05-26 19:05:09 +02:00
Marco Melorio
3d7756df8e Added a container to EditorNameDialog 
(cherry picked from commit d4082a8d92)
 2017-05-26 18:47:32 +02:00
Rémi Verschelde
fec8e2549c Fix a few property warnings on Globals access 
Hand-picked from 515f92d03b.
 2017-05-26 18:46:59 +02:00
Rémi Verschelde
9b1ee4cd66 i18n: Add more assetlib strings to translate 
Fixes #8463.

(cherry picked from commit b474646de0)
 2017-05-26 18:41:46 +02:00
Andreas Haas
18f2b96186 Fix warning message when EditorPlugin script is not in tool mode. 
(cherry picked from commit 0029440955)
 2017-05-26 18:07:25 +02:00
supaiku
fda4911b6e Fix highlight typo 
(cherry picked from commit d51fe99a8b)
 2017-05-26 17:43:18 +02:00
Sean Bohan
e3f10f3e93 Add settings to pan canvas item editor instead of zoom with mouse/touchpad scrolling. 
This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive.

2 new settings are added to `2d_editor`:

1. `scroll_to_pan`: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom
2. `pan_speed`: use this value to change scroll speed
 2017-05-26 18:35:39 +08:00
Jon Ross
4ed2722589 Fix #8819. Adds _import_node() that, when used in conjunction with _import_scene, recurses through the scene tree and exports all available nodes. 2017-05-19 14:01:28 -07:00
Rémi Verschelde
aa046a85dc Merge pull request #8740 from pixelpicosean/scrollingWithFactor 
Implemented scrolling factor for precision trackpads for 2.1
 2017-05-15 07:57:05 +02:00
Sean Bohan
ee670f3724 Implemented scrolling factor for smooth trackpad scrolling 
Working platforms platform: OSX, Windows.
Support for almost all ui elements, including project list.

Ported from 304a1f5b5a (#7864).
Fixes #492 and #3913.
 2017-05-15 06:44:00 +08:00
Fabio Alessandrelli
aa167fa04b Rename debug/debug_port to network/debug_port. 
Expose it in editor settings.
 2017-05-12 20:01:53 +02:00
Fabio Alessandrelli
7a4dc3be41 Allow selecting editor debug host and port. 
Possibly fixes various editor<->debugger connection related problems.

(cherry picked from commit 98eb58a93c)
 2017-05-12 20:01:53 +02:00
Rémi Verschelde
c1e0ed4d8b Merge pull request #8643 from RandomShaper/fix-atlas-repeat-2.1 
Fix inverted logic for atlas repeat (2.1)
 2017-05-05 23:03:29 +02:00
Rémi Verschelde
4db6b8ff85 Merge pull request #8619 from akien-mga/3.0-exporter 
Fixes to 3.0 exporter: fix rotations, remap animation tracks
 2017-05-05 22:51:38 +02:00
Pedro J. Estébanez
ceb1f7afda Fix inverted logic for atlas repeat 2017-05-04 14:27:06 +02:00
Rémi Verschelde
17619b5420 Merge pull request #8435 from hikari-no-yume/scene_import_rigidonly_flag 
Scene importer: add -rigidonly flag for empties (fixes #8430)
 2017-05-02 11:32:00 +02:00
Rémi Verschelde
e936089161 Merge pull request #8561 from volzhs/modulate-transparency-2.1 
Show transparency and accurate color for property
 2017-05-02 11:28:28 +02:00
Rémi Verschelde
dd5fd4fdac Merge pull request #8542 from RandomShaper/opt-out-capitalization-2.1 
Add setting to opt-out of capitalization in property inspectors (2.1)
 2017-05-02 11:25:25 +02:00
Rémi Verschelde
13d1df2e4b Fixes to 3.0 exporter: fix rotations, remap animation tracks 
Also fixed some spacing issues to better match to .tscn format as written
by Godot 3.0.
 2017-05-01 23:09:38 +02:00
Andrea Faulds
c6fa193d66 Scene importer: add -rigidonly flag for empties (fixes #8430) 2017-04-30 16:27:00 +01:00
volzhs
e592860145 Show transparency and accurate color for property 2017-04-28 02:09:18 +09:00
Pedro J. Estébanez
9a0e08a352 Add setting to opt-out of capitalization in the property inspector 2017-04-27 08:46:45 +02:00
allkhor
b010b4a85c ScriptEditor: Fixes bug where menu option would be handled twice (2.1) 
(cherry picked from commit 97c385d)
 2017-04-21 03:11:32 +06:00
Rémi Verschelde
ebddc57eb1 Merge pull request #8466 from RandomShaper/fix-ik-2.1 
Fix IK not being solved while dragging a bone (2.1)
 2017-04-20 16:32:20 +02:00
Pedro J. Estébanez
f5be049dd8 Fix IK not being solved while dragging a bone 2017-04-20 16:18:47 +02:00
Rémi Verschelde
90576e0c7a Merge pull request #8358 from volzhs/script-filename-2.1 
Show script filename instead of thumbnail (2.1)
 2017-04-20 02:09:13 +02:00
Rémi Verschelde
f9bde9ddf7 Adapt Godot 3 exporter to new project file extension 2017-04-20 01:55:54 +02:00
Rémi Verschelde
5ea3c0350a Merge pull request #8429 from RandomShaper/fix-sample-lib-editor-2.1 
Fix inability to remove samples from libraries (2.1)
 2017-04-17 23:45:13 +02:00
Pedro J. Estébanez
3922407ceb Fix inability to remove samples from libraries 2017-04-17 00:28:29 +02:00
Andreas Haas
9b44117729 Merge pull request #8390 from volzhs/inspector-button-margin-2.1 
Make buttons closer in Inspector panel (2.1)
 2017-04-14 17:52:28 +02:00
Andreas Haas
2e68d4b407 Merge pull request #8355 from volzhs/texture-view-2.1 
Prevent to take too much space for long vertical texture (2.1)
 2017-04-14 17:50:45 +02:00
volzhs
dc519bf3bb Make buttons closer in Inspector panel 2017-04-13 23:54:33 +09:00
volzhs
72522596a9 Show script filename instead of thumbnail 
fix #7483
 2017-04-12 00:04:57 +09:00
volzhs
21edeebfdb Prevent to take too much space for long vertical texture 
fix #8176
 2017-04-11 20:29:35 +09:00
Rémi Verschelde
c449df86f7 Mark Godot 3.0 exporter as work in progress 2017-04-10 19:40:08 +02:00
Rémi Verschelde
a7a5ac596e Godot3 exporter: Convert engine.cfg properly 
Use a map to keep track of renamings as done for other properties.
The saving is a bit hackish, there might be simpler solutions.
 2017-04-09 02:11:36 +02:00
Rémi Verschelde
2491754de7 Style: Fix some badly formatted files 2017-04-08 01:42:41 +02:00
Rémi Verschelde
e9b045d9e5 Add "Godot Engine contributors" copyright line 2017-04-08 00:45:24 +02:00
Rémi Verschelde
64d8eeb4a1 i18n: Sync translations with Weblate 2017-04-07 21:26:46 +02:00
Rémi Verschelde
6d722f2622 i18n: Add WIP Czech, Danish, Greek, Dutch and Thai translations 2017-04-07 21:25:56 +02:00
Rémi Verschelde
593149b1a0 i18n: Update template with current source 2017-04-07 21:22:11 +02:00
Rémi Verschelde
2ee9e033ec Merge pull request #8202 from williamd1k0/add-script-button 
Add Attach and Clear Script buttons (2.1)
 2017-04-07 08:54:39 +02:00
Pedro J. Estébanez
9f8f8efa67 Add priority to samples in a library 2017-04-06 23:59:49 +02:00
volzhs
a67400aee7 Make buttons closer in Scene tree 
(cherry picked from commit a911b1f126)
 2017-04-05 08:19:57 +02:00
Rémi Verschelde
12749dd67a Merge pull request #8240 from volzhs/crash-project-setting 
Fix crash when change project settings
 2017-04-03 11:34:14 +02:00
volzhs
ddd01332ef Fix crash when change project settings 2017-04-03 17:49:02 +09:00
Rémi Verschelde
fd5215bffb Merge pull request #8179 from efornara/2.1 
Allow remote debugging on disconnected Windows machines
 2017-03-30 10:30:59 +02:00
Rémi Verschelde
2798a85ba7 Merge pull request #8172 from RandomShaper/improve-tile-palette-2.1 
Several enhancements for the tile map editor (2.1)
 2017-03-30 10:29:53 +02:00
William Tumeo
d90809151f Re-add attach button and context menu from 1880238c3e 2017-03-29 18:36:58 -03:00
William Tumeo
1307ff7eb1 Re-add clear script button and context menu from ce5200b30e 2017-03-29 17:23:49 -03:00
Emanuele Fornara
facacb886c Workaround to allow debugging on Windows when offline 2017-03-29 19:44:18 +01:00
William Tumeo
5d8d51719a Re-add script icons from 544194053a 2017-03-29 04:06:53 -03:00
William Tumeo
95f747ec93 Re-add create/load script button and context menu 
- create from f51b202566
- load from 41329f9750
 2017-03-29 03:46:35 -03:00
William Tumeo
225b1d2d76 Re-add script button from b77200728e 2017-03-29 02:16:26 -03:00
Pedro J. Estébanez
bba31fbad7 Several enhancements for the tile map editor 
Allow sorting tile palette by name
Allow hiding tile ids in tile palette
 2017-03-27 10:46:44 +02:00
Rémi Verschelde
e3d6d863af Merge pull request #8170 from RandomShaper/fix-uniform-move-2.1 
Include uniform (Shift down) mode in only-one-Node2D dragging (2.1)
 2017-03-27 08:57:05 +02:00
Pedro J. Estébanez
3bdb29b077 Include uniform (Shift down) mode in only-one-Node2D dragging 2017-03-27 01:32:16 +02:00
Rémi Verschelde
8f5b15754c Merge pull request #8114 from RandomShaper/improve-snapping-2.1 
Improved 2D snapping behavior (2.1)
 2017-03-24 22:51:09 +01:00
Rémi Verschelde
a9d63bcf6f Merge pull request #8107 from RandomShaper/warped-panning-2.1 
Implement warped mouse panning for 2D & 3D editors (2.1)
 2017-03-24 22:50:34 +01:00
Rémi Verschelde
2c95976ef7 Merge pull request #8099 from RandomShaper/close-output-2.1 
Add editor option for automatically closing the output when stopping the game (2.1)
 2017-03-24 22:50:02 +01:00
Rémi Verschelde
15b6eadba7 i18n: Sync templates and translations with current code 2017-03-24 22:27:22 +01:00
Rémi Verschelde
d2e8a21cb1 i18n: Adapt script to tools/editor -> editor move 2017-03-24 22:24:56 +01:00
Pedro J. Estébanez
adf36faee8 Improved 2D snapping behavior 
Make snapping affect nodes created by drag & drop
Make snapping for a single Node2D refer to its pivot
Refactor duplicate drag setup code
 2017-03-24 21:27:37 +01:00
Rémi Verschelde
a531051a61 Only assume HiDPI mode if DPI >= 192 and width > 2000 
Also use single-dock column if width < 1200.

Manually adapted from bfe67a3b87
and c103f32ea3.

Fixes #6096.
 2017-03-24 18:26:56 +01:00
Pedro J. Estébanez
2c2c48ffb3 Implement warped mouse panning for 2D & 3D editors 
Enabled by default as in Blender, but can be disabled separately for 2D & 3D;
the core functionality is in Input so this could be reused or even exposed to scripts in the future
 2017-03-22 21:18:47 +01:00
Pedro J. Estébanez
e1d18e6481 Add editor option for automatically closing the output when stopping the game 
(back-ported from 1bd1af776c)
 2017-03-21 12:47:05 +01:00
Rémi Verschelde
ea987256f6 Revert "Fix drag and drop on 2d viewport" 
This reverts commits a9d8da91b7
and 4230b22558.
 2017-03-20 16:57:29 +01:00
Rémi Verschelde
4230b22558 Fix cherry-pick mistake using 3.0 method 
Bug introduced in a9d8da91b7.
 2017-03-19 10:01:53 +01:00
Andreas Haas
3c16e7842f Editor: Fix "About" dialog 
Use a HBoxContainer instead of hardcoded positions.

(cherry picked from commit 7ec697695f)
 2017-03-19 00:44:05 +01:00
volzhs
a9d8da91b7 Fix drag and drop on 2d viewport 
(cherry picked from commit 4d0a75750f)
 2017-03-19 00:40:54 +01:00
Rémi Verschelde
f8db8a3faa Bring that Whole New World to the Old Continent too 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
 2017-03-19 00:36:26 +01:00
Rémi Verschelde
1b0e2b0c39 Refactoring: rename tools/editor/ to editor/ 
The other subfolders of tools/ had already been moved to either
editor/, misc/ or thirdparty/, so the hiding the editor code that
deep was no longer meaningful.

(Manual redo of 49c065d29c)
 2017-03-18 23:45:45 +01:00