Commit Graph

10851 Commits

Author SHA1 Message Date
Zher Huei Lee 6ba94cb924 Fixed RichTextLabel::add_newline() #12564 2017-11-02 08:46:28 +08:00
Rémi Verschelde 93a3d1714e
Merge pull request #12568 from starry-abyss/vs2013_fix
Fix compilation on Visual Studio 2013 again.

[ci skip]
2017-11-01 22:40:12 +01:00
scorched 1d99f93a7a Fix compilation on Visual Studio 2013 again. 2017-11-01 23:47:05 +03:00
bncastle 95408c8670 Select correct animation on creation of a new one
-  Select the correct animation when creating a new one.
- Removed unneeded new_name variable.
2017-11-01 15:40:58 -04:00
Gilles Roudiere 025f138561
Merge pull request #10618 from poke1024/polygon2d-selection
Proposal for modified Polygon2D editor controls
2017-11-01 18:16:33 +01:00
Bastiaan Olij 167b7b5533 Adding rumble support to ARVR controllers (if implemented on the ARVR interface) 2017-11-01 23:59:14 +11:00
Rémi Verschelde 584bc88834
Merge pull request #12559 from Cradmon/filesystemDockFix
Fix to issue #12554, due to error in refactoring in PR #10261
2017-11-01 12:45:08 +01:00
Cradmon 93e8468d92 Fix to issue #12554, due to error in refactoring in PR #10261 2017-11-01 11:31:13 +00:00
Rémi Verschelde 58889102b6
Merge pull request #12538 from akien-mga/editorsettings
Code quality refactoring in EditorSettings
2017-11-01 08:25:03 +01:00
Rémi Verschelde fc6ef93cc8
Merge pull request #12548 from SaracenOne/vertex_compression_import_fix
Restores functionality of the use_compression flag in Collada import
2017-11-01 07:59:39 +01:00
Rémi Verschelde f8ed1144df
Merge pull request #12025 from leezh/dedent
Added String::dedent() to remove text indentation
2017-11-01 07:58:27 +01:00
Poommetee Ketson 7a5594bdb7
Merge pull request #12547 from cooperra/specially-vs-especially
Proofreading: Change a usage of "specially" to "especially"

[ci skip]
2017-11-01 10:20:43 +07:00
Ignacio Etcheverry 3c97a9543d
Merge pull request #12549 from neikeq/seriously-do-they
Mono cleanup fixes
2017-11-01 01:56:16 +01:00
Ignacio Etcheverry cb3ef3c7e6
Merge pull request #12546 from neikeq/do-people-read-these
Use mono_gc_wbarrier_set_arrayref for Array marshalling
2017-11-01 01:52:42 +01:00
Ignacio Etcheverry a018cbaee1 Fix thread checking to queue instances for deletion 2017-11-01 01:51:12 +01:00
Ignacio Etcheverry 06ea441564 Make sure gchandle bindings are released before cleanup 2017-11-01 01:48:47 +01:00
Saracen ef90965883 Restores functionality of the use_compression flag in the Collada importer. 2017-11-01 00:01:24 +00:00
Robbie Cooper dbf774f9dc Proofreading: Change a usage of "specially" to "especially"
See PR godotengine/godot-docs#561. This file generates documentation touched by that PR, so must be changed to stay in sync.

I couldn't find any other usages in this repo that needed changing. I looked in all files matching *.cpp *.h *.md *.txt *.xml *.html *.rst.
2017-10-31 19:47:07 -04:00
Zher Huei Lee 0804dd5336 Added String::dedent() to remove text indentation
This functions similarly to Python's textwrap.dedent()

It's also been applied to doc_data.cpp to remove extra whitespace while
parsing the XML.
2017-11-01 07:20:20 +08:00
Ignacio Etcheverry 0525b63421 Use mono_gc_wbarrier_set_arrayref for Array marshalling 2017-11-01 00:17:34 +01:00
Rémi Verschelde 29ea79e065
Merge pull request #12542 from Paulb23/enter_remove_text_issue_12494
Remove text on enter, issue 12494
2017-10-31 23:37:30 +01:00
Rémi Verschelde 63adc9f113
Merge pull request #12539 from bncastle/InputMapDialogClearAction
Clear action name text input when the action is successfully added to the Input Map

