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

2447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Franklin Sobrinho
df57239f7f Remove last remaining variables of PR-3043 2015-12-12 18:15:31 -03:00
Juan Linietsky
97fe073f33 Merge pull request #2933 from TheHX/pr-shader-loader 
Fix shader loading, making possible load .shd and .sgp from editor
 2015-12-12 17:36:52 -03:00
Juan Linietsky
6316f8941c variant parser was not parsing rect2 properly, fixes #2948 2015-12-12 17:10:43 -03:00
Juan Linietsky
101049518a -force exporting of original script exported variables on overriden scripts 
-this works around the problem of scripts being reloaded and their properties lost
-fixes #2958
 2015-12-12 16:46:25 -03:00
Juan Linietsky
5abe431361 better support for broken collada, fixes #2959 2015-12-12 14:55:16 -03:00
Juan Linietsky
890b462ffb added rotation and scale support to gui controls 2015-12-12 13:54:26 -03:00
Juan Linietsky
cc7880fba5 -added windowed mode with -w, fixes #3020 
-changed default windowed resolution to 1280x720
 2015-12-12 12:06:53 -03:00
Juan Linietsky
ec8f0d7eb9 ability to set occluder mask in tilemap, fixes #3025 2015-12-12 10:45:31 -03:00
Juan Linietsky
e19f176765 fix broken merge 2015-12-12 10:21:22 -03:00
Juan Linietsky
a2d817405e Merge branch 'master' of https://github.com/godotengine/godot 2015-12-12 10:14:13 -03:00
Rémi Verschelde
c3db5d951c Merge pull request #3043 from TheHX/pr-script-debugger 
Script debugger remains visible when using Debug->Show Debugger
 2015-12-12 14:10:12 +01:00
Juan Linietsky
cd4c3f4d12 -added option to keep debugger open, fixes #3031 2015-12-12 10:09:50 -03:00
Franklin Sobrinho
4d644ca997 Script debugger remains visible when using Debug->Show Debugger 2015-12-12 10:04:51 -03:00
Juan Linietsky
e2e6f3ec00 added proper functions to ColorRamp, fixes #3034 2015-12-12 09:45:17 -03:00
Juan Linietsky
29ea399234 -make smoothing respect camera limits, fixes #3037 2015-12-12 09:26:13 -03:00
Juan Linietsky
9a7ff65751 make popup emit index when id is not defined 2015-12-12 09:07:43 -03:00
Juan Linietsky
b191e740d2 add pop_back/pop_front/push_back/push_front to array, to make it according to doc, fixes #3040 2015-12-12 08:27:30 -03:00
Juan Linietsky
a73cf7f794 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-12 08:12:28 -03:00
Juan Linietsky
9251298f46 -collision debug is shown above all else, fixes #2985 2015-12-12 08:11:36 -03:00
punto-
25d19e08bb Merge pull request #590 from marynate/PR-fix-ios-release-event 
Fixed ios release event not been dispatched when app entering background
 2015-12-11 21:30:02 -03:00
Rémi Verschelde
6221570f53 Merge pull request #3039 from TheHX/pr-in-operator 
Fix "in" operator, make it use evaluate() instead of operator==
 2015-12-11 15:15:01 +01:00
Franklin Sobrinho
6a34ab201a Fix "in" operator, make it use evaluate() instead of operator== 2015-12-11 10:29:55 -03:00
Juan Linietsky
990690f9f5 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-11 09:38:41 -03:00
Juan Linietsky
fbda3c5d88 -remove (can be added back in editor settings) icons from property editor 
-remove ".." from file dialog when opening res://, fixes #2994
 2015-12-11 09:37:34 -03:00
Juan Linietsky
0f57bbb8e9 remove editor driver split 
fixes #3001
 2015-12-11 09:03:54 -03:00
Rémi Verschelde
9e000f12a1 Merge pull request #3038 from TheHX/pr-script-signal 
Fix error message when using is_connected with a script signal
 2015-12-11 12:22:09 +01:00
Franklin Sobrinho
e4dce93520 Fix error message when using is_connected with a script signal 2015-12-11 07:53:40 -03:00
Juan Linietsky
46497c4508 added fallbacks proprty to fonts 2015-12-10 23:02:40 -03:00
Rémi Verschelde
3b68f0d051 Merge pull request #2306 from dbsGen/patch-1 
Fixed the mouse position for control when it is in a canvas_layer.
 2015-12-10 17:06:27 +01:00
