Commit Graph

11453 Commits

Author SHA1 Message Date
Rémi Verschelde
2c6af835a1
Merge pull request #14423 from PJB3005/17-12-08-fix-ocludder-typo
Fix TileSet::AutotileData::ocludder_map typo
2017-12-08 20:51:37 +01:00
PJB3005
0221cac2fc Fix TileSet::AutotileData::ocludder_map typo 2017-12-08 20:38:36 +01:00
Juan Linietsky
146bdf031d
Merge pull request #14412 from hpvb/fix-thekla-atlas-build
Fix thekla_atlas build
2017-12-08 12:22:02 -03:00
Hein-Pieter van Braam
a974464629 Fix thekla_atlas build
clang doesn't like c++ versions being supplied to build c source files.
2017-12-08 16:18:36 +01:00
Juan Linietsky
372b79b0d3
Merge pull request #14409 from hpvb/import-thekla-atlas
Import thekla_atlas
2017-12-08 11:58:37 -03:00
Hein-Pieter van Braam
bf05309af7 Import thekla_atlas
As requested by reduz, an import of thekla_atlas into thirdparty/
2017-12-08 15:47:15 +01:00
Juan Linietsky
8c78ccb027 After a lot of trial and error, i think rim lighting implementation is now perfect, closes #13986 2017-12-08 11:09:03 -03:00
Rémi Verschelde
b3b4727dff
Merge pull request #14014 from kosz78/scroll-container-fix
Fix scroll enabled in case of content fit in scroll container
2017-12-08 08:28:29 +01:00
Rémi Verschelde
28b317966f
Merge pull request #14397 from YeldhamDev/localization_tab
Removed style override inside the Localization tab in the Project Settings
2017-12-08 08:26:32 +01:00
Rémi Verschelde
793a741f9c
Merge pull request #14396 from MattUV/fix-templates-link
Fix Manage Export Templates link
2017-12-08 08:02:19 +01:00
Rémi Verschelde
bb49357ed7
Merge pull request #13981 from Paulb23/line_highlight_and_code_folding_color
Changed current line draw order and added code folding colour
2017-12-08 07:56:49 +01:00
Chris Bradfield
d055031c73
Merge pull request #14395 from willnationsdev/docs2
[DOCS] CanvasItem(Material)/Layer, ClassDB, and CollisionObject(2D)
2017-12-07 20:16:15 -08:00
Chris Bradfield
6f764d3f0a
Merge pull request #14385 from NathanWarden/raycast_docs
[DOCS] Finished off the RayCast documentation.
2017-12-07 20:13:12 -08:00
Will Nations
a9c9499c73 [DOCS] CanvasItem/Material/Layer, ClassDB, CollisionObject(2D) 2017-12-07 22:12:01 -06:00
Nathan Warden
331427f55e Finished off the RayCast documentation. 2017-12-07 19:19:51 -05:00
Michael Alexsander Silva Dias
f482ed0853 Removed style override inside the Localization tab in the Project Settings. 2017-12-07 21:49:44 -02:00
MattUV
93231819c2 Fix Manage Export Templates link
In some cases, the link to download export templates was missing.
Fixes #14391
2017-12-08 00:46:03 +01:00
Juan Linietsky
dcab01618a Fixed is_playing funtion (was reporting wrong), closes #13928
Made error reporting to opcode_set in gdscript a bit clearer
2017-12-07 18:14:39 -03:00
Juan Linietsky
8717afbfe1 Added small bit of bias depending on lenght for contact shadows, fixes #12726 2017-12-07 16:19:35 -03:00
Paulb23
48ad133cf9 Changed current line draw order and added code folding color 2017-12-07 19:17:43 +00:00
Juan Linietsky
209cb3830c Exposed EditorSceneImporter to script. Added APIs to use intermediate converters more easily. 2017-12-07 15:44:20 -03:00
Juan Linietsky
6527f2e684 Implement orbit velocity in particles (this is for 2D only, like in 2.1), closes #12764
Fixed tangential velocity (was broken)
2017-12-07 13:18:22 -03:00
George Marques
cac5aa498f
Merge pull request #14348 from waldson/feature-set-main-screen-plugin-icon
Add method on EditorPlugin to set main screen plugins icons
2017-12-07 13:16:47 -02:00
Juan Linietsky
dd892a327d Added some clean up in camera/viewport management. Fixes #12279, Fixes #12774 2017-12-07 12:13:20 -03:00
Juan Linietsky
5614902611 ability to keep user tracks when importing animations, closes #12801 2017-12-07 10:19:35 -03:00
Rémi Verschelde
fbd270bfa8
Merge pull request #14356 from volzhs/ios-delegate-master
use application:didFinishLaunchingWithOptions: instead of application…
2017-12-07 09:33:34 +01:00
Rémi Verschelde
96dbf19093
Merge pull request #14332 from akien-mga/clang-format
Update style for clang-format 5.0.0, new min required version
2017-12-07 09:18:11 +01:00
Rémi Verschelde
5e19fac987
Merge pull request #14368 from sersoong/master-addoaandscript
Add uppercase and lowercase to rightclickmenu in scripteditor
2017-12-07 09:17:49 +01:00
sersoong
94adf24798 Add uppercase and lowercase to rightclickmenu in scripteditor 2017-12-07 16:09:02 +08:00
Rémi Verschelde
624a2b08f3 doc: Sync classref after a496dd4d, removing NOEDITOR properties from doc 2017-12-07 08:29:38 +01:00
Rémi Verschelde
7d440d04aa doc: Sync classref with current source 2017-12-07 08:23:08 +01:00
Rémi Verschelde
13c2ff9320 Style: Apply new clang-format 5.0 style to all files 2017-12-07 08:02:00 +01:00
Rémi Verschelde
a8ceb7e3f2 Style: Update definitions for clang-format 5.0.0
This will be the new standard from now on.
2017-12-07 08:02:00 +01:00
Rémi Verschelde
d5ca9e2f6f Style: Apply clang-format again on all files
Fixes issues introduced by newer clang-format versions or commits
pushed directly without using the clang-format pre-commit hook.
2017-12-07 08:02:00 +01:00
Rémi Verschelde
9ff17379c2
Merge pull request #14366 from willnationsdev/docs
[DOCS] ARVRController, ARVRPositionalTracker, AStar, AtlasTexture, Basis
2017-12-07 08:01:20 +01:00
Rémi Verschelde
8a07cb0b69
Merge pull request #14352 from ianb96/get_hidden_width
Fixes horizontal scrolling over hidden lines
2017-12-07 07:52:01 +01:00
Rémi Verschelde
23c5f8c137
Merge pull request #14362 from sersoong/master-addcopypath
Add 'copy script path' to script editor plugin
2017-12-07 07:42:48 +01:00
Rémi Verschelde
f13bea768d
Merge pull request #14353 from TheAspiringHacker/fix-lineedit-eat
Check for icon in LineEdit::set_cursor_position
2017-12-07 07:38:26 +01:00
Rémi Verschelde
3ce41b81e5
Merge pull request #14360 from mrcdk/fix_win_mingw
Fix windows compilation when using MinGW
2017-12-07 07:26:45 +01:00
Rémi Verschelde
f674a55f3a Travis: Install libxi-dev after #14347 2017-12-07 07:24:50 +01:00
Rémi Verschelde
46ac939a74
Merge pull request #13362 from groud/fix_folding
Fixes folding of blank lines
2017-12-07 07:20:41 +01:00
Will Nations
5b820bc247 [DOCS] ARVR, AStar, AtlasTexture, Basis 2017-12-07 00:16:27 -06:00
MrCdK
651677f033 Fix windows compilation when using MinGW 2017-12-07 04:59:11 +01:00
sersoong
f0fda9fd87 Add 'copy script path' to script editor plugin 2017-12-07 11:57:41 +08:00
volzhs
b87abeb9f9 use application:didFinishLaunchingWithOptions: instead of applicationDidFinishLaunching: for iOS 2017-12-07 10:09:05 +09:00
TheAspiringHacker
de03966a65 Check for icon in LineEdit::set_cursor_position
Fixes #14340
2017-12-06 19:13:34 -05:00
Ian
1c1a6723d0 fixes horizontal scrolling over hidden lines 2017-12-06 19:04:47 -05:00
Juan Linietsky
b38378dd6c Reduce some graphics memory usage by disabling unnecesary modes, closes #12831 2017-12-06 20:49:54 -03:00
Rémi Verschelde
42c01ba136
Merge pull request #14350 from willnationsdev/miscellaneous-docs
[DOCS] Camera2D, EditorScript, EditorFileSystemDirectory

[ci skip]
2017-12-07 00:34:39 +01:00
Rémi Verschelde
06d0166bda
Merge pull request #13827 from sersoong/master-addopenselection
Enhanced 'open' menu in filesystemdock
2017-12-07 00:30:31 +01:00