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

63881 Commits

Author SHA1 Message Date
Juan Linietsky 18e014a193 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	drivers/theora/video_stream_theora.cpp
 2015-11-18 04:49:28 -03:00
Juan Linietsky 3974fbb852 -fixed tabs 2015-11-18 04:47:41 -03:00
Juan Linietsky 17bde66cd8 missing icons 2015-11-17 09:47:18 -03:00
Juan Linietsky 081a236c67 -Merged Script and Help tabs 
-Help tabs can be opened many at the same time
-Color temperatures for opened scripts
-Dominant script opening when switching scene tab
 2015-11-17 09:46:08 -03:00
Bojidar Marinov f59a1fd50d Change handling of invalid JSON escape sequences. 
Instead of reporting an error, just ignore the first backslash and continue.
Fixes #2521
 2015-11-16 17:05:39 +02:00
Ariel Manzur 4811313056 tabs 2015-11-16 09:29:00 -03:00
Ariel Manzur 906c6374dc drivers and theora 2015-11-16 08:44:03 -03:00
punto- 4893c932bb Merge pull request #2795 from kurikaesu/master 
iPhone platform fixes {resubmit}
 2015-11-15 23:52:29 -03:00
Aren Villanueva 4f40a3dc65 Changed drviers/SCsub spaces to tabs. 2015-11-16 13:03:51 +11:00
Aren Villanueva e68c2c6c2a Use macros to determine which iOS SDK we have in order to be backwards compatible with older SDKs when fixing template compilation issues. 2015-11-16 12:35:54 +11:00
Aren Villanueva e420b69606 Properly fixes compilation in an msys environment. 2015-11-16 11:14:40 +11:00
Aren Villanueva 402c24ec8b iOS compile fixes. 2015-11-16 11:10:07 +11:00
Aren Villanueva 00d79a6d6c Optimised the oc_filter_hedge and oc_filter_vedge routines in theora a little. 2015-11-16 11:10:07 +11:00
Aren Villanueva c1fdc3b5d1 Compile fixes for mingw msys2. 
The drivers directory has way too many source files being compiled for a single library file. The command line length limit was getting hit.
 2015-11-16 11:10:07 +11:00
masoud bh 14b9579748 Skip META-INF from Android Template 2015-11-14 20:40:22 +03:30
Ariel Manzur 8adc4ef65b windows crash and bind placeholder method 2015-11-14 11:14:17 -03:00
Juan Linietsky 8420c24f7f -better integration of ndee's theme 2015-11-13 20:56:44 -03:00
neikeq ae65dfa4ec Small PopupMenu changes 2015-11-13 22:03:17 +01:00
Bojidar Marinov bff8b04f52 Change popup_menu.cpp as proposed in #2011 
Closes #2011
 2015-11-13 12:16:55 +02:00
Franklin Sobrinho 222d112f49 Implement Ctrl + backspace/delete to delete words 2015-11-12 13:35:48 -03:00
eska bbc42a159c Allow extending from Object in GDScript 2015-11-12 15:50:20 +01:00
Neiro 724b7edfd7 Remove of use_exclude_ctrl_bones (was removed in io_scene_dae by Sergey Lapin, commit 4210d5e459) in godot_export_manager.py 2015-11-12 17:47:04 +03:00
Juan Linietsky 1d7e9c4ba5 -fixes to animatedsprite used with atlas 2015-11-11 17:39:06 -03:00
Franklin Sobrinho 541812e999 Implement Quat multiply operator, and xform method 2015-11-11 11:30:55 -03:00
sanikoyes 1d3fa162c8 Fix node renaming bug when using the '.' character 
Fixed by making '.' (and '/') illegal character in node names when adding via the rename feature.
 2015-11-10 23:35:52 +01:00
