Commit Graph

844 Commits

Author SHA1 Message Date
Juan Linietsky 3337191d5a Merge pull request #2709 from eska014/fix-default-menubutton-styleboxes
Fix default StyleBoxes of MenuButton
2015-11-18 19:43:02 -03:00
Juan Linietsky f0aeb036d1 Merge pull request #2715 from SaracenOne/shader_fix_and_enhancement
Write to 4-dimensional position access and shader graph code generation fix.
2015-11-18 19:36:47 -03:00
Juan Linietsky 734e3751c6 Merge pull request #2720 from SaracenOne/bone_attachment_fix
BoneAttachment fix.
2015-11-18 19:33:28 -03:00
Juan Linietsky 6de941f21c Merge pull request #2721 from SaracenOne/animation_tree_player_manual_control
Experimental retooling of AnimationTreePlayer to allow manual advancement
2015-11-18 19:32:37 -03:00
Juan Linietsky 75922c57d6 Merge pull request #2635 from StraToN/tabs-buttons
Fixed bug : both tab buttons appearing hovered
2015-11-18 19:15:13 -03:00
Juan Linietsky 326781f4c9 Merge pull request #2636 from TheHX/fixed_material
Bind missing FixedMaterial constants, fixes #2628
2015-11-18 19:14:48 -03:00
Juan Linietsky 762a76630c Merge pull request #2638 from MarianoGnu/master
add missing default value
2015-11-18 19:14:37 -03:00
Juan Linietsky a8f18e1bae Merge pull request #2639 from MarianoGnu/origin
Fix ButtonGroup broken layout
2015-11-18 19:14:25 -03:00
Juan Linietsky d38fd747ab Merge pull request #2672 from Brickcaster/patch-1
Fix for world_to_map() with negative coords.  Fixes issue #2665
2015-11-18 19:07:53 -03:00
Juan Linietsky c0170d3891 Merge pull request #2695 from eska014/add-default-angular-damp
Set World2D default angular damp per global `physics_2d/default_angular_damp`
2015-11-18 19:01:49 -03:00
Juan Linietsky b0d3c27d31 Merge pull request #2725 from SaracenOne/line_edit_alignment
nice!
2015-11-18 19:01:04 -03:00
Juan Linietsky 8bbde9e6cc Merge pull request #2730 from TheHX/fix_exp_property
Fix Range exp_edit property
2015-11-18 19:00:19 -03:00
Juan Linietsky ee944e0da2 Merge pull request #2734 from neikeq/popupmenu_imp
Small PopupMenu behaviour changes
2015-11-18 18:59:56 -03:00
Juan Linietsky b4f88eb4b6 Merge pull request #2735 from TheHX/fix_tree_checkbox
Fix Tree checkbox check/uncheck behavior
2015-11-18 18:59:02 -03:00
Juan Linietsky ef6fab88be Merge pull request #2747 from MarianoGnu/line_edit
Add <Select All>(Ctrl+A) shortcut to LineEdit. Fixes #1094
2015-11-18 18:55:59 -03:00
Juan Linietsky e84fa04141 Merge pull request #2764 from guilhermefelipecgs/fix_camera2d_set_zoom
Fix for smoothing camera2D when you change zoom.
2015-11-18 18:44:50 -03:00
Juan Linietsky f2b43e3ec0 Merge pull request #2769 from TheHX/text_edit_improvements
Implement Ctrl + backspace/delete to delete words
2015-11-18 18:42:37 -03:00
Juan Linietsky 0bbe1e1657 Merge pull request #2779 from bojidar-bg/patch-5
Change popup_menu.cpp to deselect on .clear
2015-11-18 18:36:39 -03:00
Ovnuniarchos 0b05739a8b *Polygon2D now updates on any modification in its point array. ShapeLine2D has now an editor. 2015-11-18 19:20:50 +01:00
Juan Linietsky b08312b30c -Fixed default theme a little
-Added option to group help pages, fixes #2805
2015-11-18 09:20:46 -03:00
Juan Linietsky 18e014a193 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	drivers/theora/video_stream_theora.cpp
2015-11-18 04:49:28 -03:00
Juan Linietsky 3974fbb852 -fixed tabs 2015-11-18 04:47:41 -03:00
Juan Linietsky 081a236c67 -Merged Script and Help tabs
-Help tabs can be opened many at the same time
-Color temperatures for opened scripts
-Dominant script opening when switching scene tab
2015-11-17 09:46:08 -03:00
Ariel Manzur 8adc4ef65b windows crash and bind placeholder method 2015-11-14 11:14:17 -03:00
Juan Linietsky 8420c24f7f -better integration of ndee's theme 2015-11-13 20:56:44 -03:00
neikeq ae65dfa4ec Small PopupMenu changes 2015-11-13 22:03:17 +01:00
Bojidar Marinov bff8b04f52 Change popup_menu.cpp as proposed in #2011
Closes #2011
2015-11-13 12:16:55 +02:00
Franklin Sobrinho 222d112f49 Implement Ctrl + backspace/delete to delete words 2015-11-12 13:35:48 -03:00
Juan Linietsky 1d7e9c4ba5 -fixes to animatedsprite used with atlas 2015-11-11 17:39:06 -03:00
Saracen c1d19ad258 New shader feature: change the colour of shadows on a per-material basis.
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
2015-11-08 03:54:55 +00:00
neikeq b70e2b754d TextEdit: Properly scroll vertically when selecting text with mouse drag 2015-11-07 16:04:32 +01:00
MarianoGNU 7828986b1c Add <Select All>(Ctrl+A) shortcut to LineEdit. 2015-11-06 19:02:57 -03:00
Franklin Sobrinho 8d48cf95b9 Add Tree checkbox check/uncheck behavior when pressing enter 2015-11-05 12:20:45 -03:00
Franklin Sobrinho 467ee040c4 Fix Range exp_edit property 2015-11-04 15:38:02 -03:00
Juan Linietsky dde6396f22 more fixes 2015-11-04 09:54:23 -03:00
Saracen e3c50ac63d Aligned line edit fix. 2015-11-02 17:37:49 +00:00
Saracen 0006f035eb Added alignment to LineEdit GUI control. 2015-11-02 17:37:47 +00:00
Saracen e011bcf162 Experimental retooling of AnimationTreePlayer to allow manual advancement. 2015-11-02 17:06:28 +00:00
Saracen 957baf48dc BoneAttachment fix. 2015-11-02 16:58:24 +00:00
Saracen b54d96ceba Added ability to write directly to 4-dimensional position vector from within custom vertex shader code. Bugfixes to shader graph code generation concerning xforms. 2015-11-02 16:03:31 +00:00
Rémi Verschelde 399b1b0474 Cosmetic fixes to SCons buildsystem
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
eska 825bc8b293 Add default focus StyleBox to MenuButton 2015-11-01 10:33:28 +01:00
Juan Linietsky 281d6fac1e -some fixes to audio 2015-11-01 01:55:22 -03:00
eska 06e0eba402 Set World2D default angular damp per global `physics_2d/default_angular_damp` 2015-10-28 18:21:45 +01:00
Juan Linietsky 8f84f4117c -Fixed a bug in scrollcontainer not respecting expand flag
If you relied on this, make sure the children of your scrollcontainer
is set to expand with the expand flag in either vertical or horizontal axis
2015-10-25 20:08:18 -03:00
Brickcaster 4e0511a8a0 Fix for negative coords. Regarding issue #2665
int() of negative numbers rounds up. Needed to add a condition to account for negative values. Thanks to Romulox_x for providing this solution.
2015-10-24 21:47:48 -04:00
MarianoGNU 754908844a Merge branch 'master' of https://github.com/okamstudio/godot into posta 2015-10-24 11:55:00 -03:00
Juan Linietsky b59c86f6f9 -Ability to debug video memory usage
-Small fix to xml saver (swapping > and <)
2015-10-21 09:50:44 -03:00
Juan Linietsky f6a790d58c Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-20 23:55:08 -03:00
Juan Linietsky d241b2ec1b -work in progress implementation of NDEE's theme It's NOT DONE YET 2015-10-20 23:54:24 -03:00
Juan Linietsky 2b12a8109d Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-19 18:48:34 -03:00
Juan Linietsky 5d86a25f4d -some fixes to where screen is read from rasterizer
-fixed bug in ogg vorbis looping
-properly flushing audiostream rb when stopping
2015-10-19 18:47:49 -03:00
MarianoGNU 6df7d92379 Fix ButtonGroup broken layout 2015-10-19 17:46:13 -03:00
MarianoGNU bf4bb3e17b Clamp filling angle instead of normalize 2015-10-19 15:26:00 -03:00
MarianoGNU 4345009a0e add missing default value 2015-10-19 12:21:19 -03:00
Franklin Sobrinho 1e36f36357 Bind missing FixedMaterial constants, fixes #2628 2015-10-19 08:03:29 -03:00
Julian Murgia - StraToN f256e421b5 Fixed minor bug : quicklty pointing alternatively Script button and Close button on a tab showed both buttons as hovered 2015-10-19 12:26:19 +02:00
MarianoGNU ede0cf20bb Add fill_degrees to limitate radial filling 2015-10-18 01:21:53 -03:00
MarianoGNU 4452e26253 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 23:38:33 -03:00
MarianoGNU 68fb30aaea Add fill modes. Clockwise, Counter-CW and center-offset 2015-10-17 23:37:39 -03:00
Juan Linietsky 7d8f187c33 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 15:49:27 -03:00
Juan Linietsky 85a611d1cd -fixes disability to remove instanced nodes when reopening scene. Fixes #2610 2015-10-17 15:48:42 -03:00
Juan Linietsky 1db523d0bb Merge pull request #2274 from MarianoGnu/master
Improve Visual Shader Editor responsiveness
2015-10-17 15:31:23 -03:00
MarianoGNU 25324aa506 Fix crash when using a Scalar Uniform node to GraphShader 2015-10-17 15:27:36 -03:00
Juan Linietsky 6f9631fc51 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 12:48:47 -03:00
Juan Linietsky be0f7563fb Merge pull request #1899 from guilhermefelipecgs/fix_#1897
Fix for scroll_to_line and search functions, fix #1897
2015-10-17 12:14:07 -03:00
Juan Linietsky 88b6e04cc1 Merge pull request #2330 from FEDE0D/parallax_fix
ParallaxBackground: added option to ignore camera zoom
2015-10-17 12:05:27 -03:00
Juan Linietsky c22b627ee3 Merge pull request #2362 from AlexHolly/update-scene-tab-fix
[UI-FIX] - Update scene tabs on save
2015-10-17 10:51:45 -03:00
Juan Linietsky c9ff40e140 Merge pull request #2380 from StraToN/tabs-buttons
Tab close button + display policies + application on Scenes Tabs
2015-10-17 10:46:32 -03:00
Juan Linietsky 63033aa646 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 10:30:08 -03:00
Juan Linietsky ab22203791 misc cleanup 2015-10-17 10:29:54 -03:00
Juan Linietsky 0d2b28377f Merge pull request #2455 from firefly2442/hide-menu-fix
[UI fix] Hide opened menu when click on menu button
2015-10-17 10:28:20 -03:00
Juan Linietsky 7060eaaa1b Merge pull request #2481 from firefly2442/cppcheck-arrayindexthencheck
ran cppcheck, fixed cases where array index is used before limits check
2015-10-17 10:23:15 -03:00
Juan Linietsky f11fdb611e Merge pull request #2556 from volzhs/fix_miss_bind_findnode
fix miss bind for Node::find_node
2015-10-17 10:02:43 -03:00
Juan Linietsky b3d34bcef4 Merge pull request #2589 from eska014/add-raycast2d-type_mask
Add type mask customization to RayCast2D
2015-10-17 09:45:52 -03:00
Juan Linietsky 426909e26b Merge pull request #2594 from Biliogadafr/PinSoftness
Expose softness parameter of pin joint to the editor.
2015-10-17 09:45:16 -03:00
MarianoGNU a5ebb52500 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
2015-10-16 23:21:39 -03:00
reduz 17a90ddc08 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	scene/resources/packed_scene.h
2015-10-16 19:13:09 -03:00
reduz 078a474135 -fixes and more fixes to new scene system, seems stable now..
BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
2015-10-16 19:11:23 -03:00
Juan Linietsky 79e5ced7e6 -A little More control about pixel snapping in 2D 2015-10-13 15:53:34 -03:00
Juan Linietsky b3cda43a0f Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	platform/windows/detect.py
2015-10-13 01:19:32 -03:00
Juan Linietsky 52e756752e ability to change audio track in theora video 2015-10-13 01:17:54 -03:00
firefly2442 692216b86a ran cppcheck, fixed cases where array index is used before limits check 2015-10-12 09:45:44 -05:00
Biliogadafr 2ffc90d8b4 Expose softness parameter of pin joint to the editor. 2015-10-10 23:28:05 +03:00
reduz 6b20ee4324 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-10 09:09:59 -03:00
reduz 422929e87f Large improvements on scene packing and management
-Ability to edit and keep changes of instanced scenes and sub-scenes
-Ability to inherit from other scenes
2015-10-10 09:09:09 -03:00
eska 793c53122a Add type mask property to RayCast2D 2015-10-10 05:46:47 +02:00
Ariel Manzur c2532bffb3 Please enter the commit message for your changes. Lines starting
removed locks
2015-10-08 12:59:12 -03:00
volzhs 1630f0ad35 fix miss bind for Node::find_node 2015-09-30 21:55:31 +09:00
Juan Linietsky 8154dff3d0 Merge pull request #2528 from MarianoGnu/sprite-edit
SpriteRegionEditor
2015-09-28 09:32:42 -03:00
MarianoGNU 3e6aaec193 Add SpriteRegionEditor and update Polygon2DUVEditor
Both with snap and grid support
2015-09-28 00:06:06 -03:00
Rémi Verschelde 2caf1548a5 Fix return type of get_reverb_room 2015-09-26 23:58:11 +02:00
Rémi Verschelde 3d7740ba17 Fix default/filter/* parsing in _get
Closes #2542. The actual flaw was identified by @reduz.
Also fix a typo.
2015-09-26 21:06:12 +02:00
Rémi Verschelde 1e147c4945 Fix some copy-paste mistakes in linear/db volume functions 2015-09-26 21:06:12 +02:00
Rémi Verschelde 3bf24eeb6b Rename _voice_count to _polyphony in SamplePlayer to be consistent with SamplePlayer2D 2015-09-26 21:06:12 +02:00
Juan Linietsky c858515785 Fixed theora playback. Removed theoraplayer.
Still need to get proper audio output latency in some platforms.
2015-09-26 14:50:42 -03:00
Juan Linietsky d5579b1506 Merge pull request #2458 from TheHX/text_edit_hscroll
Fix HScrollBar of TextEdit
2015-09-26 08:49:47 -03:00
Juan Linietsky 10e7871091 Merge pull request #2533 from eska014/fix-visibility-notification-propagation
Fix propagation of `NOTIFICATION_VISIBILITY_CHANGED`
2015-09-26 00:59:19 -03:00
Juan Linietsky 6f0df4e80c Merge pull request #2534 from eska014/unpress-hidden-buttons
Fix BaseButtons remaining pressed when hiding while pressed down
2015-09-26 00:53:38 -03:00
eska ce2faae2c5 Fix BaseButtons remaining pressed when hiding them while pressing them down 2015-09-26 03:06:42 +02:00
eska b9bb2ab9c0 Fix propagation of NOTIFICATION_VISIBILITY_CHANGED 2015-09-26 02:23:19 +02:00
Rémi Verschelde 4abc7f5740 Update documentation for TileSet and Timer 2015-09-25 20:45:00 +02:00
Juan Linietsky 52eebdc001 Merge pull request #2449 from leezh/label-valign-fix
reworked Label class
2015-09-25 11:29:49 -03:00
Juan Linietsky 447c319f2c Merge pull request #2502 from vnen/fix-itemlist-typo
Fix ItemList typo in binding
2015-09-25 11:27:50 -03:00
Juan Linietsky 9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
Juan Linietsky 82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
Zher Huei Lee c38808b5b1 added alignment to BoxContainer
Allows aligning contents of VBoxContainer and HBoxcontainer without
having to insert expanding spacers.
2015-09-24 14:07:53 +01:00
George Marques 5ff0b69dae
Move the shape test to a little sooner 2015-09-22 21:30:37 -03:00
George Marques e68f04b9d0 Check if shape is valid before referencing it
See the comment from @MartiniMoe at #2366.
2015-09-22 20:27:48 -03:00
eska ab3b0c82c8 Add missing `return` so Visual Studio compiles 2015-09-22 05:59:10 +02:00
George Marques e6e9e83c2e
Fix typo in ItemList bindings 2015-09-21 14:08:10 -03:00
Juan Linietsky 8f07f24318 remove required argument from streamplayer (was a bug), make it default as 0, closes #2492 2015-09-21 03:47:56 -03:00
Juan Linietsky 205634791c fixed stupid bug caused by accidentally removed line before commit 2015-09-20 17:29:36 -03:00
Juan Linietsky 83d9a692be Ability to visually debug geometry visually:
-Visible 2D and 3D Shapes, Polygons, Tile collisions, etc.
-Visible Navmesh and Navpoly
-Visible collision contacts for 2D and 3D as a red point
-Customizable colors in project settings
2015-09-20 13:03:46 -03:00
Juan Linietsky 3f9e5afe68 begin work on debugging collisions.... 2015-09-18 23:10:58 -03:00
reduz 2580ca01e6 Ability to keep collisionshapes and collisionpolygons when running the game.
Works for 2D and 3D
These are still just helpers in case you want to animate them or access them
directly.
Modifying the real shapes is still done via CollisionObject and CollisionObject2D APIs
But an API was added so you can query which shapes from CollisionObject correspond to which CollisionShape.

Have Fun!
2015-09-15 22:07:03 -03:00
Juan Linietsky 3013a83f2f Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 00:12:05 -03:00
Juan Linietsky 0fb7b5aa0c HTML5 exporter Improvements
-Better template handling
-Voice support
-Stream support
2015-09-10 00:10:54 -03:00
Juan Linietsky 9741374617 Rewrite of the AudioStream API
-Fixes long-standing issues regarding to playing a single stream multiple times simultanteously
-Fixes wrong-looping, starting, caching, etc. Issues resulting from bad original design
-Allows more interesting kinds of streams (stream graphs with streams inside streams!) in the future
2015-09-09 18:50:52 -03:00
Franklin Sobrinho 26a715298e Fix HScrollBar of TextEdit, closes #2355 2015-09-09 13:44:31 -03:00
firefly2442 930cb97c7d hide opened menu when click on menu button 2015-09-08 22:48:22 -05:00
Zher Huei Lee 564f3e0302 fix minsize-related issues with Label
- fixed end of string adding to Label minsize
 - exposed set_clip_text() and is_clipping_text() to the script side
 - text would now never stick outside its boundaries
 - label min-height is now restricted by max_lines_visible
2015-09-08 10:17:28 +01:00
Zher Huei Lee a0ba134643 added get_visible_characters() to Label 2015-09-07 22:56:16 +01:00
Zher Huei Lee 7c5cd0c296 reworked Label class
- no longer inherits Range - instead, more sensible
   function names controlling lines visible
 - more accurate vertical alignment
 - percent_visible preserved even after setting new text
2015-09-07 19:56:17 +01:00
Guilherme Felipe da895e8542 Fix for smoothing camera2D when you change zoom, fix #2074. 2015-09-03 19:23:39 -03:00
Juan Linietsky 688047a4c9 -removed resources dock, good bye old friend 2015-09-01 00:49:47 -03:00
Mariano Javier Suligoy 553edf1f25 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	scene/gui/spin_box.cpp
#	scene/gui/tree.cpp
2015-08-30 19:39:36 -03:00
Mariano Javier Suligoy 680402cebf Add missing icons, also make MSVC2010 happy 2015-08-30 19:37:23 -03:00
Juan Linietsky 2d8866574d Added gravity scale, and linear/angular damp override to 3D physics. 2015-08-30 18:57:17 -03:00
Juan Linietsky 947b283248 -fix compile issue (pow)
-ask user for track to call nodes when adding call track
2015-08-30 10:10:51 -03:00
Mariano Javier Suligoy c688b55019 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h
2015-08-30 02:48:45 -03:00
Mariano Javier Suligoy a19a653e2c Compile shaders using default values. 2015-08-30 02:44:49 -03:00
Juan Linietsky 7bc9846f16 -multi-selection (shift-click) working in scene tree 2015-08-29 23:46:32 -03:00
Mariano Javier Suligoy ea448cb779 Edit default values. WARNING!!!
Do not merge these changes, default values are not compiled into shaders yet!
2015-08-29 21:09:11 -03:00
Juan Linietsky b4acd18f32 -display/emulate_touchscreen now really emulates a touchscreen
-icons to show node menus
2015-08-29 17:16:11 -03:00
Juan Linietsky 1fecba6b5b -added hints to sprite v/hframes, fixes truncation problem
-removed an error being printed often unnecesarly about missing child
2015-08-29 13:02:56 -03:00
Juan Linietsky 3a59747c62 -fixes to capture mode
-ability to drag spinboxes and tree ranges to change values, like in Unity or Unreal
2015-08-29 01:43:21 -03:00
Mariano Javier Suligoy 54291c655d Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-24 21:33:00 -03:00
Juan Linietsky f6e17e37e8 Added new NinePatch control (could be done before with Panel and Stylebox but this is easier)
Will you be brave enough to try it? :)
2015-08-24 09:39:16 -03:00
Juan Linietsky 4b40f9228b Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-23 20:22:08 -03:00
Juan Linietsky 07e9741425 **WARNING BEFORE PULLING**
This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools.
If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :)

Summary of Changes

-New Filesystem dock, with filesystem & tree view modes.
-New refactoring tools, to change or fix dependencies.
-Quick search dialog, to quickly search any file
2015-08-23 20:15:56 -03:00
Julian Murgia - StraToN 17fbd20673 Added close button to tab. Added 4 display policies for this close button (show always, show never, show active tab only, show hover). Set the scene tabs in editor to follow the hover policy. 2015-08-18 20:27:01 +02:00
neikeq 51fa997cb5 textedit selection improvements
allows using shift and pointer selection together, and selecting text while scrolling.
tried to make it as similar as possible to most editors.
2015-08-13 00:34:07 +02:00
Alexander Holland cff2509ecd close all parent PopupMenus fix 2015-08-12 22:24:21 +02:00
Mariano Javier Suligoy 3a83337420 Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-09 16:33:02 -03:00
Juan Linietsky c2e2f2e0ae Merge pull request #2282 from Ovnuniarchos/master
Bitmask editor and some CanvasItem documentation.
2015-08-08 11:18:08 -03:00
Federico Pacheco 7a516d13e2 ParallaxBackground: added option to ignore camera zoom 2015-08-04 01:44:38 -03:00
Mariano Javier Suligoy c88038228a Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-03 17:28:33 -03:00
Juan Linietsky cbee679bd7 live debug fixes
removing node in live debugging fixed
2015-08-02 20:28:10 -03:00
Juan Linietsky 59961c9914 Live edit WORK IN PROGRESS
1) press the heart while the game is running
2) select a scene to live edit from the opened scenes
3) edit/add/remove nodes or resources, change their properties, etc.
4) watch changes reflected in running game, in all places this scene is
edited
5) It's not perfect obviously, but the aim of it is to try to reflect
your changes as best as possible in the running game.
2015-08-02 12:30:01 -03:00
Mariano Javier Suligoy d7279ddaf2 Delete selected nodes with the Delete key 2015-07-26 21:57:27 -03:00
Gen 88bf7f35e1 Fixed the mouse position for control when it is in a canvas_layer. 2015-07-27 08:36:21 +08:00
Ovnuniarchos af132adf94 Merge remote-tracking branch 'refs/remotes/origin/master' 2015-07-26 20:16:38 +02:00
Juan Linietsky 07c99e11f5 QOL, script buttons in scene tabs 2015-07-26 10:44:35 -03:00
Mariano Javier Suligoy add0105c4e Little fix: don't create an empty undo/redo command when trying to add a second Input GraphNode 2015-07-25 22:05:45 -03:00
Mariano Javier Suligoy 5ffd818fb1 Duplicate GraphNode(s) [Control+D] 2015-07-25 21:16:07 -03:00
Mariano Javier Suligoy bdde79a3f4 Box selection for GraphNodes 2015-07-24 21:59:48 -03:00
Juan Linietsky d50ebbb441 -added icons for root node types on tabs 2015-07-24 14:18:02 -03:00
Mariano Javier Suligoy 2a43778793 Fix tab indent 2015-07-20 22:15:06 -03:00
Ovnuniarchos 43053e3a71 Added a proper name and an explanation to arg4 on CanvasItem.draw_texture_rect*. 2015-07-20 20:07:25 +02:00
Mariano Javier Suligoy bdd12744fe Select and move multiple nodes at once 2015-07-19 01:48:46 -03:00
Mariano Javier Suligoy 5b71fc45b7 Use popup menu to add new nodes to the shader graph editor in the last clicked location. 2015-07-16 22:38:12 -03:00
Juan Linietsky 55b34e05b3 -some changes by okam 2015-06-30 11:28:43 -03:00
Juan Linietsky 95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources.
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
2015-06-29 00:29:49 -03:00
Juan Linietsky 2b64f73b04 more code completion improvements
-calltip dissapears with more types of keypresses or when pressing ')'
-properly looks into autoloaded scripts or nodes with another script for
script functions/variables/etc.
2015-06-27 15:52:39 -03:00
Juan Linietsky a67486a39e improved get_node(), connect(), etc code completion.
-properly completes text arguments
-includes the "/root" autoloads
2015-06-26 01:14:49 -03:00
romulox_x acb5cdb574 forgot to add mirroredrepeat flag to flags file. fixed. 2015-06-25 15:41:12 -07:00
romulox_x 85e49d4e75 added support for mirrored repeat texture wrapping 2015-06-25 14:51:21 -07:00
Juan Linietsky b4190ed2b9 compile fix 2015-06-24 18:34:31 -03:00
Kermer 32d4b4128c Tiny typo
COPY_MODE_DISALED -> COPY_MODE_DISABLED
2015-06-24 23:24:44 +02:00
Juan Linietsky 52308aba68 ability to change shadow color in light2d 2015-06-24 18:15:43 -03:00
Juan Linietsky 8b61a3c358 Merge pull request #1907 from tommy3/show-hidden-files
set initial flag 'show_hidden_files' for file dialogs in project manager initialization
2015-06-23 00:01:55 -03:00
Juan Linietsky 46692cccf2 Merge pull request #2068 from Krzycho666/color_ramp
ColorRamp new features
2015-06-23 00:01:01 -03:00
Juan Linietsky 25470dd3a0 Merge pull request #2058 from volzhs/create_from_fnt
add bind method for create_from_fnt (load fnt made by BMFont)
2015-06-22 23:57:54 -03:00
Juan Linietsky ae28305d7c ability to set process on parent nodes on visibility notifier 2015-06-22 15:43:13 -03:00
Juan Linietsky e9bbb97acc Multiple scene editing *POTENTIALLY UNSTABLE*
-ability to edit multiple scenes at the same time
-resource internal IDs are now persistent, this makes multiple scene
editing possible but maaaaay result in file corruption bugs (tested and
could not find anything but possibility exists because core code
changed, report immediately if you find this).
-properly save settings, layout, etc when edited
-script editing is independent from scene editing now
-show a yellow box when a script belongs to the scene
2015-06-22 00:04:15 -03:00
Juan Linietsky 8228fea02f missing changes 2015-06-14 02:13:47 -03:00
Juan Linietsky edf1f27118 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-13 22:14:36 -03:00
Juan Linietsky 9a58960d28 some editor window changes
-ability to make dock position configurable, and it gets saved
-editor starts maximized default
2015-06-13 22:12:53 -03:00
Juan Linietsky 89300b70e7 added ability for Area (3D) to detect other areas 2015-06-12 15:52:21 -03:00
Juan Linietsky 8945670bc0 made changing pivot simpler in 2D nodes (just press v with mouse over position) 2015-06-12 13:53:18 -03:00
Juan Linietsky 9e479065f5 new space shooter demo
ortho camera sort fix, closes #2063
2015-06-11 10:00:48 -03:00
krzycho 936b6e69f6 founded and fixed a bug that freezed godot when deleting while grabbing color in ColorRamp 2015-06-11 05:18:13 +02:00
krzycho 394276c45f ColorRamp new features:
- hold alt and left-click to duplicate color
- hold shift while grabbing color node to snap selected one to the nearest one if close enough
2015-06-11 04:36:11 +02:00
volzhs 9bee9e7498 add bind method for create_from_fnt (load fnt made by BMFont) 2015-06-10 02:25:34 +09:00
volzhs 5ffa3f4ff0 add bind method for create_from_fnt (load fnt made by BMFont) 2015-06-10 02:23:47 +09:00
Juan Linietsky c76900beb8 draw button focus before text and icon
closes #2047
2015-06-08 10:36:27 -03:00
Juan Linietsky 7590f3db21 grid container supports separate h and v spacing
closes #2049
2015-06-08 10:36:26 -03:00
Juan Linietsky f052153983 Added Node.find_node(mask) function
by popular request
2015-06-08 00:33:10 -03:00
Juan Linietsky c7af3146c8 Merge pull request #2007 from Krzycho666/master
Fixed ui_accept problem
2015-06-07 00:29:35 -03:00
Juan Linietsky 143265d4cb Merge pull request #1973 from Biliogadafr/ColorRamp
Replace color phases with color ramp for Particles2D. (need some review/guidance)
2015-06-07 00:26:35 -03:00
Juan Linietsky 5064cc5006 Merge pull request #1932 from Faless/gravity_distance_full
Calculate gravity based on distance from body to gravity point
2015-06-07 00:25:37 -03:00
Juan Linietsky b524b40fdc -fixed many memory initialization issues
-fixed deadlock on previews thread
-fixed compilation errors on unix
2015-06-06 22:06:58 -03:00
Juan Linietsky 14c4c1b568 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-06 11:09:41 -03:00
Juan Linietsky 954256268a Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	demos/2d/motion/engine.cfg
2015-06-06 11:09:00 -03:00
Juan Linietsky 6974823288 Merge remote-tracking branch 'origin/master'
Conflicts:
	tools/editor/io_plugins/editor_texture_import_plugin.cpp
2015-06-06 10:12:09 -03:00
Juan Linietsky 9acab32daa new file dialog!
-ItemList control for easier lists/thumbnails
-New file dialog, with support for thumbnails, favorites, recent places,
etc
-Moved .fscache out of the project, no more bugs due to committed/pulled
.fscache!
-Dir dialog now sorts directories
2015-06-06 09:44:38 -03:00
Juan Linietsky 0e1510214a small fixes 2015-06-01 23:35:23 -03:00
Juan Linietsky ab99671bb8 -fixes to navigation, so edge-merging is more flexible on conflict
-add tab support to richtextlabel
-some click fixes to audio stream resampled
-ability to import largetextures (dialog)
2015-06-01 19:42:34 -03:00
Juan Linietsky d5348eebdc work in progress, resource previews 2015-05-31 02:00:18 -03:00
krzycho 14c63565ec Fixed ui_accept problem. It's possible now to make a custom ui_accept action event and pull it. 2015-05-29 23:37:23 +02:00
Biliogadafr dc1940d3e8 Inline get_color_at_offset(). Delete unnecessary check. 2015-05-28 00:11:54 +03:00
Biliogadafr 3f975965e9 Add get_color_at_offset(). Ensure correct points order. 2015-05-26 22:17:54 +03:00
Juan Linietsky 9df77d2765 ability to run 2D physics in a thread
also, 2D physics is now thread safe too.
see physics_2d/thread_model
2015-05-26 01:06:05 -03:00
Juan Linietsky f36e7dcb40 improved animation editor
-same-value link keys
-new layout
-forward, backwards playback
-integrated curve/property editor
-auto increment sprite frame after insert
-copy & paste animation resoucres
2015-05-25 01:47:02 -03:00
Biliogadafr df9d48d9b5 Replace color phases with color ramp for Particles2D. 2015-05-24 21:18:52 +03:00
Juan Linietsky 1e50677594 fixes on sample importing 2015-05-19 23:37:04 -03:00
Juan Linietsky fec6aaffd8 more fixes
fix ctrl-a for some cases, mentioned in #1704
fix toggling visibility not updating, fixes #1923
2015-05-19 23:07:11 -03:00
Juan Linietsky 9f686563d0 fixed latin separation in label, broke it? for cjk
changed non-separatable character detection so latin works properly.
This is probably incorrect. If you speak chinese, korean or japanese,
please help me fix it.  closes #1935
2015-05-19 22:26:25 -03:00
Juan Linietsky 221443c5a2 more fixes
-only refuse to load an older file if version major is different, fixes
#1944
-fix drive letter default value, fixes #1939
2015-05-19 21:36:35 -03:00
Juan Linietsky f220183e40 fix a crash situation when starting a thread and other small fixes 2015-05-18 12:45:53 -03:00
Juan Linietsky e323cc0505 -Rename unexisting by nonexistant, closes #1940
-Added function to retrieve list of actions fron InputMap
2015-05-18 10:20:54 -03:00
Fabio Alessandrelli 590afbcac4 Calculate gravity based on distance from body to gravity point (2D) 2015-05-18 01:32:26 +00:00
Fabio Alessandrelli 473c7222f5 Calculate gravity based on distance from body to gravity point 2015-05-18 01:30:43 +00:00
Juan Linietsky 12bd89a39c small description improvement 2015-05-17 17:19:12 -03:00
Juan Linietsky b6b346e8ae added a built-in scene changer API, closes #1928 2015-05-17 16:33:35 -03:00
tommy3 282c392466 set initial flag 'show_hidden_files' for file dialogs in project manager initialization 2015-05-14 23:50:15 +02:00
Guilherme Felipe 53541c69d4 Fix for scroll_to_line and search functions, fix #1897
The function scroll_to_line(0) should return ERR_FAIL_INDEX because
the first line is 1.
2015-05-13 23:35:00 -03:00
Juan Linietsky 3936ed882c -Added lookat/get_angle_to functions in 2D, and a demo, closes #1843
-Added get_viewport().get_mouse_pos() to replace Input.get_mouse_pos(), closes #1838
2015-05-12 08:17:09 -03:00
Juan Linietsky 421b4fec3e -compatibility option for physicsbody layers, fixes #1842 2015-05-10 15:58:08 -03:00
Juan Linietsky 18251997dd Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-10 15:46:34 -03:00
Juan Linietsky 9b692b174b -convert to subscene keeps signal connections, fixes #1863 2015-05-10 15:45:33 -03:00
Hearto Lazor bd1e54a8b7 - Implemented support for fixed process on timer. Useful for cooldowns without the influence from framerate
similar to animation player (idle/fixed mode), where idle mode = old timer, fixed mode = fixed process implementation:
Example of the behaviour with a stream of bullets with timers on different frame rates:
https://gfycat.com/HeartyImpressiveIndiancow

- A change for more uniform ticks on fixed/idle

without this fix:
http://i.imgur.com/0TMQ6CG.png
with this fix:
http://i.imgur.com/3zYx16c.png
2015-05-10 10:00:26 -04:00
Juan Linietsky d1e4d6e997 -fix clip+center alignment on Button, fixes #1865 2015-05-09 18:29:55 -03:00
Juan Linietsky 65d48d6d39 -Added prints() function, fixes #1132, #1859
-Tabs work inside built-in log window, fixes #1867
2015-05-09 18:09:58 -03:00
Juan Linietsky c99813dc38 Merge pull request #1826 from eehrich/master
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
2015-05-07 20:02:54 -03:00
Juan Linietsky 9de37817bc -removed dynamic_cast on CheckBox, fixes #1830 2015-05-06 09:45:25 -03:00
ehriche ac9263c680 clearified parenthesis of if construct 2015-05-06 01:39:42 +02:00
ehriche 897a1aade5 optional formal changes 2015-05-06 01:22:31 +02:00
ehriche fe13c728fd added notes to resolve undefined behavior of calculations in tweening
interpolators in future.
2015-05-06 00:51:49 +02:00
Juan Linietsky 36932a0065 avoid crash on some cases of richtextlabel fill, but odd behavior persists, #1803 2015-05-05 00:37:06 -03:00
Juan Linietsky 9b03ea903e Merge pull request #1814 from sanikoyes/Pr-Tween-fix
Pr-Tween-fix
2015-05-05 00:19:22 -03:00
Juan Linietsky 74b0e0c296 fix crash in editor when using alt+arrows to indent, thanks adolson and romulox_x 2015-05-05 00:17:22 -03:00
sanikoyes 6d0914dfc5 Spine: add feature to insert/remove interpolates while updating 2015-05-05 11:12:17 +08:00
Juan Linietsky dce8a6c251 Merge pull request #1804 from ricpelo/ricpelo-patch-2
Wrong use of | instead of ||
2015-05-04 21:49:12 -03:00
Juan Linietsky a6e6c5b878 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-04 18:32:18 -03:00
Juan Linietsky 2d396fb710 -More strict argument type-checking, will make many bugs visible, fixes #1809
-added NOTIFICATION_INSTANCED
2015-05-04 18:30:57 -03:00
Juan Linietsky 2a02d3f96f fix font import path on windows, closes #1675 2015-05-04 15:06:41 -03:00
Ricardo Pérez f3542ff838 Wrong use of | instead of || 2015-05-04 19:54:17 +02:00
Juan Linietsky f4caddbc23 -corrected frac() and hyperbolic sin,cos,tan when running on PC (GLSL120), fixes #1775 2015-05-04 10:53:54 -03:00
Juan Linietsky a76709d240 -vec3 uniforms should now work, fixes #1773 2015-05-04 10:17:24 -03:00
Juan Linietsky 4b6225586c Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-04 00:53:52 -03:00
Juan Linietsky d6d29f6d79 Merge pull request #1755 from dbsGen/master
Fixed some bugs in Label.
2015-05-03 22:55:58 -03:00
Juan Linietsky f64fcc42ef Merge pull request #1772 from Biliogadafr/Tripleclick
Tripleclick now doesn't select line if clicks was done on different lines. Fix #1727
2015-05-03 22:54:16 -03:00
Juan Linietsky f850f0d9ec Merge pull request #1784 from NateWardawg/sa_fixes
Fixed some items caught in cppcheck
2015-05-03 22:54:02 -03:00
Juan Linietsky e7aa37fe75 improved kinematic motion, improved demos for kinematic motion 2015-05-03 22:37:10 -03:00
Juan Linietsky af06843982 -new collision layer & mask system for 2D, for more flexible collision masking 2015-05-03 16:47:21 -03:00
Juan Linietsky 5f2aac4bbe same fixes to 3D navmesh.. 2015-05-02 17:39:29 -03:00
Juan Linietsky 2296b0508e 2D pathfinder fixes, should now always find the best path. 2015-05-02 16:35:43 -03:00
Nathan Warden 6212946927 Fixed some items caught in cppcheck 2015-05-02 12:17:59 -05:00
Juan Linietsky 1e422941c8 -Fixed android export options (screen sizes, orientation should work)
-added functions to get mouse position in CanvasItem
2015-05-01 21:13:20 -03:00
Biliogadafr 8e7973d660 Triple click doesn't select line if click was done on different lines. Fix #1727 2015-05-02 00:03:49 +03:00
Juan Linietsky c45ffc2ca9 -fixed old condition in TextureFrame that caused bugs in materials, closes #1742 2015-05-01 12:16:51 -03:00
Juan Linietsky bf53b7789a -fix timer behavior described, closes #1455 2015-05-01 11:44:02 -03:00
Juan Linietsky c08597aa64 -fix a bug in extra cull margin, closes #1760 2015-05-01 11:26:23 -03:00
Juan Linietsky 4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
Gen 0bc5b7a146 Optimize the code. 2015-05-01 18:47:34 +08:00
Juan Linietsky 21939ce08b -some cleanups
-added tesselation function to curve and curve2d
2015-04-30 10:06:18 -03:00
Gen c322eddffb fixed a autowrap bug when word is too length. 2015-04-30 12:47:05 +08:00
Gen 57d571a1c4 Update label.cpp 2015-04-30 00:03:19 +08:00
Gen 02d672753f space is only skipped when autowrap. 2015-04-29 23:43:39 +08:00
Gen 6fa342a1b0 record the number of space before a word. 2015-04-29 16:34:56 +08:00
Gen ad358562e5 record the number of space before a words. 2015-04-29 16:34:25 +08:00
Juan Linietsky 7773d70f44 bad lookup in grid container corrected, cells are properly aligned again. Fixes #1462 2015-04-28 23:10:06 -03:00
Juan Linietsky 98c086edaf -fix forced texture repeat in Polygon2D, now depends on texture.
-added a new function, Camera::is_position_behind to aid to unproject(), fixes #1725
2015-04-28 22:05:01 -03:00
Gen dfc59d1e00 Update label.h 2015-04-28 23:07:41 +08:00
Gen 1a6012aff5 Update label.cpp 2015-04-28 23:06:34 +08:00
Juan Linietsky 0adca0a7c9 -made normalmaps easier in 2D, fixes #1467 2015-04-27 08:11:54 -03:00
Juan Linietsky 82cbee2d2d -added set_master_player binding, fixes #1477 2015-04-27 00:23:16 -03:00
Juan Linietsky 79d5b7f258 -fixed bodyenter/bodyexit callback of physics bodies, fixes #1739 2015-04-26 17:46:20 -03:00
Juan Linietsky 65c96a71bd fix crash on exit for popup, fixes #1676 2015-04-26 15:42:02 -03:00
Juan Linietsky 330351c613 properly update emitting property when emit timeot is used, fixes #1716 2015-04-25 10:36:37 -03:00
Juan Linietsky 1721ef17d6 disable apply modifiers by default in export flag 2015-04-22 18:20:29 -03:00
Juan Linietsky 7648088fca ability to get closest owner to point, for navigation and navigation2d 2015-04-21 16:47:49 -03:00
Juan Linietsky 93ce7d92c1 -Many fixes and demo for RichTexLabel
-Proper ability to edit BBCode in RTL.
2015-04-21 16:01:58 -03:00
Juan Linietsky 70752f3e4b -oops, duplicated text issue fix.. 2015-04-20 20:51:52 -03:00
Juan Linietsky 59154cccf9 -Changed Godot exit to be clean.
-Added more debug information on memory cleanliness on exit (if run with -v)
-Fixed several memory leaks, fixes #1731, fixes #755
2015-04-20 19:38:02 -03:00
Juan Linietsky 28c4afeb57 -Rewritten KinematicBody2D::move to MUCH more efficient code.
-KinematicBody2D::move now properly recognizes collision exceptions and masks, fixes #1649
-Removed object type masking for KinematicBody2D
-Added a test_motion() function to RigidBody2D, allowing simlar behavior to KinematicBody2D::move there.
2015-04-19 20:50:55 -03:00
Juan Linietsky 389d6ca0c7 disable undo properly after ctrl-i, fixes #1688 2015-04-18 16:57:01 -03:00
Juan Linietsky 4661a6e126 -try to avoid errors when path using ".." is present in script include, fixes #1703 2015-04-18 16:17:33 -03:00
Juan Linietsky fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Juan Linietsky be46be7801 -renamed function to get object from instance id
-added function to get list of tiles used
2015-04-18 14:00:15 -03:00
Juan Linietsky 61ab20a0bb fixed UV2 source in shader graph, closes #1633 2015-04-12 19:36:35 -03:00
Juan Linietsky 3fddc9e55a fixed navigation tile issue, fixes #1581 2015-04-09 01:18:01 -03:00
Juan Linietsky e7ba4eca9f -function remove_and_delete_child removed. Just use child.free() or child.queue_free() instead. Fixes #1603 2015-04-09 00:49:48 -03:00
Juan Linietsky d148a03848 -Fixes bug in ShaderGraph material, when uniform property is not used, fixes #1634 and #1610 2015-04-09 00:29:21 -03:00
Juan Linietsky 54ed432913 fix crash when deleting shader from material, fixes #1631 2015-04-07 22:30:36 -03:00
Juan Linietsky 7852be816a fixed shader graph length node, fixes #1632 2015-04-07 22:22:46 -03:00
Juan Linietsky b307ee79a1 Merge pull request #1574 from UsernameIsAReservedWord/fix_3d_spot_attenuation
fixes_3d_spot_attenuation
2015-04-07 20:16:00 -03:00
Juan Linietsky 7b75658bb2 Merge pull request #1585 from UsernameIsAReservedWord/add_is_queued_for_deletion_in_objects
add : bool Object.is_queued_for_deletion()
2015-04-07 20:14:51 -03:00
TheoXD 68c2a959dd Bullet shower demo crashed because of dynamic casting in the code for object picking. Making sure the object has an ID greater than 0 before typecasting solves it. 2015-04-03 14:42:05 +02:00
Juan Linietsky 9fa1698c74 Changes to Light
-=-=-=-=-=-=-=-=

-Changed material unshaded property for an enum, which supports light-only shading
-Added a "Mix" shading mode, useful for using lights as masks
-Added energy parameter to Light2D
2015-04-03 01:43:37 -03:00
Juan Linietsky 68e42f53ba Beta1 Attempt #1
-=-==-=-=-=-=-=-

-Small fixes in canvas item light shader
-Fixed compilation in server target
-Export for Android makes 32 bits display as default
-changed version to 1.1beta1
2015-04-02 12:59:23 -03:00
Juan Linietsky 1572238adb merging okam changes 2015-04-02 07:22:17 -03:00
yg2f 3c67e22c3d add : bool Object.is_queued_for_deletion()
`object.is_queued_for_deletion()` return true if the object was
`object.queue_free()` or `SceneTree.queue_delete(object)`.
2015-03-28 18:34:28 +01:00
yg2f 103ab3bd1a fixes_3d_spot_attenuation 2015-03-25 16:27:55 +01:00
Juan Linietsky 7ad7f2f6a9 android fixes, please test
(can' t build android atm)
2015-03-23 11:31:23 -03:00
Juan Linietsky ffa556aeea Merge pull request #1402 from ElectricSolstice/editor_match_fix
Fixed issue #1377 about script editor parenthesis matching.
2015-03-22 15:02:15 -03:00
Juan Linietsky 3aed92e5b1 Merge pull request #1450 from theuserbl/master
Making ToolButton and KEY_MASK_CMD accessable in GDScript and the IDE
2015-03-22 14:58:42 -03:00
Juan Linietsky 6d813c81b8 Merge pull request #1460 from MarianoGnu/master
Create Checkbox class with support for Radio Buttons
2015-03-22 14:55:36 -03:00