Rémi Verschelde
5f3c87691e Merge pull request #3019 from neikeq/spinbox_timer 
Spinbox update range on mouse held
 2015-12-10 15:48:23 +01:00
neikeq
d4051e6eb9 Spinbox: increase/decrease with mouse held 2015-12-10 15:44:16 +01:00
Rémi Verschelde
964a57cb2a Merge pull request #2883 from TheHX/mesh_editor_plugin 
Add StaticBody collision generation for all selected MeshInstance nodes
 2015-12-10 15:19:30 +01:00
Rémi Verschelde
8a94297105 Merge pull request #3029 from neikeq/textedit_select_imp 
TextEdit: Scroll while selecting with mouse idle
 2015-12-10 11:36:30 +01:00
neikeq
5f739a2660 TextEdit: Scroll while selecting with mouse idle 2015-12-09 19:56:47 +01:00
Rémi Verschelde
5a60edf1ff Merge pull request #3028 from TheHX/pr-tscn-format 
Fix tscn format not being recongnized by EditorFileSystem
 2015-12-09 19:06:23 +01:00
Franklin Sobrinho
afb41b283c Fix tscn format not being recongnized by EditorFileSystem 2015-12-09 13:56:14 -03:00
Rémi Verschelde
2d84943a2b Merge pull request #3027 from TheHX/pr-project-manager-font 
Fix project manager not picking up custom font
 2015-12-09 16:45:45 +01:00
Rémi Verschelde
02d352bfbf Merge pull request #3026 from est31/fix_win_build 
Fix windows build
 2015-12-09 16:42:19 +01:00
Franklin Sobrinho
c2ce39c424 Fix project manager not picking custom font 2015-12-09 12:35:20 -03:00
est31
3dbf7dd7fa Fix windows build 2015-12-09 16:06:00 +01:00
Juan Linietsky
aadced2f72 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-09 09:10:00 -03:00
Juan Linietsky
6bc6b8fcf2 -ability to change scripts in external editor and still have properties reloaded in godot UI, fixes #3003 2015-12-09 09:08:41 -03:00
Rémi Verschelde
db9da15276 Merge pull request #2853 from akien-mga/pr-demos-code-formatting 
Improve demos code formatting and update to 2.0
 2015-12-09 08:49:06 +01:00
Rémi Verschelde
52d515b611 Use get_current_scene() instead of hack 2015-12-09 08:39:12 +01:00
Rémi Verschelde
6315dd4985 Move polygon_path_finder demo to demos/3d since it uses 3D nodes 
Also took the opportunity to "touch" each demo's engine.cfg in reverse alphabetical order to get the listed in natural order in the project manager.
 2015-12-09 08:39:12 +01:00
Rémi Verschelde
6cfc3eec97 Remove systematic "Init(i)alization here" from _ready() 2015-12-09 08:39:12 +01:00
Rémi Verschelde
7589b2bf60 Improve code formatting 
The scripts were streamlined using more or less the following conventions:
 - space after a comma in lists of arguments
 - spaces around weak operators (+, -), no spaces around strong operators (*, /)
 - spaces around comparison operators and compound assignment operators
 - space after a comment start (#)
 - removed trailing spaces or tabs, apart from those that delimit the function indentation level (those could be removed too but since they are added automatically by the editor when typing code, keeping them for now)
 - function blocks separate by two newlines
 - comment sentences start with an upper-case letter
 2015-12-09 08:39:12 +01:00
Rémi Verschelde
323dde7f31 Update 2D demos scenes for 2.0 format 2015-12-09 08:39:12 +01:00
Rémi Verschelde
8c4f19e79d Use upper-cased first letter at the start of comment sentences 2015-12-09 08:39:12 +01:00
Rémi Verschelde
8639cecf4c Improve code formatting and update to 2.0 
The scripts were streamlined using more or less the following conventions:
 - space after a comma in lists of arguments
 - space around weak operators (+, -), no space around strong operators (*, /)
 - space after a comment start (#)
 - removed trailing spaces or tabs, apart from those that delimit the function indentation level (those could be removed too but since they are added automatically by the editor when typing code, keeping them for now)
 - function blocks separate by two newlines

The scene files were resaved with the (current) 2.0 format, and some scenes that were in XML format were converted to SCN, to be consistent across all demos.
 2015-12-09 08:38:23 +01:00