aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | Adjust openssl #defines to be libressl compatibleMatthew Kunjummen2017-10-172-4/+4
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected inability to build on systems using libressl instead of openssl (e. g. void linux) by adjusting the #defines in modules/openssl/stream_peer_openssl.cpp and modules/openssl/stream_peer_openssl.h to check if LIBRESSL_VERSION_NUMBER is defined (as done similarly in the following patch in freebsd: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219362 ).
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12194 from djrm/pr_visual_improvementsRémi Verschelde2017-10-182-175/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved viewport zoom and speed icons [ci skip]
| * | | | | | | | | | | | | | | | | | | | | | | 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 fields
| * | | | | | | | | | | | | | | | | | | | | | | 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=release
| * | | | | | | | | | | | | | | | | | | | | | 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 stack
| * | | | | | | | | | | | | | | | | | | | | | | 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 improvements
| * | | | | | | | | | | | | | | | | | | | | | Export attribute fixes and improvementsIgnacio Etcheverry2017-10-179-25/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow non-public fields to be exported as well (to avoid confusion). - Set PROPERTY_HINT_RESOURCE_TYPE for resource derived fields. - Support enums and automatically fill PROPERTY_HINT_ENUM's hint_string for enum fields.
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12172 from neikeq/jIgnacio Etcheverry2017-10-171-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take self-contained mode into consideration
| * | | | | | | | | | | | | | | | | | | | | | | 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 bar
| * | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VisualScript: Add space after "=" sign in variable list
| * | | | | | | | | | | | | | | | | | | | | | | | (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/
| * | | | | | | | | | | | | | | | | | | | | | | | [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 specular
| * | | | | | | | | | | | | | | | | | | | | | | Fix directional light specularHiroshi Ogawa2017-10-171-2/+2
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | SCons: Disable server platform as it does not buildRémi Verschelde2017-10-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #8361. [ci skip]
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12161 from RandomShaper/fix-log-overflowRémi Verschelde2017-10-161-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix formatting of debug log overflow
| * | | | | | | | | | | | | | | | | | | | | | | Fix formatting of debug log overflowPedro J. Estébanez2017-10-161-4/+8
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12087.
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12160 from RandomShaper/fix-shader-parseRémi Verschelde2017-10-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | Fix crash in shader parsing
| * | | | | | | | | | | | | | | | | | | | | | Fix crash in shader parsingPedro J. Estébanez2017-10-161-0/+2
|/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...that would happen if incorrect syntax was found just after an opening square bracket. Fixes #12046.
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12138 from neikeq/iRémi Verschelde2017-10-161-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | Avoid adding built-in script path to csproj
| * | | | | | | | | | | | | | | | | | | | | 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 function
| * | | | | | | | | | | | | | | | | | | | | | 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_nativescript_init
| * | | | | | | | | | | | | | | | | | | | | | [Nativescript] fix crash when loading a library with missing ↵Emmanuel Leblond2017-10-161-6/+12
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | godot_nativescript_init
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12141 from endragor/ios-sign-firstRémi Verschelde2017-10-162-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | Sign iOS dylibs before packaging
| * | | | | | | | | | | | | | | | | | | | | Sign iOS dylibs before packagingRuslan Mustakov2017-10-162-14/+14
|/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes allow to open the exported project in XCode and Run it immediately to begin debugging. Before these changes you'd have to sign GDNative libs and change Build Configuration manually.
* | | | | | | | | | | | | | | | | | | | | Merge pull request #12104 from akien-mga/monosgen-2Ignacio Etcheverry2017-10-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | mono: Request monosgen-2 explicitly via pkg-config
| * | | | | | | | | | | | | | | | | | | | mono: Request monosgen-2 explicitly via pkg-configRémi Verschelde2017-10-141-1/+1
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents GC mismatch between mono binary and library, fixes #11916.
* | | | | | | | | | | | | | | | | | | | Merge pull request #12135 from neikeq/gIgnacio Etcheverry2017-10-167-57/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Re-write SignalAwaiter implementation
| * | | | | | | | | | | | | | | | | | | Re-write SignalAwaiter implementationIgnacio Etcheverry2017-10-167-57/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old implementation had issues where you could only await on the same signal of the same source once.
* | | | | | | | | | | | | | | | | | | | Merge pull request #12126 from cbscribe/kcc_vsdocs2Rémi Verschelde2017-10-157-2/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] Various VisualScript* nodes [ci skip]
| * | | | | | | | | | | | | | | | | | | | [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 Particles2D
| * | | | | | | | | | | | | | | | | | | | [DOCS] documented and edited Particles2DKaukamieli2017-10-151-5/+7
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #11407 from toger5/selection_override_colorRémi Verschelde2017-10-156-18/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added option to keep font color on selection + use consistent selection color in help (fixes: #11501)
| * | | | | | | | | | | | | | | | | | | | | 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 ↵toger52017-09-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed based on the code theme anyways.
| * | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filesystem dock folder handling
| * | | | | | | | | | | | | | | | | | | | | | Add right click option to create folders.MillionOstrich2017-10-092-0/+58
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Rework DependencyRemoveDialog for deleting foldersMillionOstrich2017-10-094-70/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DependencyRemoveDialog now takes two lists (files and folders) to delete. Sort the folders above files in DependencyRemoveDialog & use some more icons. Stop files which will be deleted from also being listed as having broken dependencies. Add right-click option for removing folder to filesystem folder tree.
| * | | | | | | | | | | | | | | | | | | | | | Reworked rename & move for files & folders.MillionOstrich2017-10-092-174/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move/rename don't depend on the path variable anymore. Fixed dependencies not updating correctly when dragging folders in the folder tree. Dependencies will only update for files which sucessfully moved. Reduced code duplication between move & rename. Added rename & move options to folders tree.