Rémi Verschelde 9ab7de243f Fix error messages forcing a white font for subsequent messages 
This is achieved using the "no specific formatting" \E[0m tag.
Fixes #2566.

Also remove the hardcoded black background colour and use default bolded terminal font for error message.
Error logs should now look good both on terminals with a dark and light background colour.
 2015-11-10 18:30:40 +01:00
Rémi Verschelde 6334895088 Display error type (error, warning, script error) in OS::print_error 
Previously all types of errors would be shown as ERROR, thus making for example warnings (WARN_PRINT) somewhat aggressive.
ERROR is displayed in red, WARNING in yellow and SCRIPT ERROR in magenta (though the latter does not seem used so far).
Fixes #1127.
 2015-11-10 18:29:34 +01:00
Juan Linietsky 61c4c5795f -support for stereo ima-adpcm sample compression & playback 
-support for converting samples to ima-adpcm upon export
 2015-11-09 00:49:18 -03:00
Trond Abusdal 41a161647d * Winsock UDP messages sent to an unavailable target causing WSAECONNRESET will no longer close the socket. 
* Ensured that unsigned<->signed conversion would not cause wrong buffer size values sent to recvfrom.
 2015-11-09 01:33:16 +01:00
Trond Abusdal f809cd44ea Fixed PacketPeerUDP getting wrongly closed due to recvfrom using rb.data_left instead of rb.space_left. 2015-11-09 00:22:05 +01:00
masoud bh 69fa5ed1c0 add copyright text 2015-11-09 02:24:41 +03:30
masoud bh 55b8c3ee48 change pe_bliss parent directory from /drivers to /tools 2015-11-09 02:24:01 +03:30
masoud bh 24f3f43457 Add icon to exe file in windows export 
add version_info and icon sections in "export to windows platform".
add version_info and icon to godot exe file (editor & template exe).
fix an problem in image class.
change all default icons to android export icon (a little more rounded).
create an python script for convert file to cpp byte array for use in
'splash.h'.
 2015-11-09 02:23:58 +03:30
Saracen c1d19ad258 New shader feature: change the colour of shadows on a per-material basis. 
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
 2015-11-08 03:54:55 +00:00
neikeq b70e2b754d TextEdit: Properly scroll vertically when selecting text with mouse drag 2015-11-07 16:04:32 +01:00
Rémi Verschelde 3fcfdfec0a Merge pull request #2645 from Ovnuniarchos/DocCurvePathPFollow 
Documented classes Curve*, Path*, and PathFollow*
 2015-11-07 13:15:47 +01:00
Ovnuniarchos 8abdb43aab Documented classes Curve*, Path*, and PathFollow* 2015-11-07 13:09:00 +01:00
Rémi Verschelde 7675a3b535 Merge pull request #2727 from Ovnuniarchos/DocRegex 
RegEx class documented.
 2015-11-07 12:57:36 +01:00
Zher Huei Lee f0d246a7bc Exposed RegEx expanded option to scripts 2015-11-07 11:03:24 +00:00
Zher Huei Lee bb3724a4cc Updated RegEx demos 2015-11-07 11:03:24 +00:00
Zher Huei Lee 26b977c967 Fixed segfault in RegEx.get_capture() 2015-11-07 11:03:24 +00:00
Zher Huei Lee 6d54f82ab4 Updated nrex to latest version 2015-11-07 11:03:24 +00:00
Zher Huei Lee 8766d3100d Updated nrex for LookAhead support 2015-11-07 11:03:24 +00:00
MarianoGNU 7828986b1c Add <Select All>(Ctrl+A) shortcut to LineEdit. 2015-11-06 19:02:57 -03:00
Franklin Sobrinho d5fbd1d262 Fix String content test 2015-11-06 18:52:15 -03:00
George Marques 03d4c05150 Fix Opus driver build for VS2010 and VS2012 
Fix #2744
 2015-11-06 18:59:21 -02:00
Franklin Sobrinho 8d48cf95b9 Add Tree checkbox check/uncheck behavior when pressing enter 2015-11-05 12:20:45 -03:00
Franklin Sobrinho 467ee040c4 Fix Range exp_edit property 2015-11-04 15:38:02 -03:00
Juan Linietsky dde6396f22 more fixes 2015-11-04 09:54:23 -03:00
Juan Linietsky 66e96e7a87 Merge branch 'master' of https://github.com/okamstudio/godot 2015-11-04 09:46:56 -03:00