aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #169 from bibby/makedocreduz2014-03-123-5/+20
|\
| * Closes bb-code tags, allowing make_doc.sh to finishbibby2014-03-053-5/+20
* | Merge pull request #170 from mutantgames/master.forkreduz2014-03-121-1/+1
|\ \
| * | Solved bug to select external editor urlsasori2014-03-051-1/+1
* | | Merge pull request #175 from MysticTreeGames/masterreduz2014-03-123-0/+48
|\ \ \
| * | | Adding CodeLite hidden folder to .gitignoreMoritz Wundke2014-03-081-1/+1
| * | | Adding CodeLite and KDE files to .gitignoreMoritz Wundke2014-03-081-0/+8
| * | | Do not set number of jobs if already specifiedMoritz Wundke2014-03-081-2/+5
| * | | Fixed typoMoritz Wundke2014-03-071-1/+1
| * | | Speed build time up by 6 using multiple jobsMoritz Wundke2014-03-071-0/+7
| * | | Addinf basic makefile to support many C/C++ IDEs out thereMoritz Wundke2014-03-061-0/+30
| |/ /
* | | Merge pull request #187 from marynate/PR-fix-windows-utf8reduz2014-03-121-1/+29
|\ \ \
| * | | remove unnecessary error check when converting ascii to unicodemarynate2014-03-111-5/+2
| * | | Convert windows main entry arguments to UTF8; Set locale to system default fo...marynate2014-03-111-1/+32
| |/ /
* | | Merge pull request #189 from sanikoyes/hotfix-imereduz2014-03-125-2/+28
|\ \ \
| * | | export a unicode font may crash because chunks out of range...sanikoyes2014-03-111-1/+1
| * | | fixed editor NodePath propertysanikoyes2014-03-112-1/+4
| * | | fix gdscript path parse errorsanikoyes2014-03-111-0/+1
| * | | fix-multi-char-ime-input-chinesesanikoyes2014-03-111-0/+22
| |/ /
* | | Merge pull request #188 from marynate/PR-fix-compression-returnreduz2014-03-121-2/+2
|\ \ \
| * | | Fix Compression bug: wrong premature return.marynate2014-03-111-2/+2
| |/ /
* | | Merge pull request #192 from sanikoyes/hotfix-android-text-inputreduz2014-03-124-6/+304
|\ \ \ | |/ / |/| |
| * | fix android input doe's not work(line edit/text edit)sanikoyes2014-03-124-6/+304
|/ /
* | Merge pull request #150 from marynate/PR-export-physics-sleep-thresholdreduz2014-02-282-66/+67
|\ \
| * | Export linear/angular velocity sleep threshold;Change default linear velocity...marynate2014-02-272-66/+67
* | | Merge pull request #147 from vinzenz/string-improvementsreduz2014-02-282-3/+36
|\ \ \
| * | | Adding unit tests for begins_withVinzenz Feenstra2014-02-261-0/+31
| * | | Fix string version of begins_withVinzenz Feenstra2014-02-261-3/+5
* | | | Merge pull request #151 from marynate/PR-fix-line-edit-bind-selectreduz2014-02-281-1/+1
|\ \ \ \
| * | | | Fix LineEdit select method bindingmarynate2014-02-271-1/+1
| | |/ / | |/| |
* | | | Merge pull request #152 from marynate/PR-ux-property-field-auto-selectreduz2014-02-283-1/+59
|\ \ \ \ | |/ / / |/| | |
| * | | Auto select custom property value field when pop up, user can start typing to...marynate2014-02-273-1/+59
|/ / /
* | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2014-02-264-3/+17
|\| |
| * | Merge pull request #133 from vinzenz/masterokamstudio2014-02-262-2/+13
| |\ \
| | * | Fix for 64Bit builds with VC from command lineVinzenz Feenstra2014-02-221-2/+2
| | * | Fix handling for CFLAGS and LINKFLAGS like for CCFLAGSVinzenz Feenstra2014-02-221-0/+11
| * | | Merge pull request #136 from marynate/PR-fix-scenedock-instance-btnokamstudio2014-02-261-1/+1
| |\ \ \
| | * | | Instance button of SceneDock now workingmarynate2014-02-231-1/+1
| * | | | Merge pull request #137 from marynate/PR-expose-f-key-to-center-selokamstudio2014-02-261-0/+3
| |\ \ \ \
| | * | | | Add F key to center 3d viewport to selected nodemarynate2014-02-231-0/+3
| | |/ / /
* | / / / fixieJuan Linietsky2014-02-261-0/+3
|/ / / /
* | | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2014-02-263-2/+3
|\ \ \ \
| * \ \ \ Merge pull request #141 from vinzenz/texture-import-plugin-typookamstudio2014-02-261-1/+1
| |\ \ \ \
| | * | | | Typo in 'Atlas Texture' import menu entryVinzenz Feenstra2014-02-241-1/+1
| * | | | | Merge pull request #144 from C4NCER/masterokamstudio2014-02-262-1/+2
| |\ \ \ \ \
| | * | | | | add logo.h to .gitignoreC4NCER2014-02-251-0/+1
| | * | | | | Switch from using deprecated Options class to VariablesC4NCER2014-02-251-1/+1
* | | | | | | Merge branch 'freebsd-cleanup' of https://github.com/robmessick/godot into ro...Juan Linietsky2014-02-262-2/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Unused comparison causes error on clang. Suspect this was a typo.Rob Messick2014-02-231-1/+1
| * | | | | | ifdef out body of probe_joystick and process_joysticks on freebsd until a wor...Rob Messick2014-02-231-0/+4