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

2371 commits

This branch
This branch
All branches
Author SHA1 Message Date
neikeq
6b0423b191 Show select menu on button pressed (instead of released) 2015-11-19 15:47:04 +01:00
ZuBsPaCe
ce3216429e Added missing \n in script error output. 2015-11-19 15:35:18 +01:00
ZuBsPaCe
a5683def19 Nice error output padding. Code location behind " At: " is now aligned with the error message above. Also removed the dot after the file location. 2015-11-19 15:19:25 +01:00
ZuBsPaCe
42beb83178 Set console background color on windows in SetConsoleTextAttribute, otherwise text background will be black, which looks strange if the terminal color is not black. 2015-11-19 15:19:22 +01:00
ZuBsPaCe
a89c861931 Set output color of ERR_SCRIPT messages to purple. Same as on linux. 2015-11-19 15:19:20 +01:00
ZuBsPaCe
9f9452d023 Removed ANSI error codes from windows terminal error output. Windows does not support them. 
See: http://stackoverflow.com/questions/16755142/how-to-make-win32-console-recognize-ansi-vt100-escape-sequences
See: http://stackoverflow.com/questions/22777142/is-there-a-way-to-make-windows-output-ansi-escape-sequences?lq=1
 2015-11-19 15:19:18 +01:00
ZuBsPaCe
e23734363e Inconsistent code formatting in print_error (Newlines and spaces) 2015-11-19 15:19:16 +01:00
Juan Linietsky
b7a1599845 removed iconv dependency from pe_bliss 2015-11-19 11:15:32 -03:00
Juan Linietsky
fd5ee87c24 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	platform/windows/export/export.h
 2015-11-19 10:44:13 -03:00
Juan Linietsky
d3eb9e8c54 -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 2015-11-19 10:41:20 -03:00
Julian Murgia - StraToN
6d20ded6d7 Ask confirmation on closing a scene tab 2015-11-19 14:15:17 +01:00
Juan Linietsky
83316bcc9c Merge pull request #2824 from TheHX/split_container_property 
Fix SplitContainer bool properties
 2015-11-19 10:02:07 -03:00
Franklin Sobrinho
bc3b5847b0 Fix SplitContainer bool properties 2015-11-19 09:56:04 -03:00
Juan Linietsky
232b1a3fef Merge pull request #2822 from kurikaesu/master 
HTTPClient docs & request functionality + fixes
 2015-11-19 09:18:09 -03:00
Aren Villanueva
30d4889131 Fixes https://github.com/godotengine/godot/issues/2821 2015-11-19 22:02:03 +11:00
Aren Villanueva
5c7e9e7e63 Fixes the make_doc.sh, <, > and & signs in descriptions that cause the parser to break. 
Documentation for HTTPClient.
Added a query_string_from_dict method to HTTPClient to create a x-www-form-urlencoded valid query string for GET and POST messages.
String now has http_escape() and http_unescape() methods to help facilitate the above query_string_from_dict method.
 2015-11-19 22:01:42 +11:00
Rémi Verschelde
9fe85da881 Merge pull request #2817 from Ovnuniarchos/DocRegex2 
RegEx class documentation updated to reflect latest changes.
 2015-11-19 11:32:32 +01:00
Rémi Verschelde
91687f63b6 Merge pull request #2823 from ZuBsPaCe/pe_bliss-vs2015-compile-error 
Fixes Visual Studio compile error due to pe_bliss
 2015-11-19 11:25:58 +01:00
Ovnuniarchos
07110c3a14 Changed capabilities list. 2015-11-19 11:18:22 +01:00
ZuBsPaCe
2b36da0f79 Fixes Visual Studio compile error due to pe_bliss 
Error: C2039: 'min': is not a member of 'std'
Reason: #2518 introduced pe_bliss

Fix: Visual Studio 2015 & 2013 need to include algorithm header before string, otherwise std:min cannot be used.
See: http://stackoverflow.com/questions/17409956
 2015-11-19 11:07:46 +01:00
Rémi Verschelde
da4f618139 Merge pull request #2820 from masoudbh3/fix-windows-export 
Fix Windows Export
 2015-11-19 09:16:30 +01:00
masoud bh
094c6c70d7 Fix Windows Export 2015-11-19 11:33:39 +03:30
Juan Linietsky
36d620c633 Merge pull request #2818 from godotengine/revert-2717-light_baker_transluscent 
Revert "Ignore alpha materials in baked light ray-tracer."
 2015-11-19 00:51:11 -03:00
Juan Linietsky
daf3182442 Revert "Ignore alpha materials in baked light ray-tracer." 2015-11-19 00:50:25 -03:00
Juan Linietsky
068b177c12 Merge pull request #2292 from blackwc/can_export 
Improve export validation
 2015-11-19 00:35:04 -03:00