[ci skip]
2017-10-31 23:37:01 +01:00
Rémi Verschelde 0438f4875d Some more harmonization of EditorSettings code 2017-10-31 23:36:03 +01:00
Rémi Verschelde 31c92c5327
Merge pull request #12537 from marcelofg55/wasapi_improvements
Improved WASAPI driver logic when devices are connected or disconnected
2017-10-31 23:33:41 +01:00
Rémi Verschelde 2ffcbae2f1
Merge pull request #12536 from Hinsbart/cs_templates
Mono: support custom script templates.
2017-10-31 23:33:25 +01:00
Rémi Verschelde ea0e942617
Merge pull request #12035 from Chaosus/wrapfunc
Added new Wrap functions for numbers
2017-10-31 23:30:50 +01:00
Rémi Verschelde cb3f594b14
Merge pull request #11249 from m4nu3lf/bugfix/get_euler
Fix inertia tensor update & Generic6DOFJoint & Simplify Basis::get_euler()
2017-10-31 23:03:01 +01:00
Rémi Verschelde 24b3733f3b
Merge pull request #10770 from RandomShaper/fix-joints
Fix joints collision exceptions, plus a bit more
2017-10-31 23:02:37 +01:00
Rémi Verschelde ca31174dd0
Merge pull request #10261 from Cradmon/refactor
Make the File System Dock more user friendly
2017-10-31 23:01:32 +01:00
Paulb23 e03a054714 Remove text on enter, issue 12494 2017-10-31 20:42:53 +00:00
Juan Linietsky a4ea63737c Ability to shrink 3D viewport by half 2017-10-31 14:23:47 -03:00
bncastle a7feec3992 Clear text when a new action is added Project Settings Input Map
When editing the Input Map under Project Settings:
Clear the action name the 'Add' button is clicked and the action is
successfully added.
2017-10-31 12:59:30 -04:00
Marcelo Fernandez 16327bff8a Improved WASAPI driver logic when devices are connected or disconnected 2017-10-31 13:07:35 -03:00
Andreas Haas f3218c24c7
Mono: support custom script templates.
Also fixes a bug that prevented methods like `duplicate()` from copying the source code. (Copied from GDScript implementation)
2017-10-31 15:46:30 +01:00
Ignacio Etcheverry 157fa55e34
Merge pull request #12535 from neikeq/wtf···
Fix msbuild hint paths returning only the directory
2017-10-31 15:19:25 +01:00
Rémi Verschelde 2d5de0b185 Reorder EditorSettings code for better legibility
No functional change, only moving stuff around.
2017-10-31 15:16:37 +01:00
Ignacio Etcheverry 32ee3ecce4 Fix msbuild hint paths returning only the directory 2017-10-31 15:15:42 +01:00
Rémi Verschelde a9a49b89cd
Merge pull request #12531 from uldall/master
Fixed GitHub detection of license in LICENSE.txt file.
2017-10-31 11:52:51 +01:00
Christian Uldall Pedersen bb6dc76307 Fixed GitHub detection of license in LICENSE.txt file.
Unfortunately licensee also looks at the COPYRIGHT.txt file and detects it as "other".
GitHub therefore still doesn't add the correct license to the project. This is
however a step in the right direction.

Before:
$ licensee LICENSE.txt
License: Other
Matched files: ["LICENSE.txt"]
LICENSE.txt:
  Content hash: 8dd7a8f24846f434ce7fdb96f6440909b5469277
  Attribution: Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.
  License: Other

After:
$ licensee LICENSE.txt
License: MIT License
Matched files: ["LICENSE.txt"]
LICENSE.txt:
  Content hash: d64f3bb4282a97b37454b5bb96a8a264a3363dc3
  Attribution: Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.
  Confidence: 100.00%
  Matcher: Licensee::Matchers::Exact
  License: MIT License
2017-10-31 11:42:31 +01:00
Rémi Verschelde 31cd46fbf1
Merge pull request #12530 from godotengine/revert-12351-fix_item_list_selection_clipping
Revert "Fixes the selection rect in item_list drawn not clipped"
2017-10-31 11:01:14 +01:00
Rémi Verschelde a1ffadb953
Revert "Fixes the selection rect in item_list drawn not clipped" 2017-10-31 10:58:53 +01:00
Rémi Verschelde 91adb58d3d Add screenshot to the README
3D scene courtesy of @fracteed.
2017-10-31 10:15:36 +01:00
Benjamin 2b82997052 Use node name as default filename when attaching script.
When attaching a script to a node that isn't saved to a scene file,
use its name as default filename. If the edited scene's root node *has*
been saved to a file, use that directory.
2017-10-31 09:47:38 +01:00
Rémi Verschelde 31a487660a
Merge pull request #12499 from Zylann/freelook_toggle_mode
Add option to use freelook with a toggle shortcut
2017-10-31 09:29:54 +01:00
Juan Linietsky d582cab207
Merge pull request #12526 from tagcup/ubo_fix
Add viewport to the other SceneData struct.
2017-10-30 22:06:53 -03:00
Ferenc Arn 6e68c86ba6 Add viewport to the other SceneData struct.
This was missed in #12288.
2017-10-30 20:48:33 -04:00
Rémi Verschelde f021b00389
Merge pull request #12525 from neikeq/wololo
Remove Visual Studio for now from the external editors list
2017-10-30 23:47:34 +01:00
Juan Linietsky fd07a283e5
Merge pull request #12523 from RandomShaper/fix-margins-drawn-too-late
Fix viewport margins drawn after swapping buffers
2017-10-30 19:47:02 -03:00
Ignacio Etcheverry ad194f81b6 Remove Visual Studio for now from the external editors list 2017-10-30 23:43:26 +01:00
Juan Linietsky 4785e66eea
Merge pull request #12288 from tagcup/expose_viewport_size
Expose VIEWPORT_SIZE in shader language.
2017-10-30 19:32:21 -03:00