Commit Graph

11255 Commits

Author SHA1 Message Date
Rémi Verschelde 9143df1597
Merge pull request #13059 from dragmz/13009
Fix Regression: running current scene (unsaved) will ask for main scene
2017-11-19 23:50:28 +01:00
Rémi Verschelde cc88a4cea6
Merge pull request #13030 from Krakean/master
Add "View FPS" in 3D->Perspective's popup.
2017-11-19 23:49:35 +01:00
Marcin Zawiejski a14bd70995 Fix Regression: running current scene (unsaved) will ask for main scene 2017-11-19 22:59:05 +01:00
Dmitry Koteroff 55f992942c Add "View FPS" in 3D->Perspective's popup.
"Fixes" to make it acceptable by clang-format.

"Fixes" to make it acceptable by clang-format.
2017-11-20 00:35:46 +03:00
Rémi Verschelde a5939c2953
Merge pull request #13056 from RoyBerube/master
Visual Studio project creation bug fix

[ci skip]
2017-11-19 22:16:17 +01:00
Rémi Verschelde d2bc961388
Merge pull request #13000 from djrm/pr_import_fixes
import fixes
2017-11-19 21:59:11 +01:00
RoyBerube 4d5a87a422 Visual Studio project creation bug fix
A bug in the /drivers SCons script was preventing files in the /drivers and some in the /thirdparty directories from being added to the VS project.

This will only affect builds that use the 'vsproj=yes' option.
2017-11-19 13:56:48 -07:00
Rémi Verschelde d40b1825fc Revert "change low cpu delay to 1 usec, should make editor smoother and not really use"
This reverts commit ca19403306.

See discussion in ca19403306 (commitcomment-25715906)
It also did not fix the issue it claimed to fix.
2017-11-19 21:40:25 +01:00
Rémi Verschelde 469cff734f
Merge pull request #13018 from hoelzl/pr-cpp-hint
Add cpp.hint file to improve IntelliSense
2017-11-19 21:37:02 +01:00
Rémi Verschelde 6ace4011e4
Merge pull request #13045 from akien-mga/gles2-cleanup
Cleanup old references to GLES2 renderer
2017-11-19 21:36:00 +01:00
Rémi Verschelde 39204630a7
Merge pull request #13052 from djrm/pr_fixes
Fix import obj as scene.
2017-11-19 21:35:22 +01:00
Tom Beckmann 93be4982d0 Make particles with DISABLE_Z active respect ALIGN_Y. Fixes #12865 2017-11-19 21:32:25 +01:00
Pedro J. Estébanez 5a0be858f4 Let SceneTreeDock duplicate nodes via Node::duplicate()
Helps with #11182.
2017-11-19 21:30:17 +01:00
Pedro J. Estébanez 7286966971 Remove out-of-logic assignment of instance's original scene 2017-11-19 21:30:17 +01:00
Matthias Hoelzl 4c76c6892c Add placement deletes to avoid warnings on VC++
When compiling with VC++ 2017, Godot generates huge numbers of
C4291 warnings about missing placement delete.

I have not found a way to disable these warnings using compiler
options: AFAICT there is no equivalent to `-f-no-exceptions` for
VC++ (there is only /EH to change the exception-handling model,
/GX is deprecated) and adding /wd4291  to the
`disable_nonessential_warnings` list in the `SConstruct` file
or even compiling with `warnings=no` does not disable the
messages.

Placement delete is only called when placement new throws an
exception, since Godot doesn't use exceptions this change should
have no runtime effect.

Fixes #12654 (probably, difficult to say without log)
2017-11-19 21:25:18 +01:00
Rémi Verschelde 1552dbfb21
Merge pull request #13001 from capnm/fix_class_docs_inline_markup
Fix the class docs for the rst-syntax errors.

[ci skip]
2017-11-19 21:02:13 +01:00
Matthias Hoelzl 589976321c Add cpp.hint file to improve IntelliSense 2017-11-19 21:01:05 +01:00
Rémi Verschelde 6e3f2f44af Use new XDG folders to dehardcode paths 2017-11-19 20:54:26 +01:00
Rémi Verschelde 32c12a92a5 Add initial support for the XDG Base Directory spec
Spec version 0.7 from https://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html
(latest as of this commit).

