Commit Graph

1887 Commits

Author SHA1 Message Date
Rémi Verschelde 8d7879e09a Merge pull request #7527 from RayKoopa/inspector_show_in_file_system
Add menu item in the inspector to show file in FileSystem
2017-02-27 23:14:55 +01:00
Ray Koopa c02eb9a07a Add menu item for file resources in the inspector to reveal them in the FileSystem 2017-02-27 16:59:12 +01:00
Benjamin Bäumler edd37eccd4 fix custom scene arguments from the editor
sequel of #7347

Play edited scene and Play custom scene didn't worked when main_run_args
hadn't $scene as argument.

Changes/Fixes the way how the editor handles scene paths when starting the
project/a scene
Play the project - no scene path
Play the edited scene - scene path of active scene in the editor
Play custom scene - scene path of custom scene

main_arg_runs is now empty by default and $scene won't be replaced
by the scene path anymore

Changed declaration if EditorRun::run, to remove a unused value
2017-02-27 15:20:47 +01:00
Rémi Verschelde 30c5286936 Merge pull request #7857 from Hinsbart/external_script_break
Don't switch to script on breakpoint hit when using external editor.
2017-02-26 20:24:27 +01:00
Rémi Verschelde 9c05110ab8 Merge pull request #7842 from Zylann/fix_line2d_editor
Fixed Line2D editor doesn't respond to input
2017-02-26 20:18:18 +01:00
Rémi Verschelde 46b2267498 Merge pull request #7879 from bojidar-bg/fix-iphone-builds
Complete the globals.h -> global_config.h conversion
2017-02-23 16:51:28 +01:00
Bojidar Marinov 53921faa91
Complete the globals.h -> global_config.h conversion 2017-02-23 17:47:25 +02:00
Juan Linietsky 2c88f4d4b5 working on template validation 2017-02-21 21:30:40 -03:00
Juan Linietsky de0045cf1b -renamed globals.h to global_config.cpp (this seems to have caused a few modified files)
-.pck and .zip exporting redone, seems to be working..
2017-02-21 00:06:30 -03:00
Andreas Haas 10fa752ae7
Don't switch to script on breakpoint hit when using external editor.
Fixes #7705
2017-02-20 21:23:09 +01:00
Juan Linietsky f6950956bd Editor Export Settings Dialog is completed!! Now on to make some exporters.. 2017-02-19 23:21:35 -03:00
Marc Gilleron 544d9cb24e Fixed Line2D editor doesn't respond to input 2017-02-19 02:55:47 +01:00
Hein-Pieter van Braam b696beea65 Correct hash behavior for floating point numbers
This fixes HashMap where a key or part of a key is a floating point
number. To fix this the following has been done:

* HashMap now takes an extra template argument Comparator. This class
gets used to compare keys. The default Comperator now works correctly
for common types and floating point numbets.

* Variant implements ::hash_compare() now. This function implements
nan-safe comparison for all types with components that contain floating
point numbers.

* Variant now has a VariantComparator which uses Variant::hash_compare()
safely compare floating point components of variant's types.

* The hash functions for floating point numbers will now normalize NaN
values so that all floating point numbers that are NaN hash to the same
value.

C++ module writers that want to use HashMap internally in their modules
can now also safeguard against this crash by defining their on
Comperator class that safely compares their types.

GDScript users, or writers of modules that don't use HashMap internally
in their modules don't need to do anything.

This fixes #7354 and fixes #6947.
2017-02-16 18:44:29 +01:00
Juan Linietsky d7fd86d51a -begin of export work, not done yet
-fixes to make scenes exported from godot 2.x work
2017-02-15 08:30:32 -03:00
Rémi Verschelde fb4b4a30e7 Merge pull request #7792 from Hinsbart/inputmap_fixes
ProjectSettings: InputMap dialog fixes
2017-02-14 07:46:31 +01:00
Hein-Pieter van Braam 411ee71b4d Rename the _MD macro to D_METHOD
This new name also makes its purpose a little clearer

