aboutsummaryrefslogtreecommitdiff
path: root/drivers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2518 from masoudbh3/godot-iconsJuan Linietsky2015-11-191-1/+6
|\ | | | | Add icon to exe file in windows export
| * change pe_bliss parent directory from /drivers to /toolsmasoud bh2015-11-0986-16449/+0
| |
| * Add icon to exe file in windows exportmasoud bh2015-11-0986-1/+16455
| | | | | | | | | | | | | | | | | | 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'.
* | Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilationJuan Linietsky2015-11-181-3/+3
|\ \ | | | | | | Visual studio 2015 compilation
| * | Fixes Visual Studio 2015 linker error (___iob_func)ZuBsPaCe2015-10-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #2707 from akien-mga/masterJuan Linietsky2015-11-1821-31/+1
|\ \ \ | | | | | | | | Cosmetic fixes to SCons buildsystem
| * | | Cosmetic fixes to SCons buildsystemRémi Verschelde2015-11-0121-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check
* | | | Merge pull request #2715 from SaracenOne/shader_fix_and_enhancementJuan Linietsky2015-11-183-108/+122
|\ \ \ \ | | | | | | | | | | Write to 4-dimensional position access and shader graph code generation fix.
| * | | | Added ability to write directly to 4-dimensional position vector from within ↵Saracen2015-11-023-108/+122
| |/ / / | | | | | | | | | | | | custom vertex shader code. Bugfixes to shader graph code generation concerning xforms.
* | | | Merge pull request #2724 from ↵Juan Linietsky2015-11-181-46/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | SaracenOne/disable_baked_light_sampling_on_shadeless Disable baked lighting sampling on shadeless materials.
| * | | | Disable baked lighting sampling on shadeless materials.Saracen2015-11-021-46/+50
| |/ / /
* | | | Merge pull request #2642 from leezh/nrex-updateJuan Linietsky2015-11-185-186/+679
|\ \ \ \ | | | | | | | | | | Updated nrex with new features
| * | | | Exposed RegEx expanded option to scriptsZher Huei Lee2015-11-072-4/+4
| | | | |
| * | | | Fixed segfault in RegEx.get_capture()Zher Huei Lee2015-11-071-1/+3
| | | | |
| * | | | Updated nrex to latest versionZher Huei Lee2015-11-073-172/+643
| | | | |
| * | | | Updated nrex for LookAhead supportZher Huei Lee2015-11-071-12/+32
| | |_|/ | |/| |
* | | | Merge pull request #2661 from romulox-x/lowMem2DJuan Linietsky2015-11-182-5/+14
|\ \ \ \ | | | | | | | | | | Added low_memory_2d_mode
| * | | | added low_memory_2d_mode, to indicate when 3D post processing buffers and ↵romulox_x2015-10-212-5/+14
| | |_|/ | |/| | | | | | | | | | viewport depth buffers should not be allocated
* | | | Merge pull request #2726 from SaracenOne/set_loop_restart_time_fixJuan Linietsky2015-11-181-1/+1
|\ \ \ \ | | | | | | | | | | Fixed broken set_loop_restart_time method in AudioStreamPlaybackOGGVorbis
| * | | | Fixed broken set_loop_restart_time method in AudioStreamPlaybackOGGVorbis class.Saracen2015-11-021-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #2737 from akien-mga/type-specific-error-outputJuan Linietsky2015-11-181-8/+18
|\ \ \ \ | | | | | | | | | | Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
| * | | | Fix error messages forcing a white font for subsequent messagesRémi Verschelde2015-11-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Display error type (error, warning, script error) in OS::print_errorRémi Verschelde2015-11-101-8/+18
| | |_|/ | |/| | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #2748 from vnen/fix-2744Juan Linietsky2015-11-181-0/+8
|\ \ \ \ | | | | | | | | | | Fix Opus driver build for VS2010 and VS2012
| * | | | Fix Opus driver build for VS2010 and VS2012George Marques2015-11-061-0/+8
| |/ / / | | | | | | | | | | | | Fix #2744
* | | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-11-185-27/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/theora/video_stream_theora.cpp
| * | | | tabsAriel Manzur2015-11-161-2/+2
| | | | |
| * | | | drivers and theoraAriel Manzur2015-11-162-9/+16
| | | | |
| * | | | Changed drviers/SCsub spaces to tabs.Aren Villanueva2015-11-161-20/+20
| | | | |
| * | | | Properly fixes compilation in an msys environment.Aren Villanueva2015-11-161-2/+1
| | | | |
| * | | | iOS compile fixes.Aren Villanueva2015-11-162-3/+3
| | | | |
| * | | | Optimised the oc_filter_hedge and oc_filter_vedge routines in theora a little.Aren Villanueva2015-11-161-16/+30
| | | | |
| * | | | Compile fixes for mingw msys2.Aren Villanueva2015-11-161-18/+25
| |/ / / | | | | | | | | | | | | The drivers directory has way too many source files being compiled for a single library file. The command line length limit was getting hit.
* / / / -Merged Script and Help tabsJuan Linietsky2015-11-171-9/+15
|/ / / | | | | | | | | | | | | | | | -Help tabs can be opened many at the same time -Color temperatures for opened scripts -Dominant script opening when switching scene tab
* | | maybe fix stop issue in theoraJuan Linietsky2015-11-041-1/+5
| | |
* | | fix video/audio synchronization code in theoraJuan Linietsky2015-11-032-12/+33
|/ /
* / properly compute total time for ogg vorbisJuan Linietsky2015-11-011-2/+1
|/
* -Ability to debug video memory usageJuan Linietsky2015-10-212-0/+39
| | | | -Small fix to xml saver (swapping > and <)
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-10-196-5/+21
|\
| * Merge pull request #2365 from Mavhod/patch-1Juan Linietsky2015-10-171-1/+1
| |\ | | | | | | get_date on Linux
| | * add ()Mavhod2015-08-131-1/+1
| | | | | | | | | Sorry, firt time I put it but had no compiled for check.
| | * get_date on LinuxMavhod2015-08-131-1/+1
| | | | | | | | | tm_mon is 0-11
| * | Merge pull request #2369 from Max-Might/masterJuan Linietsky2015-10-174-3/+19
| |\ \ | | | | | | | | Haiku: platform support
| | * \ Merge remote-tracking branch 'upstream/master'Kostadin Damyanov2015-10-13402-76760/+89700
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master'Kostadin Damyanov2015-09-0517-28/+62
| | |\ \ \
| | * | | | Haiku: move the audio driver to platform/haikuKostadin Damyanov2015-08-144-221/+0
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/master'Kostadin Damyanov2015-08-0921-1196/+1276
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Haiku: add sound supportKostadin Damyanov2015-07-264-0/+221
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/master'Kostadin Damyanov2015-06-263-7/+25
| | |\ \ \ \
| | * | | | | Haiku: fix the glew.c hackKostadin Damyanov2015-06-261-1/+5
| | | | | | |