aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #169 from bibby/makedocreduz2014-03-123-5/+20
|\ | | | | Closes bb-code tags, allowing make_doc.sh to finish
| * 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 url
| * | Solved bug to select external editor urlsasori2014-03-051-1/+1
| | | | | | | | | | | | https://github.com/okamstudio/godot/issues/145
* | | Merge pull request #175 from MysticTreeGames/masterreduz2014-03-123-0/+48
|\ \ \ | | | | | | | | Engine build improvements
| * | | 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
| | | | | | | | | | | | | | | | | | | | Adding aggresive build mode that spawns num_core+1 jobs. This speeds up build time by 6. On my 8 core machine I'm down from 6m:16s to 1m:34s.
| * | | Addinf basic makefile to support many C/C++ IDEs out thereMoritz Wundke2014-03-061-0/+30
| |/ / | | | | | | | | | | | | | | | | | | Make file is configured by default to act identically as a default SCons build. Baseic actions such as all and clean will be supported by default by quite all IDE for building and rebuilding. Additionaly you can configure your targets for release, debug or profile mode.
* | | Merge pull request #187 from marynate/PR-fix-windows-utf8reduz2014-03-121-1/+29
|\ \ \ | | | | | | | | Fixed bug: Godot wont start in windows when inside non-ascii directory
| * | | 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 ↵marynate2014-03-111-1/+32
| |/ / | | | | | | | | | | | | | | | for locale-awared console output; memery clearnup
* | | Merge pull request #189 from sanikoyes/hotfix-imereduz2014-03-125-2/+28
|\ \ \ | | | | | | | | Merging!
| * | | export a unicode font may crash because chunks out of range...sanikoyes2014-03-111-1/+1
| | | | | | | | | | | | | | | | set MemoryPoolDynamicStatic::MAX_CHUNKS to 65536
| * | | 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.
| * | | 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)
| * | 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 to project settings
| * | Export linear/angular velocity sleep threshold;Change default linear ↵marynate2014-02-272-66/+67
| | | | | | | | | | | | velocity sleep threshold to 0.1;Fixed type treshold
* | | Merge pull request #147 from vinzenz/string-improvementsreduz2014-02-282-3/+36
|\ \ \ | | | | | | | | begins_with string version fix
| * | | Adding unit tests for begins_withVinzenz Feenstra2014-02-261-0/+31
| | | | | | | | | | | | | | | | Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
| * | | Fix string version of begins_withVinzenz Feenstra2014-02-261-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
* | | | Merge pull request #151 from marynate/PR-fix-line-edit-bind-selectreduz2014-02-281-1/+1
|\ \ \ \ | | | | | | | | | | Fix LineEdit select method binding
| * | | | 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
| * | | Auto select custom property value field when pop up, user can start typing ↵marynate2014-02-273-1/+59
|/ / / | | | | | | | | | to change value right away.
* | | 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
| |\ \ | | | | | | | | More fixes to the build system
| | * | Fix for 64Bit builds with VC from command lineVinzenz Feenstra2014-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Fix handling for CFLAGS and LINKFLAGS like for CCFLAGSVinzenz Feenstra2014-02-221-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Merge pull request #136 from marynate/PR-fix-scenedock-instance-btnokamstudio2014-02-261-1/+1
| |\ \ \ | | | | | | | | | | Instance button of SceneDock now working
| | * | | 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 node
| | * | | | 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 entry
| | * | | | Typo in 'Atlas Texture' import menu entryVinzenz Feenstra2014-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
| * | | | | Merge pull request #144 from C4NCER/masterokamstudio2014-02-262-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | move away from deprecated Options class and update .gitignore
| | * | | | | 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 ↵Juan Linietsky2014-02-262-2/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | robmessick-freebsd-cleanup
| * | | | | | 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 ↵Rob Messick2014-02-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | working implementation is completed