maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4700 commits 10 branches 35 tags 1.1 GiB
Commit graph

4700 commits

This branch
This branch
All branches
Author SHA1 Message Date
Juan Linietsky e8a2c767d2 Merge branch 'master' of https://github.com/godotengine/godot 2016-06-30 10:41:08 -03:00
Juan Linietsky e49b73e93a Only check for constants when parsing constants, should close #5497 2016-06-30 10:40:13 -03:00
Rémi Verschelde d81b635957 Merge pull request #5495 from SuperUserNameMan/joystick_bug_windows 
fixes #5464 windows_joystick close_joystick bug
 2016-06-30 08:07:59 +02:00
Rémi Verschelde 91655b9a18 Merge pull request #5494 from jay3d/master 
Fixed building for latest Haiku nightlies.
 2016-06-30 08:07:24 +02:00
Rémi Verschelde 0233c69bdc Merge pull request #5474 from samuelgrigolato/tile-map-idx 
Add tile index prefixes in tile map editor plugin
 2016-06-30 08:06:54 +02:00
Rémi Verschelde a99ca66ce5 Merge pull request #5449 from sanikoyes/Pr-placeholder-line-edit 
Add placeholder property for line_edit
 2016-06-30 08:06:26 +02:00
Rémi Verschelde efe4c66788 Merge pull request #5445 from susnux/arch-detection 
Fix compiling for X11 on non-86, this fixes #5444
 2016-06-30 08:05:45 +02:00
Rémi Verschelde 3fc115e433 Merge pull request #5439 from samuelgrigolato/fix-filesystem-dock-min-size 
Fix issue when switching between FileSystem and other editor docks
 2016-06-30 08:04:36 +02:00
Rémi Verschelde da2f7e3c38 Merge pull request #5419 from djrm/shortcuts 
Shortcuts for script switching in script Mode
 2016-06-30 08:04:26 +02:00
Rémi Verschelde a3dec742e9 Merge pull request #5462 from volzhs/fix-pm-warning 
remove the warning of instances in use at Project manager exit
 2016-06-30 07:58:16 +02:00
Rémi Verschelde fcf6977610 Merge pull request #5487 from Paulb23/function_highlighting_issue_5454 
Fixed function highlighting with spaces
 2016-06-30 07:57:31 +02:00
Juan Linietsky cf0fbe493f Ability to put constants in constant expressions, closes #5264 2016-06-29 22:17:55 -03:00
Juan Linietsky 36e754457f Warn instad of crashing when class instance is gone after yield. Closes #5247 , probably closes other yield related crashes 2016-06-29 21:06:16 -03:00
Juan Linietsky ff11401441 Allow animation name to be clipped, closes #5246 2016-06-29 20:11:14 -03:00
Juan Linietsky ea6c8d5b8b Add Variant to the list of clases, so it can be documented (make sure it can't be documented that it can't be used). Closes #5237 2016-06-29 19:54:22 -03:00
Juan Linietsky ac6257bf8a only call finished signal when it really finishes, closes #5222 2016-06-29 18:46:43 -03:00
Juan Linietsky 449a28e75a make property not be applied in skeleton if not inside tree. This will eventually e changed. Fixes #5205 2016-06-29 18:39:29 -03:00
Juan Linietsky fe5ee68489 Merge pull request #5429 from Paulb23/selected_text_highlighting_issue_5199 
Fixed selected text turning black, issue 5199
 2016-06-29 18:31:47 -03:00
Juan Linietsky e5fc62cc4b remove unnecesary warning, closes #5169 2016-06-29 18:27:12 -03:00
SuperUserNameMan 2511f48339 fixes #5464 windows_joystick close_joystick bug 2016-06-29 23:00:45 +02:00
Juan Linietsky 22d5227663 AnimatedSprite and AnimatedSprite 3D adapt the name of the current animation if the one in SpriteFrames is removed/added or renamed. Closes #5152 2016-06-29 17:51:55 -03:00
Jamil Halabi fbdb717cae Fixed building for latest Haiku nightlies. 2016-06-29 15:40:25 -04:00
Rémi Verschelde 72c2cccbe2 assetlib: Connect to the API using SSL 
Note: it does not work in the project manager as the latter does not
use the editor-bundled certificates, but that's a bug and should be fixed.
 2016-06-29 19:16:20 +02:00