Juan Linietsky
a0564efb65 Merge pull request #2349 from neikeq/dock_patch 
Hide right UR and BR dock slots by default
 2015-11-19 00:31:09 -03:00
Juan Linietsky
b6084a8a62 Merge pull request #2364 from neikeq/textedit_select 
Some TextEdit selection improvements
 2015-11-19 00:30:39 -03:00
Juan Linietsky
9a7769f194 Merge pull request #2444 from TheHX/issue_2117 
Fix for problem when drawing CollisionPolygon when parented (#2117)
 2015-11-19 00:23:17 -03:00
Juan Linietsky
fe449a6235 Merge pull request #2445 from TheHX/issue_2113 
Possible fix for crash on replacing Path2D node (#2113)
 2015-11-19 00:22:53 -03:00
Juan Linietsky
2dac9ab2ef Merge pull request #2447 from TheHX/issue_1275 
Fix crash after undo when editing Polygon2D (#1275)
 2015-11-19 00:21:46 -03:00
Juan Linietsky
6a3484260d Merge pull request #2451 from PeaceSells50/FixForFilesystemAdd 
Fixed bug with adding an instance from the FIleSystem dialog.
 2015-11-19 00:20:54 -03:00
Juan Linietsky
0168947084 Merge pull request #2518 from masoudbh3/godot-icons 
Add icon to exe file in windows export
 2015-11-19 00:08:47 -03:00
Juan Linietsky
ea035f308b Merge pull request #2644 from Ovnuniarchos/BBCodeDocs 
BBCode is now allowed anywhere in the inline documentation.
 2015-11-19 00:07:32 -03:00
Juan Linietsky
6a7ae77847 Merge pull request #2696 from AlexHolly/restart-feature-on-running 
replay on play if already playing for scene and main + switch icon to…
 2015-11-19 00:06:34 -03:00
Juan Linietsky
33aa019e4f Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation 
Visual studio 2015 compilation
 2015-11-18 23:56:06 -03:00
Juan Linietsky
3118c192bd Merge pull request #2786 from neikeq/node_select_menu 
Added selection menu to spatial and canvas editors
 2015-11-18 23:46:46 -03:00
Ovnuniarchos
a9a330645b Merge branch 'master' into BBCodeDocs 2015-11-19 01:19:19 +01:00
neikeq
f84dc8e59d Added selection menu to spatial and canvas editors 2015-11-19 00:19:00 +01:00
Saracen
dd00452997 Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color 
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
 2015-11-18 23:18:10 +00:00
Juan Linietsky
94fdd01241 Merge pull request #2702 from TheHX/fix_align_with_view 
Fix 3D editor align with current view
 2015-11-18 19:58:52 -03:00
Juan Linietsky
fe9f4eda9e Merge pull request #2706 from phobos-tro/main_memleaks 
Fixing memleaks in main/main.cpp
 2015-11-18 19:43:45 -03:00
Juan Linietsky
0c3386b2ed Merge pull request #2707 from akien-mga/master 
Cosmetic fixes to SCons buildsystem
 2015-11-18 19:43:28 -03:00
Juan Linietsky
3337191d5a Merge pull request #2709 from eska014/fix-default-menubutton-styleboxes 
Fix default StyleBoxes of MenuButton
 2015-11-18 19:43:02 -03:00
Juan Linietsky
1a473e42d5 Merge pull request #2711 from akien-mga/parameters-parsing 
Fix arguments parsing in the main function
 2015-11-18 19:42:44 -03:00
Juan Linietsky
63e84e1824 Merge pull request #2798 from bojidar-bg/patch-6 
Change handling of invalid JSON escape sequences.
 2015-11-18 19:41:46 -03:00
Juan Linietsky
f0aeb036d1 Merge pull request #2715 from SaracenOne/shader_fix_and_enhancement 
Write to 4-dimensional position access and shader graph code generation fix.
 2015-11-18 19:36:47 -03:00
Juan Linietsky
fce4c6eecb Merge pull request #2716 from SaracenOne/animation_saving_fix 
Added missing saving support to animation editor.
 2015-11-18 19:35:57 -03:00
Juan Linietsky
ba9ebe6b03 Merge pull request #2717 from SaracenOne/light_baker_transluscent 
Ignore alpha materials in baked light ray-tracer.
 2015-11-18 19:35:42 -03:00
Juan Linietsky
067c96d26f Merge pull request #2718 from SaracenOne/audio_system_crash_fix 
Fixed Audio System Crash
 2015-11-18 19:35:22 -03:00
Juan Linietsky
734e3751c6 Merge pull request #2720 from SaracenOne/bone_attachment_fix 
BoneAttachment fix.
 2015-11-18 19:33:28 -03:00