summaryrefslogtreecommitdiff
path: root/core
AgeCommit message (Collapse)Author
2015-11-24Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
Conflicts: main/main.cpp
2015-11-24-work in progress resourceparser and .tscn parser. Still non-functionalJuan Linietsky
-fixed theora so it can compile theoralib but not theora -fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24Correct retvals of String::to_ascii() and String::to_utf8()est31
Both return RawArray, not String. My fault from commit f83f96cb44a5c4f65c6271d0a98606b489adc488.
2015-11-23Fix return type of Matrix32 member varsRémi Verschelde
Thanks to @bojidar-bg for localising the issue.
2015-11-23Merge pull request #2788 from masoudbh3/pck-file-nameRémi Verschelde
Load binaryname.pck
2015-11-23Merge pull request #1820 from guilhermefelipecgs/masterRémi Verschelde
Remove duplicated filter, Fix #1795
2015-11-20add priority to load binaryname.pckmasoud bh
2015-11-20Load binaryname.pckmasoud bh
if not found data.pck search for binaryname.pck in linux and windows
2015-11-19compile fixesJuan Linietsky
2015-11-19fix compile error in some msvc version (snprintf not found)Ariel Manzur
2015-11-19Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
Conflicts: platform/windows/export/export.h
2015-11-19-remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260Juan Linietsky
2015-11-19Fixes the make_doc.sh, <, > and & signs in descriptions that cause the ↵Aren Villanueva
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.
2015-11-19Merge pull request #2518 from masoudbh3/godot-iconsJuan Linietsky
Add icon to exe file in windows export
2015-11-18Merge pull request #2707 from akien-mga/masterJuan Linietsky
Cosmetic fixes to SCons buildsystem
2015-11-18Merge pull request #2798 from bojidar-bg/patch-6Juan Linietsky
Change handling of invalid JSON escape sequences.
2015-11-18Merge pull request #2737 from akien-mga/type-specific-error-outputJuan Linietsky
Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
2015-11-18Merge pull request #2749 from TheHX/fix_string_content_testJuan Linietsky
Fix String content test
2015-11-16Change handling of invalid JSON escape sequences.Bojidar Marinov
Instead of reporting an error, just ignore the first backslash and continue. Fixes #2521
2015-11-11Implement Quat multiply operator, and xform methodFranklin Sobrinho
2015-11-10Display error type (error, warning, script error) in OS::print_errorRémi Verschelde
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.
2015-11-09Add icon to exe file in windows exportmasoud bh
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'.
2015-11-06Fix String content testFranklin Sobrinho
2015-11-01Cosmetic fixes to SCons buildsystemRémi Verschelde
- Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check
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-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-17Merge pull request #2274 from MarianoGnu/masterJuan Linietsky
Improve Visual Shader Editor responsiveness
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 #2479 from firefly2442/cppcheck-unusedvarsJuan Linietsky
ran cppcheck, found unused variables
2015-10-17Merge pull request #2520 from bojidar-bg/patch-3Juan Linietsky
Add missing \n to world_wrap.
2015-10-17Merge pull request #2531 from bojidar-bg/patch-4Juan Linietsky
Fix parameters of funcRef::call_func
2015-10-17Merge pull request #2584 from buresu/fix-parentheses-equality-warningsJuan Linietsky
[OSX Clang] Fix parentheses-equality warnings
2015-10-16Merge branch 'master' of https://github.com/okamstudio/godotMarianoGNU
# Solved Conflicts: # tools/editor/property_editor.cpp
2015-10-16Merge branch 'master' of https://github.com/okamstudio/godotreduz
Conflicts: scene/resources/packed_scene.h
2015-10-13-A little More control about pixel snapping in 2DJuan Linietsky
2015-10-10Merge branch 'master' of https://github.com/okamstudio/godotreduz
2015-10-10Large improvements on scene packing and managementreduz
-Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-09fix parentheses-equality warnings of osx clang近藤 直人
2015-10-08newline fixesreduz
2015-10-01-Added ability to use cubic interpolation on image resize (little more ↵Juan Linietsky
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
2015-09-26Fix some copy-paste mistakes in linear/db volume functionsRémi Verschelde
2015-09-25Update mi.nameBojidar Marinov
2015-09-25Removed a badly listed parameter from funcRef::call_func...Bojidar Marinov
2015-09-24Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-09-24Added ability to set custom mouse cursors. Not hardware accelerated yet.Juan Linietsky
2015-09-24Add missing \n to world_wrap. Close #2516Bojidar Marinov
The issue was that world_wrap would skip over newlines, without adding them to the output.
2015-09-23Fix _xml_unescape, as suggested by @reduzBojidar Marinov
2015-09-23Flip &lt; and &gt; in String::xml_escape. Close #2511Bojidar Marinov
Before > referred to &lt; and < to &gt;, which is incorrect...