asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2431 commits 1 branch 0 tags 2.2 GiB
Commit graph

2431 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Franklin Sobrinho
4d644ca997 Script debugger remains visible when using Debug->Show Debugger 2015-12-12 10:04:51 -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
Rémi Verschelde
efbb834936 Merge pull request #2986 from TheHX/pr-shader-editor 
Fix shader editor focus when switching tabs
 2015-12-09 07:48:51 +01:00
Juan Linietsky
f86477ce93 Merge pull request #3022 from romulox-x/aes256 
Updated aes256 implementation
 2015-12-08 21:16:32 -03:00
romulox_x
2cc8340594 updated aes256 implementation to newer version from upstream. Also uses faster lookup table implemetation. 2015-12-08 16:13:06 -08:00
Juan Linietsky
708ff381d6 changed a bit to use system() 2015-12-08 20:36:48 -03:00
Juan Linietsky
78b5404434 improve detection of linux, fixes #3201 2015-12-08 20:35:40 -03:00
Juan Linietsky
428984ec0c -New mask mode for lights, makes using masks MUCH easier. 2015-12-08 20:25:08 -03:00
Juan Linietsky
88c653a9e5 -made it add the node name from the file, closes #3010 2015-12-08 18:35:42 -03:00
Juan Linietsky
c650d4e19c Merge branch 'master' of https://github.com/godotengine/godot 2015-12-08 17:48:03 -03:00
Juan Linietsky
09ff457185 made the exclusion of nodes from joints optional, fixes #3015 2015-12-08 17:47:12 -03:00
Juan Linietsky
e176bb6a7c Merge pull request #2719 from SaracenOne/clipping_fix 
Canvas Clipping fix
 2015-12-08 17:18:19 -03:00
Juan Linietsky
176916524d Merge pull request #2841 from akien-mga/pr-ustring-snprintf 
Cleanup calls to _snprintf in ustring
 2015-12-08 17:17:49 -03:00
Juan Linietsky
ac414c5581 Merge pull request #2849 from a12n/compobsd2 
Compile on OpenBSD
 2015-12-08 17:16:45 -03:00
Juan Linietsky
38ab47d2f9 Merge pull request #2865 from hurikhan/pr_fix_2791 
Added additional token checks for the shader if..else.. statement.
 2015-12-08 17:09:58 -03:00
Juan Linietsky
ff936c6b2e Merge pull request #2868 from akien-mga/pr-fix-can-move-to 
Fix can_move_to and rename it for more clarity
 2015-12-08 17:09:47 -03:00
Juan Linietsky
c26f66abde Merge pull request #2873 from neikeq/editor_layouts 
Editor layouts menu
 2015-12-08 17:09:38 -03:00