aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | Adjust openssl #defines to be libressl compatibleMatthew Kunjummen2017-10-172-4/+4
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12194 from djrm/pr_visual_improvementsRémi Verschelde2017-10-182-175/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Improved viewport zoom and speed iconsDaniel J. Ramirez2017-10-172-175/+8
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12209 from neikeq/mRémi Verschelde2017-10-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Mono: Fix warning about exported static fieldsIgnacio Etcheverry2017-10-181-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12208 from neikeq/lRémi Verschelde2017-10-182-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Mono: Fix build with tools=no or target=releaseIgnacio Etcheverry2017-10-182-0/+4
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12121 from Paulb23/editor_settings_undo_redoRémi Verschelde2017-10-173-31/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Separated Editor settings and Scene undo redo stackPaulb232017-10-153-31/+84
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12178 from neikeq/kRémi Verschelde2017-10-179-25/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Export attribute fixes and improvementsIgnacio Etcheverry2017-10-179-25/+94
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12172 from neikeq/jIgnacio Etcheverry2017-10-171-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Take self-contained mode into considerationIgnacio Etcheverry2017-10-171-6/+15
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12128 from Zylann/zoom_speed_iconGilles Roudiere2017-10-173-24/+234
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Added icon under zoom/speed indicator barMarc Gilleron2017-10-153-24/+234
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12173 from homer666/visualscript-variable-list-equals-spaceAndreas Haas2017-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | (VS) Add space after "=" sign in variable listhomer6662017-10-171-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #11953 from touilleMan/pluginscriptThomas Herzog2017-10-1720-11/+1937
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | [GDnative] add pluginscript \o/Emmanuel Leblond2017-10-1720-11/+1937
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12169 from hi-ogawa/fix-directional-light-specularRémi Verschelde2017-10-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Fix directional light specularHiroshi Ogawa2017-10-171-2/+2
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | SCons: Disable server platform as it does not buildRémi Verschelde2017-10-171-0/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12161 from RandomShaper/fix-log-overflowRémi Verschelde2017-10-161-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Fix formatting of debug log overflowPedro J. Estébanez2017-10-161-4/+8
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12160 from RandomShaper/fix-shader-parseRémi Verschelde2017-10-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix crash in shader parsingPedro J. Estébanez2017-10-161-0/+2
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12138 from neikeq/iRémi Verschelde2017-10-161-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Avoid adding built-in script path to csprojIgnacio Etcheverry2017-10-161-6/+9
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12136 from neikeq/hRémi Verschelde2017-10-164-34/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Improve signature of signal target generated functionIgnacio Etcheverry2017-10-164-34/+108
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12131 from touilleMan/nativescript-fix-loadingRémi Verschelde2017-10-161-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | [Nativescript] fix crash when loading a library with missing godot_nativescri...Emmanuel Leblond2017-10-161-6/+12
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12141 from endragor/ios-sign-firstRémi Verschelde2017-10-162-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Sign iOS dylibs before packagingRuslan Mustakov2017-10-162-14/+14
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #12104 from akien-mga/monosgen-2Ignacio Etcheverry2017-10-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | mono: Request monosgen-2 explicitly via pkg-configRémi Verschelde2017-10-141-1/+1
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #12135 from neikeq/gIgnacio Etcheverry2017-10-167-57/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Re-write SignalAwaiter implementationIgnacio Etcheverry2017-10-167-57/+97
* | | | | | | | | | | | | | | | | | | | Merge pull request #12126 from cbscribe/kcc_vsdocs2Rémi Verschelde2017-10-157-2/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | [DOCS] Various VisualScript* nodesChris Bradfield2017-10-157-2/+41
* | | | | | | | | | | | | | | | | | | | | Merge pull request #12124 from Kaukamieli/Particles2DChris Bradfield2017-10-151-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | [DOCS] documented and edited Particles2DKaukamieli2017-10-151-5/+7
* | | | | | | | | | | | | | | | | | | | | Merge pull request #11407 from toger5/selection_override_colorRémi Verschelde2017-10-156-18/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | do not overlap current line with selection colortoger52017-09-282-7/+16
| * | | | | | | | | | | | | | | | | | | | | always use the adaptive code theme selection color in help since it wont chan...toger52017-09-281-4/+4
| * | | | | | | | | | | | | | | | | | | | | keep font color on selection as defaulttoger52017-09-286-7/+42
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #11428 from MillionOstrich/filesystem-dock-foldersRémi Verschelde2017-10-154-367/+462
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add right click option to create folders.MillionOstrich2017-10-092-0/+58
| * | | | | | | | | | | | | | | | | | | | | | Rework DependencyRemoveDialog for deleting foldersMillionOstrich2017-10-094-70/+149
| * | | | | | | | | | | | | | | | | | | | | | Reworked rename & move for files & folders.MillionOstrich2017-10-092-174/+176