summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2788 from masoudbh3/pck-file-nameRémi Verschelde2015-11-231-1/+11
|\
| * add priority to load binaryname.pckmasoud bh2015-11-201-2/+2
| * Load binaryname.pckmasoud bh2015-11-201-0/+10
* | Merge pull request #1820 from guilhermefelipecgs/masterRémi Verschelde2015-11-231-1/+0
|\ \ | |/ |/|
| * Remove duplicated filter, Fix #1795Guilherme Felipe2015-05-051-1/+0
* | 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
|\ \
| * | Fixes the make_doc.sh, <, > and & signs in descriptions that cause the parser...Aren Villanueva2015-11-194-2/+59
* | | -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 exportmasoud bh2015-11-091-1/+1
* | | Merge pull request #2707 from akien-mga/masterJuan Linietsky2015-11-185-10/+0
|\ \ \
| * | | Cosmetic fixes to SCons buildsystemRémi Verschelde2015-11-015-10/+0
| |/ /
* | | Merge pull request #2798 from bojidar-bg/patch-6Juan Linietsky2015-11-181-6/+6
|\ \ \
| * | | Change handling of invalid JSON escape sequences.Bojidar Marinov2015-11-161-6/+6
| |/ /
* | | 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_errorRémi Verschelde2015-11-101-2/+9
| |/ /
* | | Merge pull request #2749 from TheHX/fix_string_content_testJuan Linietsky2015-11-181-1/+1
|\ \ \
| * | | 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
* | -fixes to ring buffer (fixes network error)Juan Linietsky2015-10-213-7/+9
* | -Ability to debug video memory usageJuan Linietsky2015-10-215-2/+86
* | Merge pull request #2274 from MarianoGnu/masterJuan Linietsky2015-10-171-32/+32
|\ \
| * \ Merge branch 'master' of https://github.com/okamstudio/godotMarianoGNU2015-10-1626-812/+611
| |\ \
| * \ \ Merge branch 'master' of https://github.com/okamstudio/godotMariano Javier Suligoy2015-08-308-4/+106
| |\ \ \
| * | | | Edit default values. WARNING!!!Mariano Javier Suligoy2015-08-291-32/+32
* | | | | Merge pull request #2256 from sheepandshepherd/list-editsJuan Linietsky2015-10-171-2/+8
|\ \ \ \ \
| * | | | | 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 Vector3MrGreenTea2015-07-152-19/+29
| |/ / / / /
* | | | | | Merge pull request #2479 from firefly2442/cppcheck-unusedvarsJuan Linietsky2015-10-172-5/+0
|\ \ \ \ \ \
| * | | | | | 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. Close #2516Bojidar Marinov2015-09-241-1/+1
* | | | | | | | Merge pull request #2531 from bojidar-bg/patch-4Juan Linietsky2015-10-171-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | -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 qualit...Juan Linietsky2015-10-012-0/+108
* | | | | | | | | Large improvements on scene packing and managementreduz2015-10-103-2/+36
|/ / / / / / / /
* / / / / / / / 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