aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* template is now potJuan Linietsky2016-05-042-1/+1
|
* base for translationJuan Linietsky2016-05-043-1/+5916
|
* Merge pull request #4544 from mattiascibien/fix-double-includeRémi Verschelde2016-05-041-1/+0
|\ | | | | Removed double incluson of scene/gui/dialogs.h
| * Remove double incluson of scene/gui/dialogs.hMattias Cibien2016-05-041-1/+0
|/ | | | | Removed a double inclusion of scene/gui/dialogs.h in file editor_file_dialog.h
* Merge pull request #4543 from djrm/better_hint_allRémi Verschelde2016-05-042-3/+4
|\ | | | | Changed barely visible PROPERTY_HINT_ALL_FLAGS buttons for checkboxes
| * Changed barely visible PROPERTY_HINT_ALL_FLAGS buttons for checkboxesDaniel J. Ramirez2016-05-032-3/+4
| |
* | Merge pull request #4541 from vnen/pr-fix-win64-buildRémi Verschelde2016-05-043-3/+4
|\ \ | | | | | | Fix windows 64-bits build.
| * | Fix windows 64-bits build.George Marques2016-05-033-3/+4
| | | | | | | | | | | | | | | | | | | | | The change in `tools/doc/doc_data.cpp` is needed because the MSVC compiler does not support variable length arrays. Fix #4113
* | | Merge pull request #4540 from mrezai/openssl-1.0.2hRémi Verschelde2016-05-0435-153/+365
|\ \ \ | | | | | | | | Update OpenSSL to 1.0.2h
| * | | Update OpenSSL to 1.0.2hmrezai2016-05-0335-153/+365
| | | |
* | | | Merge pull request #4535 from sanikoyes/Pr-crash-dynamic-fontRémi Verschelde2016-05-041-0/+4
|\ \ \ \ | | | | | | | | | | Fix crash in dynamic font
| * | | | Fix crash in dynamic fontsanikoyes2016-05-031-0/+4
| | | | |
* | | | | Merge remote-tracking branch 'origin/master'Juan Linietsky2016-05-03278-5157/+13138
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4542 from Hinsbart/ds3Rémi Verschelde2016-05-031-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Fix ds3 gamepad mapping
| | * | | | Fix ds3 gamepad mappingHinsbart2016-05-041-0/+1
| |/ / / /
| * | | | Merge pull request #4539 from Paulb23/autocomplete_duplicate_items_issue_1824Rémi Verschelde2016-05-031-0/+4
| |\ \ \ \ | | | | | | | | | | | | Autocomplete no longer shows duplicates, issue #1824
| | * | | | Autocomplete no longer shows duplicates, issue 1824Paulb232016-05-031-0/+4
| | | |_|/ | | |/| |
| * | | | Merge pull request #4538 from CowThing/classref-editRémi Verschelde2016-05-031-0/+16
| |\ \ \ \ | | |/ / / | |/| | | Input Documentation
| | * | | Input DocumentationCowThing2016-05-031-0/+16
| |/ / / | | | | | | | | | | | | Input Documentation
| * | | Sync class referenceRémi Verschelde2016-05-031-63/+107
| | | |
| * | | Merge pull request #4533 from djrm/doc_data_merge_fixRémi Verschelde2016-05-031-0/+20
| |\ \ \ | | |_|/ | |/| | Fixed documentation generator for polymorphic functions
| | * | Fixed documentation generator for polymorphic functionsDaniel J. Ramirez2016-05-031-0/+20
| | | |
| * | | Merge pull request #4536 from mattiascibien/fix-set-window-resizable-winRémi Verschelde2016-05-031-1/+1
| |\ \ \ | | | | | | | | | | Fixed behavior of OS.set_window_resizable
| | * | | Fixed behavior of OS.set_window_resizableMattias Cibien2016-05-031-1/+1
| | | |/ | | |/| | | | | | | | | Should fix #4428. * Minimize button is not hidden anymore
| * | | Merge pull request #4532 from vnen/pr-update-opus-1.1.2Rémi Verschelde2016-05-03270-5041/+12794
| |\ \ \ | | |/ / | |/| | Update Opus driver to 1.1.2
| | * | Update Opus driver to 1.1.2George Marques2016-05-02270-5041/+12794
| | | | | | | | | | | | | | | | And opusfile to 0.7.
| * | | Merge pull request #4523 from neikeq/pr-issue-4504Rémi Verschelde2016-05-031-1/+5
| |\ \ \ | | |_|/ | |/| | Fix checking unsaved changes only in current scene
| | * | Fix checking unsaved changes only in current sceneIgnacio Etcheverry2016-05-021-1/+5
| | | |
| * | | Merge pull request #4531 from djrm/classref-editRémi Verschelde2016-05-021-0/+3
| |\ \ \ | | | | | | | | | | Documented bool methods
| | * | | Documented bool methodsDaniel J. Ramirez2016-05-021-0/+3
| |/ / /
| * | | Merge pull request #4529 from djrm/classref-floatRémi Verschelde2016-05-021-0/+5
| |\ \ \ | | | | | | | | | | Documented float
| | * | | Documented floatDaniel J. Ramirez2016-05-021-0/+5
| | | | |
| * | | | Merge pull request #4528 from djrm/classref-intRémi Verschelde2016-05-021-0/+3
| |\ \ \ \ | | | | | | | | | | | | Documented int methods
| | * | | | Documented int methodsDaniel J. Ramirez2016-05-021-0/+3
| |/ / / /
| * | | | Merge pull request #4527 from ↵Juan Linietsky2016-05-021-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | godotengine/revert-4518-animationplayer-finished-name Revert "added name parameter on animationplayer finished"
| | * | | | Revert "added name parameter on animationplayer finished"Juan Linietsky2016-05-021-3/+2
| |/ / / /
| * | | | Merge pull request #4526 from CowThing/classref-editRémi Verschelde2016-05-021-0/+7
| |\ \ \ \ | | | | | | | | | | | | Documenting Timer and AnimationPlayer
| | * | | | Finished AnimationPlayer DocumentationCowThing2016-05-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Finished AnimationPlayer Documentation
| | * | | | Finished Timer DocumentationCowThing2016-05-021-0/+3
| | |/ / / | | | | | | | | | | | | | | | Finished Timer Documentation
| * | | | Merge pull request #4274 from Griefchief/masterRémi Verschelde2016-05-021-0/+89
| |\ \ \ \ | | | | | | | | | | | | Fixes 64 bit MSVC builds, disables bits parameter
| | * | | | Fixes 64 bit MSVC builds, disables bits parameterAleksandar Danilovic2016-04-101-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also Enables automatic detection of architecture for the MSVC compilers. Builds without assembly optimisations for x64 Closes issue #3098 Signed-off-by: Aleksandar Danilovic <greatgames.alexandar@gmail.com>
| * | | | | Merge pull request #4524 from SaracenOne/glsl_includesRémi Verschelde2016-05-021-27/+26
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Fix error in GLSL #include code
| | * | | | Fix error in GLSL #include codeSaracen2016-05-021-27/+26
| | | | | |
| * | | | | Merge pull request #4518 from AlexHolly/animationplayer-finished-nameRémi Verschelde2016-05-021-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | added name parameter on animationplayer finished
| | * | | | | added name parameter on animationplayer finishedAlexander Holland2016-05-021-2/+3
| | | | | | |
| * | | | | | Merge pull request #4505 from SaracenOne/glsl_includesRémi Verschelde2016-05-021-53/+85
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | / / | | |_|_|/ / | |/| | | | Support for #includes in built-in GL shaders.
| | * | | | Support for #includes in built-in GL shaders.Saracen2016-05-011-53/+85
| | | | | |
* | | | | | Modified editor strings to be translatable in the futureJuan Linietsky2016-05-0396-2103/+2135
| | | | | |
* | | | | | Add ability to send drag events to another objectJuan Linietsky2016-05-033-1/+38
|/ / / / / | | | | | | | | | | | | | | | will be documented/tested later
* | | | | Support for dynamic fonts (TTF)Juan Linietsky2016-05-018-1/+3974
| | | | | | | | | | | | | | | | | | | | | | | | | Added support for DynamicFont, which can load a TTF of any size to use as a font. No import required.