summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-30Fixes Visual Studio 2015 parallel builds (-j switch)ZuBsPaCe
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-30Fixes Visual Studio 2015 linker error (___iob_func)ZuBsPaCe
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-29Fixes Visual Studio 2015 compile error C3688 (invalid literal suffix)ZuBsPaCe
tools\editor\editor_node.cpp(3037): error C3688: invalid literal suffix 'VERSION_FULL_NAME'; literal operator or literal operator template 'operator ""VERSION_FULL_NAME' not found
2015-10-25Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-10-25-Fixed a bug in scrollcontainer not respecting expand flagJuan Linietsky
If you relied on this, make sure the children of your scrollcontainer is set to expand with the expand flag in either vertical or horizontal axis
2015-10-25Merge pull request #2677 from phobos-tro/x11-memleakOkam Studio
X11 -- Fixing memleaks
2015-10-26Made the Atom net_wm_icon localPhobos Tro
2015-10-25Fixing memory leaksPhobos Tro
2015-10-22Merge pull request #2663 from romulox-x/cadisplaylinkpunto-
Added CADisplayLink setting for iOS
2015-10-22Added setting for CADisplayLink on iOS, so you no longer need to recompile ↵steve
to change it
2015-10-21-fixed a quite serious scene corruption bug when saving that has been around ↵Juan Linietsky
for months. good thing no one ran into it :P
2015-10-21Merge pull request #2655 from StraToN/fix-tab-buttonsJuan Linietsky
Fix #2623 closing a 3D scene using the close button [x] on the tab crashes Godot editor
2015-10-22Fix #2623Julian Murgia - StraToN
2015-10-21-fixes to ring buffer (fixes network error)Juan Linietsky
-fixes to invalid disabling of commands on scene tree dock
2015-10-21-Ability to debug video memory usageJuan Linietsky
-Small fix to xml saver (swapping > and <)
2015-10-20Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-10-20-work in progress implementation of NDEE's theme It's NOT DONE YETJuan Linietsky
2015-10-20-Fixes on atlas import to save memory if mipmaps are not usedJuan Linietsky
-Make the video memory visible to improve debugging
2015-10-19Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-10-19-some fixes to where screen is read from rasterizerJuan Linietsky
-fixed bug in ogg vorbis looping -properly flushing audiostream rb when stopping
2015-10-18Merge pull request #2630 from firefly2442/rasterizer-comparison-fixJuan Linietsky
rasterizer comparison fix
2015-10-18rasterizer comparison fixfirefly2442
2015-10-18Merge pull request #2617 from MarianoGnu/masterJuan Linietsky
TextureProgress FillMode
2015-10-18Add fill_degrees to limitate radial fillingMarianoGNU
2015-10-17Merge branch 'master' of https://github.com/okamstudio/godotMarianoGNU
2015-10-17Add fill modes. Clockwise, Counter-CW and center-offsetMarianoGNU
2015-10-17fixes broken 3D in editorJuan Linietsky
2015-10-17-remove path after inheriting, fixes #2616Juan Linietsky
2015-10-17-Propertly restrict renaming of nodes in inherited scenes, fixes #2615Juan Linietsky
2015-10-17remove unpexpected revert button, fixes #2614Juan Linietsky
2015-10-17-Added const to a reference, should fix #2613Juan Linietsky
2015-10-17Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-10-17-fixes disability to remove instanced nodes when reopening scene. Fixes #2610Juan Linietsky
2015-10-17Merge pull request #2274 from MarianoGnu/masterJuan Linietsky
Improve Visual Shader Editor responsiveness
2015-10-17Fix crash when using a Scalar Uniform node to GraphShaderMarianoGNU
2015-10-17Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-10-17Merge pull request #1899 from guilhermefelipecgs/fix_#1897Juan Linietsky
Fix for scroll_to_line and search functions, fix #1897
2015-10-17Merge pull request #2053 from rodolforg/fix-import-button-labelJuan Linietsky
Small fix for Import Game dialog labels
2015-10-17Merge pull request #2203 from volzhs/fix_android_paymentsJuan Linietsky
Fix android payments
2015-10-17Merge pull request #2250 from PeaceSells50/AddedGridMapSettingsJuan Linietsky
Added GridMap settings which allows the user to enter a pick distance.
2015-10-17Merge pull request #2256 from sheepandshepherd/list-editsJuan Linietsky
List::move_before updates front/back pointers, fixes #2255
2015-10-17Merge pull request #2266 from MrGreenTea/masterJuan Linietsky
added floor() and ceil() to Vector3
2015-10-17Merge pull request #2330 from FEDE0D/parallax_fixJuan Linietsky
ParallaxBackground: added option to ignore camera zoom
2015-10-17Merge pull request #2357 from volzhs/prevent-to-change-tool-modeJuan Linietsky
prevent to change tool mode when control key is pressed
2015-10-17Merge pull request #2362 from AlexHolly/update-scene-tab-fixJuan Linietsky
[UI-FIX] - Update scene tabs on save
2015-10-17Merge pull request #2365 from Mavhod/patch-1Juan Linietsky
get_date on Linux
2015-10-17Merge pull request #2369 from Max-Might/masterJuan Linietsky
Haiku: platform support
2015-10-17Merge pull request #2380 from StraToN/tabs-buttonsJuan Linietsky
Tab close button + display policies + application on Scenes Tabs
2015-10-17Merge pull request #2395 from MrMormon/patch-1Juan Linietsky
Fixed misspelled local variable for code clarity
2015-10-17Merge pull request #2402 from ERIIX/masterJuan Linietsky
Properly free enemies after death in 3d platformer demo.