Commit graph

3460 commits

Author SHA1 Message Date
Rémi Verschelde
23cf6a85bd Port 2D demos to TSCN/TRES formats
Part of #4196.
2016-04-02 14:39:08 +02:00
Rémi Verschelde
4eb49cc732 Fix last two bindings in input_mapping demo
Also connect the signal from script, as it makes it easier to understand
than by having to check the connected signals via the GUI.
2016-04-01 08:39:18 +02:00
Rémi Verschelde
3cc7b6fa5d Merge pull request #4194 from HeartoLazor/timerpause
Now the timer could be paused
2016-04-01 07:38:49 +02:00
Hearto Lazor
995890d5b2 Now the timer could be paused
pause with: set_active(true/false)
is paused with: is_active()
2016-03-31 18:23:16 -03:00
Rémi Verschelde
8708a284f7 Merge pull request #4179 from Adjective-Object/master
inherit PKG_CONFIG_PATH from environment
2016-03-30 20:36:09 +02:00
Maxwell Huang-Hobbs
32391ffd73 inherit PKG_CONFIG_PATH from environment 2016-03-30 10:44:58 -04:00
Rémi Verschelde
6b64b26f0e Merge pull request #4156 from JoshuaGrams/match-docs
doc/base/classes.xml: String.match, Node.find_node
2016-03-30 12:47:15 +02:00
Rémi Verschelde
f293503a98 Merge pull request #4150 from Paulb23/number_syntax_highlighting
Fixed numbers not highlighting after space
2016-03-30 12:36:42 +02:00
Rémi Verschelde
44ee7c238e Merge pull request #4149 from Paulb23/save_scene_flicker_issue_4118
Fix for issue #4118
2016-03-30 11:52:40 +02:00
Josh Grams
ef08fed277 doc/base/classes.xml: String.match, Node.find_node
Clarify wildcard behavior.
2016-03-27 08:21:14 -04:00
Paulb23
cd07badee3 Fixed numbers not highlighting after space 2016-03-26 22:03:27 +00:00
Paulb23
9d74b76a69 Stopped save scene flicker, issue 4118 2016-03-26 20:32:36 +00:00
Rémi Verschelde
15d1fca061 Merge pull request #4102 from SaracenOne/dynamic_margin_properties
Dynamic property list for control margins
2016-03-23 09:36:18 +01:00
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
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