This is a step towards fixing #56
2017-02-13 12:50:02 +01:00
Andreas Haas 92ac7067e6
ProjectSettings: InputMap dialog fixes
Now the selection jumps to the correct action after a new event has been added.
Also sets the default device id for Joypad button events to 0.
2017-02-13 07:58:29 +01:00
Rémi Verschelde 117a83fcb9 Merge pull request #7352 from Zylann/polyline
Polyline
2017-02-12 23:30:04 +01:00
Rémi Verschelde 37e75873ef Merge pull request #7789 from volzhs/update-script-button
Update attach/clear script tool bar icon in Scene panel
2017-02-12 23:29:04 +01:00
Rémi Verschelde d417e91995 Merge pull request #7772 from Limb/fixgiprobeeditor
Remove memdelete of button in GIProbeEditor exit
2017-02-12 23:25:06 +01:00
Rémi Verschelde f3d339e33f Merge pull request #7768 from bojidar-bg/sc-multiple-names
Make _sc_ files work like ._sc_
2017-02-12 23:22:13 +01:00
Rémi Verschelde c96fa0f23e Merge pull request #7757 from volzhs/save-debug-options
Save and restore debug options for each project
2017-02-12 23:20:48 +01:00
Rémi Verschelde ceac8a780e Merge pull request #7740 from magyar123/master
Add editor option for closing the output when stopping the game.
2017-02-12 23:16:14 +01:00
volzhs b9c1d65d21 Update attach/clear script tool bar icon in Scene panel 2017-02-13 07:02:23 +09:00
Kenneth Lorthioir d36dde7c1e Remove memdelete of button in GIProbeEditor exit
This issue was causing a heap corruption on windows.
2017-02-09 10:45:55 -05:00
Bojidar Marinov 27bb6b5282
Make _sc_ files work like ._sc_, fixes #7762 2017-02-09 12:26:18 +02:00
Rémi Verschelde b87a232668 Reorder the folders in tools to prepare moving tools/editor
- `certs` and `editor_fonts` go to `thirdparty`
- `dist` and `scripts` go to a new `misc` folder
- `collada` and `doc` go to `tools/editor`

The next step will be to rename `tools/editor` to `editor` directly,
but this will be done at the right time to avoid breaking too many PRs.
2017-02-09 00:08:27 +01:00
volzhs 79e8616fbb Save and restore debug options 2017-02-08 23:51:13 +09:00
Rémi Verschelde bd8df0f21d Merge pull request #7709 from bojidar-bg/sort-scripts-by-path
Sort settings for scripts in the editor
2017-02-07 14:14:54 +01:00
mbalint12 1bd1af776c Add editor option for automatically closing the output when stopping the game. 2017-02-06 18:17:20 +01:00
Juan Linietsky 6f2e16306a Several bugfixes, improving the import workflow 2017-02-06 00:38:39 -03:00
Juan Linietsky af3fabeb77 Ensure proper config version when reading the new configuration file. 2017-02-04 21:02:52 -03:00
Juan Linietsky 102b5fce85 Renamed engine.cfg to godot.cfg, to forcefully break compatibility with 2.x 2017-02-04 20:53:55 -03:00
Juan Linietsky 331a4d8078 completed scene importing (I hope?) 2017-02-04 20:31:15 -03:00
Juan Linietsky ad2e1b1b92 fix continous reimport bug (i hope) 2017-02-04 11:12:03 -03:00
Juan Linietsky 27eae4ada1 Scene import more or less working, needs some missing features. 2017-02-04 09:48:04 -03:00
Juan Linietsky 9ce2ab9749 OBJ file importing! 2017-02-03 00:08:50 -03:00
Juan Linietsky a02933bb3c wav file importing! 2017-02-02 22:51:58 -03:00
Bojidar Marinov 6f3fc1f05a
Sort settings for scripts in the editor 2017-02-02 14:31:01 +02:00
volzhs 86a04198d9 Fix crash when saving root node by "Save Branch as Scene" with unsaved scene
Fix #7667

(cherry picked from commit 43a2599801)
2017-02-02 08:24:52 +01:00
Rémi Verschelde e59e6c69c4 Merge pull request #7672 from Hinsbart/drag_crash
SceneTreeDock: Fix crash when dragging invalid nodes.
2017-02-02 08:14:19 +01:00
Rémi Verschelde 53c4dfe857 Merge pull request #7670 from RandomShaper/load-placeholder-dup
Replicate load-as-placeholder state on node duplication
2017-02-02 08:13:51 +01:00
Rémi Verschelde 39f11ffc51 Merge pull request #7666 from Paulb23/line_length_guideline
Fixed line lenght guideline, and added colour option
2017-02-02 08:12:46 +01:00
Rémi Verschelde ade3806a14 Merge pull request #7648 from RayKoopa/add_remove_animation_warning
Added warning when removing animations
2017-02-02 08:06:34 +01:00
volzhs 5f54b20e2f Fix compile error 2017-02-02 11:18:37 +09:00
Juan Linietsky b3aebcf6df CSV translation import plugin 2017-02-01 20:41:05 -03:00
Juan Linietsky 2cd2ca7bbc Lot of work in new importer, importing textures now works. 2017-02-01 09:46:36 -03:00
Andreas Haas a64a348054
SceneTreeDock: Fix crash when dragging invalid nodes.
Fixes #7529
2017-01-29 14:32:40 +01:00
Pedro J. Estébanez e4cc483f4c Replicate load-as-placeholder state on node duplication
Cherry-picked from 936f2e3b4e
2017-01-29 11:56:10 +01:00
Paulb23 6b42cd5fe6 Fixed line lenght guideline drawing with color option 2017-01-28 14:36:57 +00:00