aboutsummaryrefslogtreecommitdiff
path: root/core (follow)
Commit message (Collapse)AuthorAgeFilesLines
* compile fixesJuan Linietsky2015-11-191-1/+1
|
* fix compile error in some msvc version (snprintf not found)Ariel Manzur2015-11-191-1/+6
|
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-11-194-2/+59
|\ | | | | | | | | Conflicts: platform/windows/export/export.h
| * Fixes the make_doc.sh, <, > and & signs in descriptions that cause the ↵Aren Villanueva2015-11-194-2/+59
| | | | | | | | | | | | | | | | parser to break. Documentation for HTTPClient. Added a query_string_from_dict method to HTTPClient to create a x-www-form-urlencoded valid query string for GET and POST messages. String now has http_escape() and http_unescape() methods to help facilitate the above query_string_from_dict method.
* | -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260Juan Linietsky2015-11-193-5/+5
|/
* Merge pull request #2518 from masoudbh3/godot-iconsJuan Linietsky2015-11-191-1/+1
|\ | | | | Add icon to exe file in windows export
| * Add icon to exe file in windows exportmasoud bh2015-11-091-1/+1
| | | | | | | | | | | | | | | | | | 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 #2707 from akien-mga/masterJuan Linietsky2015-11-185-10/+0
|\ \ | | | | | | Cosmetic fixes to SCons buildsystem
| * | Cosmetic fixes to SCons buildsystemRémi Verschelde2015-11-015-10/+0
| |/ | | | | | | | | | | - Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check
* | Merge pull request #2798 from bojidar-bg/patch-6Juan Linietsky2015-11-181-6/+6
|\ \ | | | | | | Change handling of invalid JSON escape sequences.
| * | Change handling of invalid JSON escape sequences.Bojidar Marinov2015-11-161-6/+6
| |/ | | | | | | Instead of reporting an error, just ignore the first backslash and continue. Fixes #2521
* | Merge pull request #2737 from akien-mga/type-specific-error-outputJuan Linietsky2015-11-181-2/+9
|\ \ | | | | | | Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
| * | Display error type (error, warning, script error) in OS::print_errorRémi Verschelde2015-11-101-2/+9
| |/ | | | | | | | | | | 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 #2749 from TheHX/fix_string_content_testJuan Linietsky2015-11-181-1/+1
|\ \ | | | | | | Fix String content test
| * | Fix String content testFranklin Sobrinho2015-11-061-1/+1
| |/
* / Implement Quat multiply operator, and xform methodFranklin Sobrinho2015-11-113-2/+18
|/
* -fixed a quite serious scene corruption bug when saving that has been around ↵Juan Linietsky2015-10-211-2/+3
| | | | | | for months. good thing no one ran into it :P
* -fixes to ring buffer (fixes network error)Juan Linietsky2015-10-213-7/+9
| | | | -fixes to invalid disabling of commands on scene tree dock
* -Ability to debug video memory usageJuan Linietsky2015-10-215-2/+86
| | | | -Small fix to xml saver (swapping > and <)
* Merge pull request #2274 from MarianoGnu/masterJuan Linietsky2015-10-171-32/+32
|\ | | | | Improve Visual Shader Editor responsiveness
| * Merge branch 'master' of https://github.com/okamstudio/godotMarianoGNU2015-10-1626-812/+611
| |\ | | | | | | | | | | | | # Solved Conflicts: # tools/editor/property_editor.cpp
| * \ Merge branch 'master' of https://github.com/okamstudio/godotMariano Javier Suligoy2015-08-308-4/+106
| |\ \ | | | | | | | | | | | | | | | | | | | | # Solved Conflicts: # tools/editor/property_editor.cpp # tools/editor/property_editor.h
| * | | Edit default values. WARNING!!!Mariano Javier Suligoy2015-08-291-32/+32
| | | | | | | | | | | | | | | | Do not merge these changes, default values are not compiled into shaders yet!
* | | | Merge pull request #2256 from sheepandshepherd/list-editsJuan Linietsky2015-10-171-2/+8
|\ \ \ \ | | | | | | | | | | List::move_before updates front/back pointers, fixes #2255
| * | | | Fix List::move_before for front and back elementssheepandshepherd2015-07-101-2/+8
| | | | |
* | | | | Merge pull request #2266 from MrGreenTea/masterJuan Linietsky2015-10-172-19/+29
|\ \ \ \ \ | | | | | | | | | | | | added floor() and ceil() to Vector3
| * | | | | added floor() and ceil() to Vector3MrGreenTea2015-07-152-19/+29
| |/ / / /
* | | | | Merge pull request #2479 from firefly2442/cppcheck-unusedvarsJuan Linietsky2015-10-172-5/+0
|\ \ \ \ \ | | | | | | | | | | | | ran cppcheck, found unused variables
| * | | | | ran cppcheck, found unused variablesfirefly24422015-09-162-5/+0
| | | | | |
* | | | | | Merge pull request #2520 from bojidar-bg/patch-3Juan Linietsky2015-10-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add missing \n to world_wrap.
| * | | | | | Add missing \n to world_wrap. Close #2516Bojidar Marinov2015-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | The issue was that world_wrap would skip over newlines, without adding them to the output.
* | | | | | | Merge pull request #2531 from bojidar-bg/patch-4Juan Linietsky2015-10-171-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix parameters of funcRef::call_func
| * | | | | | | Update mi.nameBojidar Marinov2015-09-251-1/+1
| | | | | | | |
| * | | | | | | Removed a badly listed parameter from funcRef::call_func...Bojidar Marinov2015-09-251-1/+0
| | | | | | | |
* | | | | | | | Merge pull request #2584 from buresu/fix-parentheses-equality-warningsJuan Linietsky2015-10-172-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | [OSX Clang] Fix parentheses-equality warnings
| * | | | | | | fix parentheses-equality warnings of osx clang近藤 直人2015-10-092-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godotreduz2015-10-162-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: scene/resources/packed_scene.h
| * | | | | | | | -A little More control about pixel snapping in 2DJuan Linietsky2015-10-132-1/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of https://github.com/okamstudio/godotreduz2015-10-104-405/+513
|\| | | | | | |
| * | | | | | | newline fixesreduz2015-10-082-405/+405
| | | | | | | |
| * | | | | | | -Added ability to use cubic interpolation on image resize (little more ↵Juan Linietsky2015-10-012-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | quality on non-po2 resizing) -Added ability for exporter to shrink images to non-integer values. Helps if you want to convert your game artwork from 1080->720 or similar
* | | | | | | | Large improvements on scene packing and managementreduz2015-10-103-2/+36
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
* / / / / / / Fix some copy-paste mistakes in linear/db volume functionsRémi Verschelde2015-09-261-2/+2
|/ / / / / /
* | | | | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-09-243-4/+13
|\| | | | |
| * | | | | Fix _xml_unescape, as suggested by @reduzBojidar Marinov2015-09-231-2/+2
| | | | | |
| * | | | | Flip &lt; and &gt; in String::xml_escape. Close #2511Bojidar Marinov2015-09-231-2/+2
| | | | | | | | | | | | | | | | | | Before > referred to &lt; and < to &gt;, which is incorrect...
| * | | | | Properly implement OS.alert() from script, and use xmessage on X11Juan Linietsky2015-09-212-0/+9
| |/ / / /
* / / / / Added ability to set custom mouse cursors. Not hardware accelerated yet.Juan Linietsky2015-09-244-378/+7
|/ / / /
* | | | merged some stuff for okamJuan Linietsky2015-09-039-19/+36
| | | |
* | | | new editor settings customization of where to run the game from the editorJuan Linietsky2015-08-301-1/+1
| |_|/ |/| |