Paulb23 484f4d8dec Fixed function highlighting with spaces 2016-06-29 15:29:22 +01:00
Juan Linietsky f56a0435f2 Turn on SNI in OpenSSL 2016-06-29 11:20:17 -03:00
Juan Linietsky 119cd5d3ff Merge pull request #5479 from volzhs/fix-show-main-panel 
Fix main(2D, 3D, Script) panel not updated when start up and select f…
 2016-06-29 10:33:22 -03:00
Juan Linietsky 72ab3c2236 Do a second stage remap, so it considers translation first, atlas second, closes #5147 2016-06-29 10:18:46 -03:00
volzhs cd60c11229 Fix main(2D, 3D, Script) panel not updated when start up and select from tool button 2016-06-29 14:49:03 +09:00
Mariano Javier Suligoy ea108bed79 Merge pull request #5478 from MarianoGnu/master 
Initialize missing variables. Fixes #5461
 2016-06-28 23:55:27 -03:00
MarianoGNU ea8292c1c0 Initialize missing variables. Fixes #5461 2016-06-28 23:51:13 -03:00
Samuel Grigolato afab4168fd Add tile index prefixes in tile map editor plugin. #5420 2016-06-28 20:14:30 -03:00
George Marques 5e0edcc480 Merge pull request #5468 from jejung/itemlist-get-selected_items 
itemlist-get_selected_items
 2016-06-28 19:21:57 -03:00
Juan Linietsky fbdb7a947b Editor properly reloads scenes if they changed on disk or were reimported 2016-06-28 18:53:31 -03:00
Jean Jung 673e3b70b6 Added ItemList.get_selected_items() doc 2016-06-28 16:22:36 -03:00
Jean Jung 5502499469 syncing the reference 2016-06-28 16:11:58 -03:00
Jean Jung 2fd9b77828 itemlist-get_selected_items 2016-06-28 14:09:17 -03:00
Juan Linietsky 5065e46381 Change method of storing folding, solves problems with inheritance, closes #3395 2016-06-28 13:10:15 -03:00
Juan Linietsky 519fce94e9 Remove error when getting dependencies from tscn files in some cases, closes #3897 2016-06-28 12:35:11 -03:00
Juan Linietsky 3754f6cd75 Properly show the source:line even in inner clases, closes #3766 2016-06-28 11:49:57 -03:00
Rémi Verschelde c6ca17e12a Merge pull request #5463 from vnen/fix-shortcut-typo 
Fix typo in file dialog shortcut
 2016-06-28 16:40:26 +02:00
George Marques 259e60d283
Fix typo in file dialog shortcut 
Also change the shortcut to refresh to F5.
 2016-06-28 11:22:31 -03:00
Juan Linietsky cf6450043d Fix bug in inner class reference, closes #1411 2016-06-28 11:15:55 -03:00
Juan Linietsky f4c6640827 Fixed bug related to resolving constants in a class, closes #1110 2016-06-28 11:02:53 -03:00
Juan Linietsky 565bb3afcc Fix extends issue, closes #4026 2016-06-28 10:44:38 -03:00
volzhs e453c10ff5 remove the warning of instances in use at Project manager exit 2016-06-28 22:07:24 +09:00
Juan Linietsky 8e1c0f287d Fixed bug in instance state ordering, closes #3904 2016-06-28 09:47:03 -03:00
Juan Linietsky 41a26528e4 Avoid recursion in filesystem scanning, closes #3838 2016-06-28 08:27:54 -03:00
Bonfi96 e4eb025bfe i18n: Corrected a typo (#5460) 2016-06-28 12:00:18 +02:00
Rémi Verschelde 2598fe5f8d i18n: Merge translations with template 2016-06-28 08:50:39 +02:00
Rémi Verschelde aa5a031f95 i18n: Sync template with source 2016-06-28 08:49:50 +02:00