Commit Graph

3998 Commits

Author SHA1 Message Date
Rémi Verschelde 440ef4b756 Enter the 2.1 alpha phase
To make it clearer that this branch is more recent than
the stable 2.0.x releases.
2016-03-22 18:45:19 +01:00
Rémi Verschelde 81b449908e Add support for patch versions (2.0.x)
(cherry picked from commit 706d576f7b)
2016-03-22 18:41:09 +01:00
Rémi Verschelde e8ee4f7973 Merge pull request #4115 from Paulb23/number_syntax_highlighting
Syntax highlighting for numbers
2016-03-22 07:34:08 +01:00
Rémi Verschelde 8c2771b6d5 Merge pull request #4119 from sanikoyes/Pr-crash-exit-tree
Fix GDScript crash when call show/hide in func _exit_tree
2016-03-22 07:31:33 +01:00
sanikoyes 0c6f089ce4 Fix GDScript crash when call show/hide in func _exit_tree 2016-03-22 12:46:33 +08:00
Paulb23 c844c2d604 Syntax highlighting for numbers 2016-03-21 15:45:38 +00:00
Ignacio Etcheverry d38454b967 MarginContainer: Add top, right and bottom margins 2016-03-21 00:53:47 +01:00
Rémi Verschelde a895e2e372 Merge pull request #4105 from akien-mga/pr-android-shutdown-adb
Expose android/shutdown_adb_on_exit parameter
2016-03-20 18:34:05 +01:00
Rémi Verschelde c584940387 Expose android/shutdown_adb_on_exit parameter and default to true
It was added in 30d0ca9 for the Steam build but only enabled
when parsing a ._sc_ file that would define it.
It is now available for all users to toggle, in and outside of Steam.

