aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash on closing [empty](*) scene tabPoommetee Ketson2017-07-101-0/+6
|
* Merge pull request #9489 from ↵Rémi Verschelde2017-07-082-2/+37
|\ | | | | | | | | TwistedTwigleg/Additional_functions_for_Label_and_RichTextLabel Added additional functions to RichTextLabel
| * Added additional functions to RichTextLabel:TwistedTwigleg2017-07-082-2/+37
| | | | | | | | | | | | * Added set_text function to RichTextLabel * Added percent_visible attributes and functions to RichTextLabel This should make switching from Label to RichTextLabel easier.
* | Merge pull request #9564 from Noshyaar/pr-thresholdRémi Verschelde2017-07-0844-184/+182
|\ \ | | | | | | Refactor 'treshold' to 'threshold'
| * | Refactor 'treshold' to 'threshold'Poommetee Ketson2017-07-0844-184/+182
| | |
* | | Some adjustments to toon material to make it more flexibleJuan Linietsky2017-07-085-17/+34
| | | | | | | | | | | | Ability to also disable specular
* | | Added triplanar mapping, toon mode, and more specular modes for materials. ↵Juan Linietsky2017-07-0814-12/+231
|/ / | | | | | | Added multipass support for materials.
* | Merge pull request #9535 from GodotExplorer/pr-editor-theme-justifyRémi Verschelde2017-07-081-8/+8
|\ \ | | | | | | Justify the editor theme style colors
| * | Justify the editor theme style colorsgeequlim2017-07-081-8/+8
| | |
* | | Merge pull request #9563 from Noshyaar/pr-aboutRémi Verschelde2017-07-081-0/+1
|\ \ \ | | | | | | | | About: center valign copyright label
| * | | About: center valign copyright labelPoommetee Ketson2017-07-081-0/+1
|/ / /
* | | Merge pull request #9558 from BastiaanOlij/no_chmod_ios_winRémi Verschelde2017-07-081-0/+2
|\ \ \ | | | | | | | | Only execute chmod exporting iOS when on Mac OS X
| * | | Only execute chmod exporting iOS when on Mac OS XBastiaanOlij2017-07-081-0/+2
|/ / /
* | | -Added triplanar mapping modesJuan Linietsky2017-07-087-84/+295
| | | | | | | | | | | | -Some fixes to shader lang
* | | Merge pull request #9538 from vnen/scons-rebuild-speedRémi Verschelde2017-07-081-0/+7
|\ \ \ | | | | | | | | Increase SCons rebuild speed
| * | | Increase SCons rebuild speedGeorge Marques2017-07-071-0/+7
| | | |
* | | | Merge pull request #9536 from Noshyaar/prRémi Verschelde2017-07-082-11/+25
|\ \ \ \ | | | | | | | | | | ScriptCreateDialog: fix open error crash, remember template
| * | | | ScriptCreateDialog: fix open error crash, remember templatePoommetee Ketson2017-07-072-11/+25
| | |/ / | |/| |
* | | | Merge pull request #9533 from echo-Mike/bug#7755Rémi Verschelde2017-07-081-0/+11
|\ \ \ \ | | | | | | | | | | Inline documentation request satisfied.
| * | | | Inline documentation request satisfied.Mike Demchenko2017-07-071-0/+11
| | |/ / | |/| |
* | | | Merge pull request #9515 from marcelofg55/masterRémi Verschelde2017-07-082-0/+29
|\ \ \ \ | | | | | | | | | | Implemented borderless window functions on Linux.
| * | | | Implemented borderless window functions on Linux.Marcelo Fernandez2017-07-052-0/+29
| | | | |
* | | | | Merge pull request #9514 from Noshyaar/pr-licenseRémi Verschelde2017-07-083-13/+243
|\ \ \ \ \ | | | | | | | | | | | | About: add thirdparty license info
| * | | | | About: add thirdparty license infoPoommetee Ketson2017-07-063-13/+243
| | | | | |
* | | | | | Merge pull request #9512 from BastiaanOlij/osx_export_fix_typoRémi Verschelde2017-07-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo in plist export for OSX export
| * | | | | | Fix typo in plist exportBastiaanOlij2017-07-061-2/+2
| |/ / / / /
* | | | | | Merge pull request #9511 from BastiaanOlij/ios_export_3.0Rémi Verschelde2017-07-082-0/+375
|\ \ \ \ \ \ | | | | | | | | | | | | | | iPhone exporter for Godot 3.0
| * | | | | | iPhone exporterBastiaanOlij2017-07-062-0/+375
| |/ / / / /
* | | | | | Revert "Mark where ETC1 restriction needs to be done to speed up RGBA8 import"Rémi Verschelde2017-07-081-1033/+1241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8b362b50094ccd332c6ee3d0853a6b9b49f70253. We should not apply our clang-format style to thirdparty code, it makes it impossible to maintain.
* | | | | | Fix wrong cast to Node2D instead of ControlRémi Verschelde2017-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As reported by @sanikoyes.
* | | | | | Merge pull request #9541 from ducdetronquito/masterJuan Linietsky2017-07-076-17/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | If it makes you guys happy...
| * | | | | [#9292] Renamed Image.put_pixel() to set_pixel().ducdetronquito2017-07-076-17/+17
|/ / / / /
* | | / / Mark where ETC1 restriction needs to be done to speed up RGBA8 importJuan Linietsky2017-07-061-1241/+1033
| |_|/ / |/| | |
* | | | More fill modes for containers, closes #9504Juan Linietsky2017-07-063-6/+22
| | | |
* | | | Ability to set rotation and scaling pivot for controls.Juan Linietsky2017-07-064-11/+96
| | | |
* | | | -Ability for controls to grow the left/top when anchored. This makes ↵Juan Linietsky2017-07-062-2/+68
| | | | | | | | | | | | | | | | anchoring controls to the right/bottom easier when they are resized.
* | | | Merge pull request #9528 from ducdetronquito/dictionary-parsejson-docRémi Verschelde2017-07-061-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improved parse_json() doc about numerical values conversion. [ci skip]
| * | | | Improved GDScript parse_json() doc about numerical values conversion.ducdetronquito2017-07-061-1/+2
|/ / / /
* | | | Fixed bug regarding to strange black shapes appearing in ice from material ↵Juan Linietsky2017-07-052-3/+17
| | | | | | | | | | | | | | | | tester demo
* | | | Some changes to dual paraboloid envmap generation, fixes somme bleedingJuan Linietsky2017-07-057-22/+33
| |/ / |/| |
* | | Merge pull request #9497 from 29jm/gravity-fixRémi Verschelde2017-07-053-5/+5
|\ \ \ | |/ / |/| | Use the gravity constant to calculate weights
| * | Use the gravity constant to calculate weightsJohan Manuel2017-07-053-5/+5
|/ /
* | Merge pull request #8943 from RandomShaper/fix-error-handlingRémi Verschelde2017-07-058-45/+76
|\ \ | | | | | | Implement well-defined handling of unrecoverable errors
| * | Implement well-defined handling of unrecoverable errorsPedro J. Estébanez2017-07-058-45/+76
| | | | | | | | | | | | | | | | | | Plus the addition of some convenience CRASH_* error macros. Plus transient avoidance of the flood of warnings emitted by Clang when checking 'this' for NULL. Plus explanation about the do-while(0) loop in some error macros.
* | | Merge pull request #9476 from marcelofg55/masterRémi Verschelde2017-07-052-9/+53
|\ \ \ | | | | | | | | Implemented borderless fullscreen code on OSX.
| * | | Implemented borderless fullscreen code on OSX.Marcelo Fernandez2017-07-022-9/+53
| | | |
* | | | Merge pull request #9492 from kubecz3k/subscene-click-fixRémi Verschelde2017-07-051-3/+5
|\ \ \ \ | | | | | | | | | | fix for redundant RMB options for toplevel node
| * | | | fix for redundant RMB options for toplevel nodeJakub Grzesik2017-07-041-3/+5
| | | | |
* | | | | Merge pull request #9496 from Noshyaar/pr-itemlistRémi Verschelde2017-07-054-0/+118
|\ \ \ \ \ | | | | | | | | | | | | ItemList: expose methods, in-editor items editing support
| * | | | | ItemList: expose methods, in-editor items editing supportPoommetee Ketson2017-07-044-0/+118
| |/ / / /