godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,481 Commits 15 Branches 59 Tags 2.2 GiB
d4359b2d09
Commit Graph

1422 Commits

Author SHA1 Message Date
Juan Linietsky
d02261fc84 Disable asset library compilation if no openssl exists 2016-06-09 21:20:49 -03:00
Bojidar Marinov
c63ec998be Update asset library assets only when opening the respective tab 2016-06-09 23:08:45 +03:00
volzhs
5534ba83dc update Korean translation 2016-06-10 03:47:18 +09:00
Rémi Verschelde
a3890594fa Merge pull request #5124 from Paulb23/editor_help_focus_issues 
Fixed editor help focus issues and input propagation
 2016-06-09 20:43:48 +02:00
Rémi Verschelde
1dadaa4db3 Merge pull request #5123 from zaps166/fix-editorassetlibrary-crash 
EditorAssetLibrary: Don't call add_child() on uninitialized pointer
 2016-06-09 20:43:37 +02:00
volzhs
990956c4e0 add line spacing option to script and shader editor (#5105) 2016-06-09 20:43:19 +02:00
Paulb23
eb14373d69 Fixed editor help focus issues and input propagation 2016-06-09 18:26:47 +01:00
Błażej Szczygieł
73b93c9110 EditorAssetLibrary: Don't call add_child() on uninitialized pointer 
Fixes possible crash and fixes crash when using undefined sanitizer.
The "search_hb" is already added into "library_main" container.
 2016-06-09 19:10:06 +02:00
Rémi Verschelde
26d18b74ac i18n: Sync and merge translations with source 2016-06-09 17:33:24 +02:00
Lisandro Lorea
9349e747f6 Add es.po 
Right now it's just a copy of es_AR to be used as a 
template for a more neutral version.
 2016-06-09 02:41:51 +02:00
Lisandro Lorea
be71cb425b Add es_AR.po. First complete draft. 2016-06-09 02:02:29 +02:00
Juan Linietsky
f8f30662d9 -Ability to reload (and soft reload) tool scripts. Please test! 2016-06-08 20:00:52 -03:00
Rémi Verschelde
1bdb55831d Assetlib: Update link for renamed repository 2016-06-08 23:48:26 +02:00
Juan Linietsky
c170589929 -properly use hidpi icons in hidpi, looks pretty! 2016-06-08 17:49:06 -03:00
Juan Linietsky
1f2ad872cc Fixed some options in assetlib 2016-06-08 10:17:16 -03:00
Juan Linietsky
b847aec864 Added asset library on project manager for templates 2016-06-08 09:25:47 -03:00
Juan Linietsky
47944098c2 Merge pull request #5007 from bojidar-bg/asset-store 
Update asset library editor plugin, adding a bit new functionality and fixes
 2016-06-08 07:58:06 -03:00
Juan Linietsky
32fa1e3ee6 Merge pull request #5088 from Paulb23/breakpoint_marker_scaling 
Improved breakpoint marker position, and scales with font size
 2016-06-08 07:55:29 -03:00
Juan Linietsky
1b3fd498a3 Merge pull request #5089 from Hinsbart/resdock_copy_path 
Add a "copy path" item to the filesystem dock context menu.
 2016-06-08 07:55:04 -03:00
Juan Linietsky
040c87ea7b Merge pull request #5093 from DimOkGamer/more_translatable_strings 
Fixed localization in file dialogs
 2016-06-08 07:54:05 -03:00
Juan Linietsky
732e5be3ff Merge pull request #5094 from pkowal1982/master 
Improved Blender/Collada shadeless->unshaded import
 2016-06-08 07:53:19 -03:00
Daniel J. Ramirez
1d6b0836d3 Regenerated icons with the new faster exporter, Added and fixed some icons 2016-06-08 01:32:09 -05:00
Juan Linietsky
d61b91cbe0 -Heavily improved editor startup and exit performance 2016-06-07 22:10:09 -03:00
Juan Linietsky
e6ac3a3f35 Revert "Fix ui layout for EditorFontImportDialog" 2016-06-07 19:01:32 -03:00
Rémi Verschelde
c2de978bac Merge pull request #5082 from Geequlim/EditorFontImportDialog-layout 
Fix ui layout for EditorFontImportDialog
 2016-06-07 23:44:01 +02:00
Pawel Kowal
101e0c9ec6 Improved Blender/Collada shadeless->unshaded import 2016-06-07 22:07:48 +02:00
DimOkGamer
ceae11ee29 Fixed localization in file dialogs 
and two more lines.
2 fixes in ru.po.
 2016-06-07 22:48:16 +03:00
Bojidar Marinov
e4a24812cd
Update asset library editor plugin - new functionality and fixes 2016-06-07 21:49:19 +03:00
Daniel J. Ramirez
a4fd9d1662 listener icons 2016-06-07 13:41:05 -05:00
Paulb23
d66b034bd1 Improved breakpoint marker position, and scales with font size 2016-06-07 16:59:16 +01:00
Rémi Verschelde
a21eb2b89d Merge pull request #5057 from pkowal1982/master 
Improved Blender/Collada -colonly import creating collision shapes fo…
 2016-06-07 13:22:00 +02:00
Geequlim
a1ba404cc5 Fix ui layout for EditorFontImportDialog 2016-06-07 16:13:53 +08:00
Juan Linietsky
06bc4e20d3 Merge pull request #4101 from SaracenOne/listener 
Added New Listener Spatial Node.
 2016-06-06 22:13:23 -03:00
Juan Linietsky
9a3ca0eaa2 Merge pull request #4824 from 29jm/pr-3481 
Ability to rename autoloads
 2016-06-06 20:46:10 -03:00
Juan Linietsky
be830d10c2 Merge pull request #5026 from Geequlim/patch9frame-extension 
Enhanced Patch9Frame
 2016-06-06 20:15:33 -03:00
Juan Linietsky
9df4c18853 Merge pull request #5056 from SaracenOne/bitmask_import_plugin 
Bitmask import plugin
 2016-06-06 20:07:30 -03:00
Daniel J. Ramirez
bf4d749f10 Fixed some icons given the feedback, also added some missing icons 2016-06-06 16:40:59 -05:00
Saracen
3a21f98131 Fixed bottom left and right icon order for anchor editor. 2016-06-06 19:38:49 +01:00
Andreas Haas
be867f3877 Add a "copy path" item to the filesystem dock context menu. 
Copies the path (in "res://" format) of the selected resource to the clipboard.
Useful for preloads/extends etc.
 2016-06-06 17:20:03 +02:00
Rémi Verschelde
955ed0a95f HiDPI: Use global/hidpi_mode as property 2016-06-06 07:38:39 +02:00
volzhs
5af475cd3e Better translation for Korean 2016-06-06 13:54:24 +09:00
Juan Linietsky
684a1207c0 make hdpi manually configurable in project settings 
also added hidpi support to project manager
 2016-06-05 18:43:56 -03:00
Pawel Kowal
494847f0d1 Improved Blender/Collada -colonly import creating collision shapes for empties 2016-06-05 20:59:21 +02:00
Saracen
1dab0aab7c Bitmask import plugin 2016-06-05 19:14:39 +01:00
Daniel J. Ramirez
7398d696d0 Added missing icons for some nodes, changed instance icons 2016-06-05 12:53:01 -05:00
Rémi Verschelde
673105feb9 Merge pull request #5038 from djrm/new_icons 
New icons
 2016-06-05 09:29:44 +02:00
Juan Linietsky
007efb6a20 -customizable shortcuts in editor 
-editor settings now save to .tres instead of .xml
-buttons can now hold a shortcut
 2016-06-04 21:31:47 -03:00
Daniel J. Ramirez
4389388d4e Added 2x PNG versions of the icons 2016-06-04 15:52:35 -05:00
Daniel J. Ramirez
50fd5edb9e Added basic script to convert source svgs to pngs 2016-06-04 14:42:43 -05:00
Daniel J. Ramirez
2ddaf41777 New icons, almost all the icons have an svg version, plus a more consistent look 2016-06-04 14:01:36 -05:00
Geequlim
5894060abb Enhanced StyleBoxTexture: 
Add texture region support for StyleBoxTexture.
  Quick region(texture region and scale region) selection for StyleBoxTexture with TextureRegionEditorPlugin.
 2016-06-05 00:45:53 +08:00
Geequlim
9546b2ffd4 Add plugin to pick texture region and patch margins for Patch9Frame 2016-06-05 00:45:53 +08:00
Juan Linietsky
3ae61f2292 Created a NodeDock with signals and groups 2016-06-04 13:19:08 -03:00
Rémi Verschelde
992a76b41a Merge pull request #5023 from volzhs/deselect-help 
deselect in help when click somewhere
 2016-06-04 15:58:07 +02:00
Warlaan
987192775a The create dialog starts collapsed now. 
The original behavior can be reactivated in the editor settings.
 2016-06-04 10:26:58 +02:00
Juan Linietsky
26332479d3 Signals became a tab 
added icons to contextual scene tree menu
 2016-06-03 21:03:22 -03:00
volzhs
bf22e69822 deselect in help when click somewhere 2016-06-04 03:11:34 +09:00
Błażej Szczygieł
bff77d731f SampleLibraryEditor: Initialize "is_playing" variable 
Fixes crash caused by jumping to wrong place due to uninitialized
variable.

Closes #4703

(cherry picked from commit 9acb666320)
 2016-06-03 20:07:46 +02:00
Juan Linietsky
2ca4995a6f Cleaned up remote menu 
-Merged fileserver & deploy dumb clients option
-Live Script Reloading can now happen automatically on script save
-Changed Live to Mirror term to differentiate from Unity and Unreal, as
what Godot does is not the same thing.
 2016-06-03 12:34:25 -03:00
Dmitriy Salnikov
b8d31c5eb5 more fixes in Russian localization (#5006) 2016-06-03 00:07:39 +02:00
Rémi Verschelde
fa4a82a867 Merge pull request #5001 from derderder77/master 
Add some french translation.
 2016-06-02 22:38:40 +02:00
derderder
6829b4b57b Improve french translation 2016-06-02 22:22:37 +02:00
Rémi Verschelde
b38ee6b1f9 Merge pull request #4989 from volzhs/fix-texture-atlas-error 
fix crash and error with texture atlas
 2016-06-02 22:07:05 +02:00
volzhs
d9eab56bf0 Add Korean translation 2016-06-03 04:55:31 +09:00
Warlaan
fe3a68c4c2 Added classes' short descriptions as tooltips in the create dialog. 2016-06-02 21:02:48 +02:00
volzhs
ee7d94bf11 fix invalid texture plugin name 
EditorTextureImportPlugin had ``texture_2d``, ``texture_3d``, ``texture_atlas`` and ``larget_texture``.
These are now just ``texture``.
 2016-06-02 22:13:55 +09:00
volzhs
fc73f0c8b0 fix crash and error with texture atlas 
- crashes at Project Export Settings > Preview Atlas
- error message when export project

```
ERROR: EditorImportExport::get_import_plugin_by_name: Condition ' !by_idx.has(p_string) ' is true. returned: Ref<EditorImportPlugin>()
   At: tools\editor\editor_import_export.cpp:1548
```

it is caused by 8be2fabbe5 (diff-67a74bd708380c6b3baa717bb178dd47R802)
 2016-06-02 22:03:58 +09:00
Rémi Verschelde
182ee80b7d Merge pull request #4926 from Paulb23/fullscreen_and_distraction_free_mode 
Added fullscreen and distraction free modes
 2016-06-02 08:38:53 +02:00
Juan Linietsky
9e745b920f Ability to reload scripts on running game 2016-06-01 20:31:42 -03:00
J08nY
4192d6d551
Sort l18n while building 2016-06-01 15:56:19 +02:00
DimOkGamer
4a1a6c0d06 1 changed string 2016-06-01 14:36:02 +03:00
DimOkGamer
f7d0110cdf Added 3 more translatable strings 
and fixed russian localization based on user feedback.

Added strings already contained in the current version of the
localization.
 2016-06-01 14:32:20 +03:00
hyperglow
ec3d23c323 i18n: Improve existing german translations. Merged two po files. 2016-06-01 12:13:29 +02:00
atze
195a76632a i18n: Improve existing german translations 2016-06-01 08:28:00 +02:00
Maxim Lebedev
8f6b5ffdc7 Morphological and stylistic corrections in ru.po 
I just corrected a small errors and has added missed signs.
 2016-06-01 04:47:55 +06:00
Andreas Hirschauer
da25b76aa1 i18n: Add more German translation 2016-05-31 19:27:49 +02:00
Rémi Verschelde
68e35b6beb Merge pull request #4956 from volzhs/fix-error-scene-update 
fix error when open scene or switch to another scene
 2016-05-31 19:00:45 +02:00
volzhs
e4f68d08eb fix error when open scene or switch to another scene 
## Error message on console ##
```
no access to ID:18723
ERROR: FileAccessWindows::_get_modified_time: Method/Function Failed, returning: 0
   At: drivers\windows\file_access_windows.cpp:251
```
 2016-06-01 01:48:49 +09:00
Rémi Verschelde
f4ee46124a i18n: Sort files to parse alphabetically 
This should ensure that python produces the same tools.pot for every user,
and thus that the .po will not get useless diffs upon merge.
 2016-05-31 18:24:41 +02:00
Geequlim
7e18de6b6a More translation for zh_CN 2016-06-01 00:17:35 +08:00
volzhs
c761333ce4 Supports to use non-latin characters in script editor 2016-05-31 15:06:40 +09:00
Rémi Verschelde
4f596e1924 Merge pull request #4946 from volzhs/issue-4927 
fix random inifinite loop when open editor
 2016-05-31 07:37:28 +02:00
Rémi Verschelde
dffbc19c8a Merge pull request #4942 from DimOkGamer/master 
Many improvements of Russian translation
 2016-05-31 07:36:02 +02:00
volzhs
8804b93953 fix random inifinite loop when open editor 2016-05-31 14:21:13 +09:00
DimOkGamer
fb2d52e116 Many improvements of Russian translation 2016-05-31 03:39:10 +03:00
Juan Linietsky
4d6d6fcbfc Merge remote-tracking branch 'origin/master' 2016-05-30 19:53:19 -03:00
Juan Linietsky
0eb6c644b2 changed font system to use fallbacks 
this way more than 64k characters can be used
 2016-05-30 19:41:32 -03:00
Rémi Verschelde
97b116dfc6 Merge pull request #4897 from djrm/svg_icons 
Added first batch of svg icons
 2016-05-30 23:27:37 +02:00
Rémi Verschelde
0a21750737 Merge pull request #4934 from paviro/master 
Added partial German translation.
 2016-05-30 23:26:28 +02:00
Paul-Vincent Roll
d1f5c3a5bf
Added partial German translation. 2016-05-30 23:15:17 +02:00
Rémi Verschelde
ec9637613f Merge pull request #4932 from vnen/pr-ptbr-translation 
Add pt_BR editor translation file
 2016-05-30 22:40:33 +02:00
Rémi Verschelde
78b4dcf84d Merge pull request #4920 from neikeq/pr-search-bar-fix 
Fixed and improved search bar
 2016-05-30 22:33:01 +02:00
Rémi Verschelde
6cd39ed956 i18n: Sync template and PO files with source 2016-05-30 21:56:08 +02:00
DimOkGamer
0fc4f1bcf4 Added more translatable strings in code. Updated template tools.pot. 
also improved Russian localization.
 2016-05-30 21:47:53 +03:00
George Marques
67d44e18f5
Add pt_BR editor translation file 2016-05-30 15:43:07 -03:00
Paulb23
771b225718 Added fullscreen and distraction free modes 2016-05-30 19:29:43 +01:00
Rémi Verschelde
405094c167 i18n: Enable parsing RTR strings 
TTR is used in the editor, and RTR is for content that it shared between
the editor and games (e.g. in scenes/gui)
 2016-05-30 19:30:39 +02:00
Rémi Verschelde
d0292a68cf i18n: Sync PO files with template 2016-05-30 19:29:03 +02:00
Ignacio Etcheverry
7e4c58c563 Fixed and improved search bar 
- Search no longer selects the results
- Return focus to the text editor when hiding the bar
- Fix connecting to invalid signal
- Update/redraw the text editor after searching
 2016-05-30 18:15:41 +02:00
Rémi Verschelde
f232782966 Merge pull request #4910 from ZX-WT/master 
Incomplete Traditional Chinese translation(zh_HK)
 2016-05-30 16:35:58 +02:00
Bonfi96
9845b08f81 Added Italian Localization (#4908) 
Full Italian localization of the Godot interface
 2016-05-30 15:30:33 +02:00
ZX-WT
889d141ba9 Incomplete Traditional Chinese translation(zh_HK) 
probably can be used as zh_TW translation
 2016-05-30 21:17:02 +08:00
Rémi Verschelde
8a70c6eaf1 i18n: Sync Russian translation with template 2016-05-30 09:02:44 +02:00
Rémi Verschelde
77d998934c i18n: Convert Russian PO to Unix format 2016-05-30 09:01:44 +02:00
Rémi Verschelde
a35ee35785 Merge pull request #4899 from DimOkGamer/master 
Added Russian Localization
 2016-05-30 08:30:33 +02:00
Daniel J. Ramirez
72c0d6d706 Second batch of icons 2016-05-29 23:43:49 -05:00
Juan Linietsky
cf3575e0b4 Merge branch 'master' of https://github.com/godotengine/godot 2016-05-30 00:29:36 -03:00
Juan Linietsky
9b1f8230ec -Some fixes to OSX retina scaling for window functions 
-Implemented HiDPI detection and support for Godot Editor!
 2016-05-30 00:28:29 -03:00
Daniel J. Ramirez
7dd0b5857a Added first batch of svg icons 2016-05-29 21:30:37 -05:00
DimOkGamer
db4948030e Added Russian Localization 2016-05-30 02:01:24 +03:00
Rémi Verschelde
e6e878e139 Icon: Remove more grey capsules behind official logo 2016-05-30 00:41:42 +02:00
Rémi Verschelde
e0e52055bc i18n: Fix parsing bug while adding locations to the template 
Also sync the template and PO files to reflect this change
+ the recent TTR additions/removals.
 2016-05-30 00:21:36 +02:00
George Marques
e623a50be6
Remove translatable strings in comments 2016-05-29 18:37:49 -03:00
Rémi Verschelde
c2b1315689 Merge pull request #4847 from Hinsbart/fix_icon_scale_new 
Proper alignment and fixed scaling for TileMapEditor tile icons.
 2016-05-29 18:39:05 +02:00
Rémi Verschelde
a2fee79459 Merge pull request #4843 from Paulb23/breakpoints_next_prev_and_remove_issue_1690 
Added, goto next and previous breakpoint and remove all, issue 1690
 2016-05-29 18:35:07 +02:00
Rémi Verschelde
d3b46b6bf2 Merge pull request #4822 from Paulb23/breakpoint_marker_issue_4750 
Added breakpoint markers, issue 4750
 2016-05-29 18:34:13 +02:00
Rémi Verschelde
5bbb67fcac Merge pull request #4814 from neikeq/pr-issue-4805 
Debugger: show error message if description is not available
 2016-05-29 18:32:35 +02:00
Rémi Verschelde
6a7530c718 Merge pull request #4812 from neikeq/pr-search-bar 
ScriptEditor/ShaderEditor: Replace find/replace dialog with a bar
 2016-05-29 18:32:06 +02:00
Geequlim
0a046e6232 Simplified Chinese Translation: 
Fix issuse in last commit
Add more translation
 2016-05-30 00:08:33 +08:00
Geequlim
f9253fa47a Add Simplified Chinese translation 2016-05-30 00:08:33 +08:00
Juan Linietsky
3e8eb396d7 Finalized DynamicFont implementation 
-DynamicFont uses Freetype by default
-Editor fonts are now scalable thanks to this
-Cleaned up documentation browser and added fonts for this
 2016-05-29 11:37:52 -03:00
Ignacio Etcheverry
51be9beec9 ScriptEditor/ShaderEditor: Replace find/replace dialog with a bar 2016-05-29 14:26:19 +02:00
Geequlim
cb05e8450d Set more visible string to translatable 2016-05-29 16:10:23 +08:00
Andreas Haas
62de01ae3b Delete unused code in TileMapEditor 2016-05-28 21:50:22 +02:00
Rémi Verschelde
6fefcfd46a Editor: Fix base dir when going back to project manager 
This caused the PM to load with the parameters of the previously loaded project.
Was a regression from ea751724a2. Closes #4045.
 2016-05-28 14:59:00 +02:00
Rémi Verschelde
b2013603b4 i18n: Sync translations with template 2016-05-28 13:01:13 +02:00
Rémi Verschelde
71f18fdaae i18n: Add makefile to handle translation updates 2016-05-28 13:00:57 +02:00
Rémi Verschelde
d708afdc1c i18n: Fix typo and sync template 2016-05-28 12:46:17 +02:00
Mariano Javier Suligoy
b6fdac80cb Merge pull request #4852 from MarianoGnu/master 
Remove focus from Sprite Region Editor dialog. Fixes #4751
 2016-05-28 04:40:27 +02:00
MarianoGNU
e7b7dfefd3 Remove focus from Sprite Region Editor dialog. Fixes #4751 2016-05-27 22:53:26 -03:00
Juan Linietsky
bccdc11dde Added translation support to Godot 
included is a French translation!
 2016-05-27 19:58:28 -03:00
Bojidar Marinov
ab97718d8a Reorder tiles into nice columns 2016-05-27 22:42:51 +03:00
Juan Linietsky
8be2fabbe5 Changed import workflow 
-Rearrange favorites in fs dock with drag and drop
-Removed import -> sub-scene, moved to scenetree contextual menu
-Removed import -> re-import , moved and integrated to FS dock
-Added ability in FS dock to re-import more than one resource
simultaneously
-Added ability to drag from native filesystem explorer to Godot, only
works on Windows though
-Removed scene reimport merge options, never worked well. Eventually
merging materials should be re-added
-Added ability to set custom root node type when importing scenes
-Re-Import is now automatic, can be configured back to manual in editor
settings
-Added resource previews in property list for many resource types
 2016-05-27 14:19:11 -03:00
Andreas Haas
7c1594ee5a Use scalar to scale TileMap icons 2016-05-27 18:54:46 +02:00
Johan Manuel
4b80b6b0e3 Ability to rename autoloads 
The commit makes the 'Name' field of autoloads editable, with support
for undo/redo. Name clashes/invalid characters are handled. Fixes #3481.
 2016-05-27 18:17:57 +02:00
Paulb23
daf0ed646f Added, goto next and previous breakpoint and remove all, issue 1690 2016-05-27 15:29:04 +01:00
Paulb23
72fda444d1 Added breakpoint markers, issue 4750 2016-05-26 14:17:14 +01:00
Ignacio Etcheverry
ea9cde8842 Debugger: show error message if description is not available 2016-05-25 22:57:41 +02:00
Paulb23
27dbbd68d5 Added settings to change marked and breakpoint color 2016-05-25 16:57:33 +01:00
Rémi Verschelde
a16eb3726c Merge pull request #4806 from Hinsbart/sregion_tooltip 
Set tooltip for SpriteRegionEditor
 2016-05-25 13:52:15 +02:00
Andreas Haas
abbdfb5739 Set tooltip for SpriteRegionEditor 2016-05-25 13:42:11 +02:00
Rémi Verschelde
12a6153ab4 Merge pull request #4800 from Hinsbart/tilemap_zoom 
Add a slider for zooming TileMap preview icons.
 2016-05-24 23:06:00 +02:00
Rémi Verschelde
a629e83b15 Merge pull request #4784 from neikeq/pr-missing-4296 
Save line number color with text editor theme
 2016-05-24 22:45:00 +02:00
Andreas Haas
11f728fc98 Add a slider for zooming TileMap preview icons. 
Fixes #2413
 2016-05-24 20:36:53 +02:00
Juan Linietsky
e843e74d39 General docks clean up 
-Moved path box above in fs dock
-Remove up/down button and added reordering with DND of favorites
-Changed zoom icon to be centered vertically
-Made filter for files always visible
-Added some options to TextureFrame for better alignment/stretching
 2016-05-23 23:24:32 -03:00
volzhs
472ab44768 D&D: Fix wrong path in ScenesDock (#4789) 
Fixes #4786
 2016-05-23 23:14:47 +02:00
Juan Linietsky
d3495b128a -Improve resource previews 
-Also fixed draw_texture_rect() tile parameter
 2016-05-23 17:11:49 -03:00
Ignacio Etcheverry
bb61ef9d9a Save line number color with text editor theme 2016-05-23 17:23:05 +02:00
Rémi Verschelde
b777b32470 Merge pull request #4296 from Paulb23/code_editor_themes 
Added color themes to the text editor
 2016-05-23 17:08:06 +02:00
Paulb23
d7073a77e1 Added color themes to the text editor 2016-05-23 15:15:55 +01:00