Fixes #4073.
2016-03-20 16:55:54 +01:00
Rémi Verschelde d4321c9f33 Merge pull request #4033 from akien-mga/pr-sample-lib-stop-button
Add stop and delete buttons to sample library (supersedes #3339)
2016-03-20 16:03:57 +01:00
Rémi Verschelde e67ee2bc08 Merge pull request #4104 from teamblubee/master
Add support for gnu-libstc++-4.9 needed by recent NDK versions
2016-03-20 13:56:44 +01:00
blubee a0fb5b5f95 Add support for gnu-libstc++-4.9 needed by recent NDK versions
The 4.9 version is the default one, people can still build using 4.8
with older NDK versions by setting the (optional) NDK_TARGET
and NDK_TARGET_X86 environment variables.
2016-03-20 20:29:37 +08:00
Saracen d8392dd117 Dynamic property list for control margins allowing floating point properties to be used with ratio anchors. 2016-03-20 05:59:18 +00:00
Rémi Verschelde 6cf978b7d6 Merge pull request #4085 from sanikoyes/Pr-adb-keep-user-data
Add -r flag to adb install for keep app user data
2016-03-19 19:38:14 +01:00
Rémi Verschelde b8daa7e6e6 Merge pull request #4095 from neikeq/pr-bind-add_spacer
BoxContainer: Bind method add_spacer(bool)
2016-03-19 13:55:04 +01:00
Rémi Verschelde bf13f29b15 Merge pull request #4094 from neikeq/pr-fix-4062
TextEdit: Fix Shift+Delete shortcut not calling cut()
2016-03-19 13:54:02 +01:00
Ignacio Etcheverry 0571f961a8 BoxContainer: Bind method add_spacer(bool) 2016-03-19 13:37:07 +01:00
Ignacio Etcheverry abb720438f TextEdit: Fix Shift+Delete shortcut not calling cut() 2016-03-19 13:22:44 +01:00
Rémi Verschelde 77949f02d9 Merge pull request #4088 from bojidar-bg/PR-fix-tilemap-z
Fix issues with tilemap covering child nodes and old quadrants
2016-03-19 12:49:03 +01:00
Rémi Verschelde 3eddd46fa8 Merge pull request #4090 from demolitions/master
Fixes #3942 - Throws an error when exporting for X11 with no filename
2016-03-19 02:04:25 +01:00
demolitions fb58bafc54 Fixes #3942 - Throws an error when exporting for X11 with no filename 2016-03-18 23:37:31 +01:00
Rémi Verschelde db81ef92b5 Merge pull request #4087 from demolitions/master
Fix for #4014
2016-03-18 18:18:15 +01:00
Bojidar Marinov 2a581835ca Fix issues with tilemap covering child nodes and old quadrants
Closes #4070
2016-03-18 18:57:26 +02:00
demolitions 4e59d1c51f Fix for #4014, changed to 2 instead of 3 chars to trigger search 2016-03-18 17:07:07 +01:00
Rémi Verschelde 15ba4d34c5 Merge pull request #4077 from sanikoyes/Pr-resourcepreloader-multiple-select
Allow select multiple files in ResourcePreloaderEditor
2016-03-18 14:27:31 +01:00
Rémi Verschelde 0e1ae3b381 Merge pull request #4086 from Paulb23/toggle_draw_tabs
Option to toggle tab drawing
2016-03-18 14:26:38 +01:00
Paulb23 0fc7be89d3 Option to toggle tab drawing 2016-03-18 12:49:18 +00:00
sanikoyes e13e343c9c Rename path to paths 2016-03-18 18:26:02 +08:00
sanikoyes 9e026fecef Add -r flag to adb install for keep app user data 2016-03-18 18:11:55 +08:00
Rémi Verschelde b955282d46 Merge pull request #4071 from Razzlegames/getUnixTimeFromDateTime
Add function to convert Datetime from a dictionary to Epoch
2016-03-18 10:04:13 +01:00
Rémi Verschelde 021a84e704 Merge pull request #4083 from SaracenOne/tree_control_cursor_fix
Fix cursor getting locked on tree control
2016-03-18 07:21:14 +01:00
Saracen 44fe74bfc3 Fix cursor getting locked on tree control if tree is cleared while modifying numerical element. 2016-03-17 23:10:09 +00:00
Rémi Verschelde 3adc5a45ab Merge pull request #4082 from Paulb23/word_highlighting
Fixes for Word highlighting
2016-03-17 22:26:40 +01:00
Paulb23 9c0e1524e5 Fixed highlighting when word occurs as substring first 2016-03-17 20:35:04 +00:00
Paulb23 4cc3fbeaff Fixed highliting with shift and mouse 2016-03-17 19:37:19 +00:00
Rémi Verschelde 63aafb3f48 Merge pull request #4076 from Paulb23/word_highlighting
Highlight all occurrences of selected word
2016-03-17 11:01:18 +01:00
Kyle Luce 674c6f2f2d Add function to convert Date time from a dictionary to Epoch
- Also changed get_time_from_unix_time to get_date_time_from_unix_time to be
  consistent.

Ticket:
https://github.com/godotengine/godot/issues/4038
2016-03-16 23:13:39 -07:00
sanikoyes 174b9a5f9e Allow select multiple files in ResourcePreloaderEditor 2016-03-17 12:30:13 +08:00
Paulb23 b0488cacf2 Highlight all occurrences of selected word 2016-03-16 21:20:42 +00:00
Rémi Verschelde 5b67305ebb Merge pull request #4065 from TheHX/issue-4058
Fix editors panels, of the bottom panel, not resizing in some cases
2016-03-16 13:34:42 +01:00
Rémi Verschelde cb065b961c Merge pull request #4006 from TheHX/tilemap-editor
Several improvements for the Tilemap editor
2016-03-15 19:29:39 +01:00
Franklin Sobrinho 4a0f835ece Fix editors panels, of the bottom panel, not resizing in some cases 2016-03-15 15:15:50 -03:00
Franklin Sobrinho 1589157337 Tilemap Editor: Fix some last issues of PR-4006 2016-03-15 14:32:28 -03:00
Rémi Verschelde 648af0c42b Merge pull request #4062 from neikeq/pr-issue-4060
LineEdit/TextEdit: Add Shift+Delete shortcut for cut
2016-03-15 14:32:40 +01:00
Ignacio Etcheverry fac027cb14 LineEdit/TextEdit: Add Shift+Delete shortcut for cut 2016-03-15 13:03:38 +01:00
Ignacio Etcheverry 4dfd0c1863 TextEdit: Fix inconsistent copy, cut and paste behaviour 2016-03-15 13:02:38 +01:00
Rémi Verschelde c9a401e541 Merge pull request #3694 from techtonik/patch-1
Show driver information in verbose mode
2016-03-15 10:30:47 +01:00
Rémi Verschelde aec4f57f95 Merge pull request #3528 from SaracenOne/baked_light_realtime_colourize
Ability to colourize baked lighting in real time.
2016-03-15 10:22:09 +01:00
Rémi Verschelde c1a1adae28 Merge pull request #4051 from AlexHolly/fileeditor-open-any
(editor)filedialog open file and dir MODE_OPEN_ANY
2016-03-15 08:45:01 +01:00
Rémi Verschelde 9e97e9f39d Merge pull request #4057 from TheHX/particles-plugin
Fix file dialog, of Particles2D plugin, showing "Error" icons
2016-03-14 21:14:48 +01:00