Commit graph

2393 commits

Author SHA1 Message Date
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
Juan Linietsky
800c575b13 maybe fix stop issue in theora 2015-11-04 09:46:25 -03:00
Juan Linietsky
0ed18537a3 Update README.md 2015-11-03 23:11:03 -03:00
Juan Linietsky
f201aa22fe Merge branch 'master' of https://github.com/okamstudio/godot 2015-11-03 23:05:09 -03:00
Juan Linietsky
eb419bee04 fix video/audio synchronization code in theora 2015-11-03 09:30:28 -03:00
Ovnuniarchos
3b2899bc42 Regex class documented. For some reason, parameter descriptors don\'t appear. 2015-11-03 04:39:42 +01:00
Saracen
6bcc2e1f83 Fixed broken set_loop_restart_time method in AudioStreamPlaybackOGGVorbis class. 2015-11-02 17:42:56 +00:00
Saracen
e3c50ac63d Aligned line edit fix. 2015-11-02 17:37:49 +00:00
Saracen
0006f035eb Added alignment to LineEdit GUI control. 2015-11-02 17:37:47 +00:00
Saracen
539bbd6654 Disable baked lighting sampling on shadeless materials. 2015-11-02 17:30:18 +00:00
Anton Yabchinskiy
3b9868d2e4 Merge branch 'master' of github.com:okamstudio/godot 2015-11-02 20:25:01 +03:00
Saracen
e011bcf162 Experimental retooling of AnimationTreePlayer to allow manual advancement. 2015-11-02 17:06:28 +00:00
Saracen
957baf48dc BoneAttachment fix. 2015-11-02 16:58:24 +00:00
Fabio Alessandrelli
203f069329 Expose AudioServer::free(RID rid) as AudioServer::free_rid(RID rid)
to avoid script error due to collision with Object method free
2015-11-02 17:54:33 +01:00
Saracen
ff363c94db Another clipping fix: default back to using window size to calculate clipping on viewports which don't have a rendertarget which fixes clipping on the editor viewport. 2015-11-02 16:48:11 +00:00
Saracen
5072134f41 Fixed canvas clipping on offscreen viewports. 2015-11-02 16:48:09 +00:00
Saracen
e723488aa3 Moved deleting sample player in OS finalize methods to before deleting audio server to prevent crash when exiting. 2015-11-02 16:36:41 +00:00
Saracen
53c9e8301c Ignore alpha materials in baked light ray-tracer. 2015-11-02 16:25:16 +00:00
Saracen
56b7567b55 Added missing saving support to animation editor. 2015-11-02 16:17:14 +00:00
Saracen
b54d96ceba Added ability to write directly to 4-dimensional position vector from within custom vertex shader code. Bugfixes to shader graph code generation concerning xforms. 2015-11-02 16:03:31 +00:00
Franklin Sobrinho
cd4d4b97e3 Fix issue #1275 2015-11-02 08:34:40 -03:00
Rémi Verschelde
b2f9acb8c9 Merge pull request #2680 from Brickcaster/onceagain
Added a few notes to classes.xml
2015-11-02 07:38:06 +01:00
Brickcaster
e0e4bcc6a6 Added description to classes/ScrollContainer
Added description to help understand how to utilize the ScrollContainer
node.
2015-11-01 20:58:07 -05:00
Brickcaster
18964798b7 classes/color - Documenting a trick with set_modulate
I wanted to document a trick using class color to highlight a sprite.
2015-11-01 20:58:06 -05:00
Rémi Verschelde
399b1b0474 Cosmetic fixes to SCons buildsystem
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
Rémi Verschelde
ae3d4ac193 Merge pull request #2646 from vnen/array-reference
Add missing Array class reference documentation
2015-11-01 20:33:57 +01:00
Rémi Verschelde
fc2c3bda5c Fix arguments parsing in the main function
Fixes #2611 which was a regression from 692216b86a.
The bogus behaviour considered that if there were more than one arguments left to parse,
they would be a pair of arguments (switch and its parameter), and thus skipped the next
argument in all cases (thus potentially skipping a "-editor", which triggered #2611).

This is fixed by checking first for arguments that don't expect a parameter, and only
afterwards for arguments that expect a parameter. And if a "pair" of arguments is not
valid, we no longer increment the counter.
2015-11-01 17:50:44 +01:00
Juan Linietsky
61ecb6a5e6 properly compute total time for ogg vorbis 2015-11-01 12:32:11 -03:00
eska
825bc8b293 Add default focus StyleBox to MenuButton 2015-11-01 10:33:28 +01:00
Juan Linietsky
281d6fac1e -some fixes to audio 2015-11-01 01:55:22 -03:00
Phobos Tro
8c0c279280 Fixing memleaks in main/main.cpp 2015-10-30 19:56:07 +08:00
ZuBsPaCe
fff7cedbe1 Fixes Visual Studio 2015 parallel builds (-j switch)
Reference: http://stackoverflow.com/questions/284778/what-are-the-implications-of-using-zi-vs-z7-for-visual-studio-c-projects

fatal error C1041: cannot open program database 'C:\godot\vc140.pdb'; if multiple CL.EXE write to the same .PDB file, please use /FS
2015-10-30 03:13:55 +01:00
ZuBsPaCe
b051914032 Fixes Visual Studio 2015 linker error (___iob_func)
The original, uncommited fix simply changed compiler flag /MT to /MD. This
would link the C runtime dynamically instead of statically. This is bad,
because some users would have to install the c runtime before starting the
editor.

You can find alot of info about this error, which can happen after
upgrading to VS 2015, and there are workarounds. But I realized, that the
only place, where iob_func is used, is in e_os.h of the openssl library.
The latest version already contains a workaround. I simply updated the
part in e_os.h.

Reference: https://github.com/openssl/openssl/blob/master/e_os.h#L268
Reference: https://software.intel.com/en-us/forums/intel-parallel-studio-beta-archived/topic/266345
Reference: https://connect.microsoft.com/VisualStudio/feedback/details/1144980/error-lnk2001-unresolved-external-symbol-imp-iob-func
Reference: http://stackoverflow.com/questions/757418/should-i-compile-with-md-or-mt

Here's the original error message:

   Creating library bin\godot.windows.tools.lib and object bin\godot.windows.tools.exp
drivers1.windows.tools.lib(t1_enc.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(txt_db.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(d1_enc.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(ui_openssl.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(cryptlib.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(pem_lib.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(d1_both.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(rsa_sign.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
bin\godot.windows.tools.exe : fatal error LNK1120: 1 unresolved externals
scons: *** [bin\godot.windows.tools.exe] Error 1120
2015-10-30 03:03:05 +01:00
Franklin Sobrinho
18392e28b6 Fix "Align with view" undo, fixes #1443 2015-10-29 20:44:12 -03:00