aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improved breakpoint marker position, and scales with font sizePaulb232016-06-072-4/+6
|
* Merge pull request #5084 from J08nY/issue-5051Juan Linietsky2016-06-071-1/+1
|\ | | | | Windows: Hide mouse on MOUSE_MODE_CAPTURED
| * Windows: Hide mouse on MOUSE_MODE_CAPTUREDJ08nY2016-06-071-1/+1
| | | | | | | | Fixes #5051
* | Merge pull request #4861 from brakhane/negative-indexingJuan Linietsky2016-06-072-249/+72
|\ \ | | | | | | Add support for Python-like negative indexing
| * | Add support for Python-like negative indexingDennis Brakhane2016-06-052-6/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Negative indexing is a useful feature in Python, especially when combined with array slicing. Array slicing will hopefully be implemented later, but negative indexing is useful in its own right. A negative index is indexing from the end of an array, "array[-1] == array[array.size()-1]", using a negative index larger/smaller than the length of the array is still an error. While primarily useful for arrays and strings, support is also added to "array like" structures like Vector3 and Color. This is done just to be consistent; vector3[2] is much clearer than vector3[-1], but disallowing it while allowing it for an array with 3 elements seems confusing.
| * | Move repetitive code to macrosDennis Brakhane2016-06-051-243/+38
| | | | | | | | | | | | | | | | | | | | | | | | In preparation for the following "allow negative indexing" commit, replace the repetitive array "set index" and "get index" code with macros. no functional changes were made, the resulting machine code is unchanged.
* | | Merge pull request #5057 from pkowal1982/masterRémi Verschelde2016-06-075-18/+94
|\ \ \ | |_|/ |/| | Improved Blender/Collada -colonly import creating collision shapes fo…
| * | Improved Blender/Collada -colonly import creating collision shapes for emptiesPawel Kowal2016-06-055-18/+94
| | |
* | | Merge pull request #5083 from J08nY/classrefRémi Verschelde2016-06-072-3/+258
|\ \ \ | | | | | | | | Added classref for Image, ImageTexture, LargeTexture
| * | | Classref for: ImageTexture, Image, LargeTextureJ08nY2016-06-071-0/+52
| | | |
| * | | Exposed Image.INTERPOLATE_*J08nY2016-06-071-0/+3
| | | |
| * | | Sync classrefJ08nY2016-06-071-3/+203
|/ / /
* | | Merge pull request #4729 from volzhs/android-23Rémi Verschelde2016-06-0712-158/+51
|\ \ \ | | | | | | | | Supporting Android API 23 (Android 6.0)
| * | | Add comments for NotificationCompat to support API < 16volzhs2016-05-253-3/+5
| | | |
| * | | fix compatibility for Android API 14 with supporting API 23volzhs2016-05-245-12/+14
| | | | | | | | | | | | | | | | | | | | using ``NotificationCompat`` in ``support-v4`` library will increase APK filesize a little bit, but it guarantees to run OK with API 4+ tested with API 19 and 23 devices
| * | | Supporting Android API 23 (Android 6.0)volzhs2016-05-2010-151/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we update build gradle to use ``compileSdkVersion 23``, ``org.apache.http`` package causes error. (issue #4711) We need to use ``useLibrary 'org.apache.http.legacy'`` to solve this problem. To use ``useLibrary``, we need to use latest gradle also. And now, we faced another problem with ``APK Expansion`` java sources. ``` /platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java 137 : mCurrentNotification.setLatestEventInfo(mContext, mCurrentTitle, mCurrentText, mContentIntent); // causes error ``` So, some of APK Expansion java sources are updated by referencing commits from https://github.com/danikula/Google-Play-Expansion-File And dropped V3CustomNotification.java which was for android 3.0, since godot supports android 14 (4.0) above officially. Unfortunately, another problem, The 'MissingTranslation' error was occurred. So, build.gradle is updated to use ``disable 'MissingTranslation'`` Additionally, I updated ``buildToolsVersion``, ``targetSdkVersion`` to latest version. I tested APK Expansion funtionality on Android 6.0 (Nexus 9, Nexus 6p) and Android 4.4 (Galaxy Note 2) with Google Developer console.
* | | | Fix indentation issues in last commitsRémi Verschelde2016-06-074-32/+30
| | | | | | | | | | | | | | | | Ping @reduz.
* | | | Merge pull request #5078 from godotengine/revert-5054-fix-implicit-extendspunto-2016-06-062-8/+5
|\ \ \ \ | | | | | | | | | | Revert "Fix implicit GDScript Reference inheritance"
| * | | | Revert "Fix implicit GDScript Reference inheritance"punto-2016-06-062-8/+5
|/ / / /
* | | | Merge pull request #4092 from sanikoyes/Pr-etc1-pkm-loadingJuan Linietsky2016-06-064-1/+118
|\ \ \ \ | | | | | | | | | | Add etc1(pkm) texture loading support
| * | | | Add etc1(pkm) texture loading supportsanikoyes2016-03-194-1/+118
| | | | |
* | | | | Merge pull request #4101 from SaracenOne/listenerJuan Linietsky2016-06-069-19/+410
|\ \ \ \ \ | | | | | | | | | | | | Added New Listener Spatial Node.
| * | | | | Added listener spatial node.Saracen2016-03-209-19/+410
| | | | | |
* | | | | | properly pass events to parent controls, closes #4701Juan Linietsky2016-06-061-15/+23
| | | | | |
* | | | | | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2016-06-0636-309/+1293
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #4693 from kjohnson0451/dvector_invertJuan Linietsky2016-06-061-0/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Adds invert() method DVector
| | * | | | | | Adds the invert() method to DVector.kjohnson04512016-05-161-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This effectively allows invert() to be used on the following types: ByteArray, IntArray, RealArray, StringArray, Vector2Array, Vector3Array, ColorArray
| * | | | | | | Merge pull request #4824 from 29jm/pr-3481Juan Linietsky2016-06-062-21/+103
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ability to rename autoloads
| | * | | | | | | Ability to rename autoloadsJohan Manuel2016-05-272-21/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit makes the 'Name' field of autoloads editable, with support for undo/redo. Name clashes/invalid characters are handled. Fixes #3481.
| * | | | | | | | Merge pull request #4895 from TheoXD/_fix_interactive_loader_cacheJuan Linietsky2016-06-061-1/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fixed interactive_loader() not returning a cached scene
| | * | | | | | | | fixed interactive_loader() not returning a cached sceneTheoXD2016-05-301-1/+5
| | | | | | | | | |
| * | | | | | | | | Merge pull request #4977 from SaracenOne/scripting_exposeJuan Linietsky2016-06-064-31/+112
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Expose extra methods and constants to scripts
| | * | | | | | | | | Expose control theme element and override detection methods to scripting side.Saracen2016-06-042-29/+94
| | | | | | | | | | |
| | * | | | | | | | | Expose Vector2 abs method to scriptsSaracen2016-06-011-0/+2
| | | | | | | | | | |
| | * | | | | | | | | Exposed remaining PROPERTY_USAGE constants to scriptSaracen2016-06-011-0/+14
| | | | | | | | | | |
| | * | | | | | | | | Expose string 'erase' method to scriptSaracen2016-06-011-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #5026 from Geequlim/patch9frame-extensionJuan Linietsky2016-06-0620-193/+571
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enhanced Patch9Frame
| | * | | | | | | | | | Enhanced StyleBoxTexture:Geequlim2016-06-054-69/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add texture region support for StyleBoxTexture. Quick region(texture region and scale region) selection for StyleBoxTexture with TextureRegionEditorPlugin.
| | * | | | | | | | | | Add plugin to pick texture region and patch margins for Patch9FrameGeequlim2016-06-054-104/+207
| | | | | | | | | | | |
| | * | | | | | | | | | Add texture region support for Patch9FrameGeequlim2016-06-052-1/+24
| | | | | | | | | | | |
| | * | | | | | | | | | Add texture region support for stylebox renderGeequlim2016-06-0515-52/+243
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #5048 from J08nY/dictionaryJuan Linietsky2016-06-064-58/+78
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Added Dictionary.values()
| | * | | | | | | | | | | Added Dictionary.values()J08nY2016-06-054-58/+78
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #5054 from eska014/fix-implicit-extendsJuan Linietsky2016-06-062-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix implicit GDScript Reference inheritance
| | * | | | | | | | | | | Fix implicit GDScript Reference inheritanceeska2016-06-052-5/+8
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #5056 from SaracenOne/bitmask_import_pluginJuan Linietsky2016-06-064-0/+403
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Bitmask import plugin
| | * | | | | | | | | | | Bitmask import pluginSaracen2016-06-054-0/+403
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
* | / | | | | | | | | | -Fix small bug regarding to canvas layer detection, closes #4381Juan Linietsky2016-06-061-13/+8
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2016-06-0658-65/+861
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #5067 from Hinsbart/x11_vsyncJuan Linietsky2016-06-061-5/+29
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | x11: fix vsync support