Three virtual methods are added to OS for the various XDG paths we will use:
- OS::get_data_path gives XDG_DATA_HOME, or if missing:
  ~/.local/share on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_config_path gives XDG_CONFIG_HOME, or if missing:
  ~/.config on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_cache_path gives XDG_CACHE_HOME, or if missing:
  ~/.cache on X11, ~/Library/Caches on macOS and %APPDATA% on Windows

So for Windows there are no changes, for Linux we follow the full split spec
and for macOS stuff will move from ~/.godot to ~/Library/Application Support/Godot.

Support for system-wide installation of templates on Unix was removed for now,
as it's a bit hackish and I don't think anyone uses it.

user:// will still be OS::get_data_path() + "/godot/app_userdata/$name" by
default, but when using the application/config/use_shared_user_dir option
it will now use XDG_DATA_HOME/$name, e.g. ~/.local/share/MyGame.

For now everything still goes in EditorSettings::get_settings_dir(), but
this will be changed in a later commit to make use of the new splitting
where relevant.

Part of #3513.
2017-11-19 20:54:24 +01:00
Daniel J. Ramirez 5e56366eba Fix import obj as scene. 2017-11-19 13:51:05 -06:00
Rémi Verschelde c574be5566 Check whether GL context supports the expected API
I couldn't test it yet myself (GPU supports GL 4.5), so we'll need to see if it behaves
as expected on systems that don't support OpenGL 3.3 or GL ES 3.0.
2017-11-19 20:47:53 +01:00
Martin Capitanio 7c3ba6f72b Fix the class docs for the rst-syntax errors.
- Generate a correkt rst-syntax for the [/code] inline markup.
  (http://www.sphinx-doc.org/en/1.6.5/rest.html#inline-markup)
- Fix xml souce bugs

for the sphinx's rst syntax werrors:

class_area.rst:319: WARNING: Inline literal start-string without end-string.
class_area2d.rst:287: WARNING: Inline literal start-string without end-string.
class_audioserver.rst:287: WARNING: Inline literal start-string without end-string.
class_control.rst:509: WARNING: Inline literal start-string without end-string.
class_image.rst:422: WARNING: Inline literal start-string without end-string.
class_image.rst:434: WARNING: Inline literal start-string without end-string.
class_inputevent.rst:74: WARNING: Inline literal start-string without end-string.
class_inputeventaction.rst:45: WARNING: Inline literal start-string without end-string.
class_inputmap.rst:47: WARNING: Inline literal start-string without end-string.
class_kinematicbody.rst:80: WARNING: Inline interpreted text or phrase reference start-string without end-string.
class_kinematicbody2d.rst:80: WARNING: Inline interpreted text or phrase reference start-string without end-string.
class_line2d.rst:182: WARNING: Inline literal start-string without end-string.
class_thread.rst:51: WARNING: Inline literal start-string without end-string.
class_treeitem.rst:160: WARNING: Inline literal start-string without end-string.
2017-11-19 20:47:36 +01:00
Ferenc Arn 4e87f471d7 Use parallel transport in PathFollow2D.
Fixes #12995.
2017-11-19 14:38:53 -05:00
Rémi Verschelde 249c11784a
Merge pull request #13046 from AndreaCatania/kinfix
Some Bullet bug fix
2017-11-19 20:37:04 +01:00
Rémi Verschelde f0795ae2fe
Merge pull request #13044 from eska014/enginejs
Change HTML5 start-up API
2017-11-19 20:18:00 +01:00
Rémi Verschelde 39a4a67776
Merge pull request #13043 from volzhs/post-import
Restore post_import function
2017-11-19 20:15:46 +01:00
Rémi Verschelde 618450caec
Merge pull request #13040 from RandomShaper/fix-signals-dup
Fix duplication of signals
2017-11-19 20:14:29 +01:00
Rémi Verschelde e89ec04be8
Merge pull request #13039 from sketchyfun/animation_key_selection_fix
Fixed issues with clicking animation keys that are on frame 0
2017-11-19 20:11:59 +01:00
Orkun 22bdad8bbe Fix #10798: Fixes Change Type does not change icon
Problem : While replacing old node properties with new ones, we
also copy meta data of old node's icon

Solve: don't copy meta so don't override _editor_icon
2017-11-19 20:46:30 +03:00
AndreaCatania 0327a51c12 Added null check in Bullet cast_motion API 2017-11-19 18:21:36 +01:00
Poommetee Ketson f5e85c6103
Merge pull request #12955 from groud/editor_canvas_item_api_rework
Editor canvas item api rework
2017-11-20 00:19:00 +07:00
Rémi Verschelde d629a753ec
Merge pull request #13033 from MednauN/master
Add currency code to iOS product details response
2017-11-19 18:16:38 +01:00
Rémi Verschelde 3c5ce7cd85
Merge pull request #13031 from YeldhamDev/dock_label
Added a label to the Dock Positioner
2017-11-19 18:07:59 +01:00
AndreaCatania d250ade37b Fixed gravity scale 2017-11-19 17:52:45 +01:00
Rémi Verschelde 9f134aa5d1 Cleanup old references to GLES2 renderer
There are still some left in the Android Java code, even stuff to swap between
GLES1 and GLES2 support from early Godot days... would be good to see some cleanup
there too one day.

The "graphics/api" option for Android exports is removed, as only GLES 3.0 is supported.
It can be readded when GLES 2.0 support comes back. Fixes #13004.
2017-11-19 17:52:18 +01:00
AndreaCatania aa3e740a53 Removed dynamic_cast from Bullet Server 2017-11-19 17:11:47 +01:00
AndreaCatania e6ba163031 Fixed kinematic movement on concave shape 2017-11-19 17:01:08 +01:00
Rémi Verschelde bea607d53e
Merge pull request #13015 from hoelzl/pr-vs-no-progress
Suppress progress messages in Visual Studio output pane

[ci skip]
2017-11-19 16:45:55 +01:00
Rémi Verschelde 4a08887950
Merge pull request #13016 from neikeq/issue-13011
Mono: Fix compiler error with Variant::operator AABB()
2017-11-19 16:43:20 +01:00
George Marques 3b596cdbe0
Merge pull request #13024 from omar25h/set_current_tab_fix
fix set_current_tab: Indexp_current=-1 out of size
2017-11-19 13:32:22 -02:00
Rémi Verschelde 992a40a50d
Merge pull request #12961 from eska014/platform-doc
Facilitate documenting platform-exclusive classes
2017-11-19 16:19:47 +01:00
volzhs 30af5e81db Restore post_import function 2017-11-19 23:45:16 +09:00
Leon Krause 35adf718cf Change HTML5 start-up API
Rename engine.start() to startGame(), new start() takes string arguments
handed directly to main(). Rename Engine.loadEngine() to load().

Add setLocale(), setResizeCanvasOnStart(), setExecutableName() and
preloadFile().
2017-11-19 15:39:57 +01:00
Leon Krause 9107357c8d
Merge pull request #13003 from eska014/drop-asmjs
Drop HTML5 asm.js support
2017-11-19 15:07:19 +01:00
Pedro J. Estébanez 803b3934d6 Fix duplication of signals
- Partially revert 6496b53549, adding a comment about why duplications of signals must happen as a second phase.
- Add fallback logic for connections to nodes not in the duplicated hierarchy.
- Remove redundant call to `Node::_duplicate_signals()`.

Fixes #12951.
2017-11-19 15:07:05 +01:00
BenH 09b7a651b8 Fixed issue with animation keys that are on frame 0 being difficult to click 2017-11-19 14:05:33 +00:00
Gilles Roudiere 8d1f2b1857 Rework the canvas_item API for further improves to the canvas item editor 2017-11-19 13:36:31 +01:00
Omar Al Halabi cb86f6fbf6 fix set_current_tab: Indexp_current=-1 out of size 2017-11-19 13:14:00 +02:00
Poommetee Ketson 0aa4765904
Merge pull request #12989 from capnm/fix_class_makerst
Fix class docs, improve error handling of the rst generator.
2017-11-19 16:25:51 +07:00
Poommetee Ketson baaafc5829
Merge pull request #12999 from Hinsbart/dnd_import
Editor: Drop files to copy them to project.
2017-11-19 16:22:40 +07:00