summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-22Fix for 64Bit builds with VC from command lineVinzenz Feenstra
Previously builds for 64 Bit targets on the x64 Native Tools Command Prompt failed while trying to link the 64Bit build godot objects with 32Bit vc libraries. This was due to wrong library directories. Since there are the environment variables INCLUDE and LIB which are containing the correct paths this patch uses those now to fix the linking issue. Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-22Fix handling for CFLAGS and LINKFLAGS like for CCFLAGSVinzenz Feenstra
Previously CFLAGS and LINKFLAGS were passed as a single quoted argument to the compiler or linker. This patch splits the paramters. Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-21Merge pull request #132 from samsaga2/masterokamstudio
Removed OF
2014-02-21Removed OFVictor M
2014-02-20Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-20-run script in editorJuan Linietsky
-add search docs dialog that returns places string was found -added flash
2014-02-20Merge pull request #74 from rrockru/masterokamstudio
Fixed build issue on linux (missing webp include path).
2014-02-20Merge pull request #88 from marynate/PR-More_gitignoreokamstudio
More gitignore
2014-02-20Merge pull request #89 from marynate/PR-Fix_iOS_Simulator_Buildokamstudio
Fix iOS Simulator Build
2014-02-20Merge pull request #104 from Nr7/masterokamstudio
Fixed two incorrect bindings in Physics2DServer
2014-02-20Merge pull request #107 from bscranton/masterokamstudio
Windows StreamPeerWinsock::set_nodelay implementation
2014-02-20Merge pull request #109 from vinzenz/project-exportokamstudio
tools/editor/project_export: tree_vb already has a parent
2014-02-20Merge pull request #116 from olifly/masterokamstudio
Added function "get_tiles_ids" to TreeSet.
2014-02-20Merge pull request #123 from Terseus/fix-113_editor-settings-xml-corruptionokamstudio
Fix #113 editor_settings.xml corruption
2014-02-20Merge pull request #124 from kevinhartman/masterokamstudio
Fixed OS X retina initial videomode size
2014-02-20Merge pull request #128 from marynate/PR-stop-tracking-logo-hokamstudio
Stop tracking platform/server/logo.h for it will be autogenerated
2014-02-20Merge pull request #110 from vinzenz/108-fixokamstudio
Fix for Issue #108
2014-02-19wtfJuan Linietsky
2014-02-19Merge remote-tracking branch 'upstream/master'Olafur Haukur Flygenring
2014-02-19Stop tracking platform/server/logo.h for it will be autogeneratedmarynate
2014-02-19Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-19-improved physics ccdJuan Linietsky
-html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
2014-02-18OSX current_videomode size is now initialized with correct resolution based ↵Kevin Hartman
on backing store. Fixes issue where content does not correctly fit in window on retina displays.
2014-02-18Fix #113 editor_settings.xml corruptionTerseus
In the `parse_tag` method of the `class ResourceInteractiveLoaderXML`, the class responsible of loading the editor_settings.xml file, the properties' values are loaded directly into an `String` object but the file contents are always UTF-8, which leads to garbage in the XML file when saved. This patch reads the properties' values in a `CharString` and translate them to UTF-8.
2014-02-18Merge pull request #111 from vinzenz/obsolete-editor-plugin-removalreduz
Removal of obsolete editor plugins Fixes #64
2014-02-18Merge pull request #118 from Terseus/fix-19_non-ascii-pathsreduz
Fix #19 Can't open project (with non-ASCII path)
2014-02-18Merge pull request #115 from marynate/PR-open-pm-in-editorreduz
Able to open project manager inside editor (Scene->Project Manager)
2014-02-18Fix #19 Can't open project (with non-ASCII path)Terseus
In `class OS_Unix` the arguments in the `execute` method are converted to UTF-8, but in the `main` program's method they're inserted into a wide-char `Vector` before translating them from UTF-8 and thus the non-ASCII characters are lost. This fix converts the `argv` elements to UTF-8 using `String::utf8` before inserting them in the `Vector`.
2014-02-18Added function "get_tiles_ids" to TreeSet.Olafur Haukur Flygenring
2014-02-18Able to open project manager inside editor (Scene->Project Manager)marynate
Remove unnecessary include of project_manager.h
2014-02-17Removal of obsolete editor plugins Fixes #64Vinzenz Feenstra
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-17Fix for Issue #108Vinzenz Feenstra
Entering a somethign in the 'Path field' triggers the `_path_changed` signal being triggered. This in turn calls Globals::localize_path(const String& p_path) with the currently entered string. localize_path then is replacing backslashes with slashes and calls afterwards `String::simplify_path` String::simplify_path is checking wheter a string starts with: - res:// - local:// - user:// If any of those is true it removes this section. However, if any of the first letters of those are matching begins_with returns true, which is wrong. It should only return true if the whole string is matched at the beginning. This caused the whole desaster and lead localize_path into an endless loop because out of `u` suddenly became user:// which it then tried again to localize and so on. This fix, fixes the root of the problem which is begins_with which should not return true if not the whole search string was matched. Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-17tools/editor/project_export: tree_vb already has a parentVinzenz Feenstra
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-17windows StreamPeerWinsock::set_nodelay implementationBenjamin Scranton
StreamPeerWinsock::set_nodelay was a no-op. Copied the code from the POSIX implementation because it is also correct on Windows per http://msdn.microsoft.com/en-us/library/windows/desktop/ms740476%28v=vs.85%29.aspx.
2014-02-17Fixed two incorrect bindings in Physics2DServerNr7
2014-02-16Merge pull request #94 from marynate/PR-Fixed_Issue_93okamstudio
Fixed #93 Build error with latest commit
2014-02-16Fixed #93 Build error with latest commitmarynate
2014-02-15-project settings are saved when changedJuan Linietsky
-load() was in the GDScript docs but missing in the scripting-different music for platformer 2D and 3D -fix how documentation is generated, built in doc browser should be always up to date -copypaste, scrolling, etc in builtin doc -built-in scripts get saved now (though debugger may not always work on them) -Theme can be set to controls as a property
2014-02-15UIApplication setStatusBarHidden:animation has been deprecated since iOS ↵marynate
3.2, use setStatusBarHidden:withAnimation instead.
2014-02-15Update SConstruct build scripts for iOS Simulator buildmarynate
2014-02-15More gitignoremarynate
2014-02-15-fixed bug in Button now exporting font propertyJuan Linietsky
-made GUI Theme editor usable -editor does not allow to export or create .pck in the same path as a project -changed .pck format (lacked support for versioning so couldn't change it), previous was causing crashes and is now incompatible, just re-export. -will not look for .pck files recursively, was causing unexpected behaviors -fixed execution of Godot in paths with non unicode characters in Windows, OSX and Linux.
2014-02-14Merge pull request #77 from vinzenz/shaderlang-test-crash-fixreduz
Fixed crash bug in the shaderlang test
2014-02-14Merge pull request #69 from vinzenz/icon-issuereduz
x11: Set icon issue fix
2014-02-14Fixed crash bug in the shaderlang testVinzenz Feenstra
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-14Fixed build issue on linux (missing webp include path).rrockru
Tested on ArchLinux.
2014-02-14Addressed comments by Terseus to match the specVinzenz Feenstra
size_t -> long uint8_t -> unsigned char Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-14x11: Set icon issue fixVinzenz Feenstra
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-14Merge pull request #62 from vinzenz/ccflags-handlingreduz
Fix CCFLAGS handling
2014-02-14Merge pull request #59 from marynate/masterreduz
Add .gitignore to ignore autogenerated files in source repository
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 21:22:43 +0000