aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* improve reporting of error in wrong inheritance for autoload scriptJuan Linietsky2016-01-132-4/+5
|
* attempt another fixJuan Linietsky2016-01-131-1/+11
|
* Reworked how autoloads are load to make sure identifiers always exist, ↵Juan Linietsky2016-01-132-1/+24
| | | | please check if this resolves bug #3156
* Properly fix tab scrolling, fixes #3128, fixes #3314Juan Linietsky2016-01-133-245/+95
|
* Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2016-01-123-17/+30
|\
| * Merge pull request #3310 from eska014/export-zipRémi Verschelde2016-01-122-12/+25
| |\ | | | | | | Replace export pack mode "Copy" with "Exec+Zip"
| | * Replace export pack mode "Copy" with "Exec+Zip"eska2016-01-102-12/+25
| | | | | | | | | | | | | | | - Make "Bundle" a separate option - Change pack mode property hint to be more expressive
| * | loading unaligned pbmAriel Manzur2016-01-121-5/+5
| | |
* | | Fix situation where TSCN format might crash, closes #3062Juan Linietsky2016-01-122-7/+14
|/ /
* | -Properly lock and and warn about switching off contact monitoring, fixes #3041Juan Linietsky2016-01-125-6/+53
| |
* | small hack to make collisionobjects work with replace, fixes #2992Juan Linietsky2016-01-121-0/+5
| |
* | Merge pull request #3272 from Hinsbart/joy-bindingpunto-2016-01-1211-24/+226
|\ \ | | | | | | Add some joystick functions to input. Enables manipulation of mapping…
| * | Add some joystick functions to input. Enables manipulation of mappings at ↵hondres2016-01-0811-24/+226
| | | | | | | | | | | | runtime
* | | Merge pull request #3323 from mrezai/fix-3321Rémi Verschelde2016-01-121-2/+2
|\ \ \ | | | | | | | | Fix crash on android 6.0.1, fixes #3321
| * | | Fix crash on android 6.0.1, fixes #3321mrezai2016-01-121-2/+2
|/ / /
* | | Merge pull request #3320 from neikeq/ed_layouts_defaultRémi Verschelde2016-01-112-31/+33
|\ \ \ | | | | | | | | Allow to override the default editor layout
| * | | Allow to override the default editor layoutIgnacio Etcheverry2016-01-112-31/+33
| | | |
* | | | Merge pull request #3316 from Liangdi/masterRémi Verschelde2016-01-111-0/+2
|\ \ \ \ | | | | | | | | | | Fix xml opt with XML_ENABLED macro
| * | | | Fix xml opt with XML_ENABLE macroLiangdi2016-01-121-0/+2
| | | | |
* | | | | Merge pull request #3319 from akien-mga/pr-copyright-2016Rémi Verschelde2016-01-1142-43/+43
|\ \ \ \ \ | |/ / / / |/| | | | Update copyright in remaining files + prints in the UI
| * | | | Update copyright in remaining files + prints in the UIRémi Verschelde2016-01-1142-43/+43
|/ / / /
* | | | Update bitmap_loader_pnm.cpppunto-2016-01-111-1/+1
| | | |
* | | | fix issue loading binary pbmJuan Linietsky2016-01-111-2/+5
|/ / /
* | | Merge pull request #3308 from neikeq/keep_xform_settingsRémi Verschelde2016-01-111-25/+47
|\ \ \ | | | | | | | | Remember Transform menu settings for the Spatial Editor
| * | | Remove unnecessary fail conditions when loading SpatialEditor stateIgnacio Etcheverry2016-01-111-27/+21
| | | |
| * | | Remember Transform menu settings for the Spatial EditorIgnacio Etcheverry2016-01-111-0/+28
| | | |
* | | | Merge pull request #3230 from touilleMan/issue-55Rémi Verschelde2016-01-118-19/+10
|\ \ \ \ | | | | | | | | | | Remove unnecessary null pointer checks
| * | | | Remove unnecessary null pointer checksEmmanuel Leblond2016-01-048-19/+10
| | | | |
* | | | | Merge pull request #3257 from TheHX/pr-range-propertiesRémi Verschelde2016-01-112-10/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix error caused by dragging a Range property
| * | | | | Fix error caused by dragging a Range propertyFranklin Sobrinho2016-01-062-10/+10
| | | | | |
* | | | | | made headers case insensitiveAriel Manzur2016-01-111-2/+3
| | | | | |
* | | | | | Merge pull request #3276 from TheHX/pr-quick-openRémi Verschelde2016-01-114-15/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | Quick open now can open multiple scenes and scripts
| * | | | | | Quick open now can open multiple scenes and scriptsFranklin Sobrinho2016-01-084-15/+50
| | | | | | |
* | | | | | | Merge pull request #3297 from AlexHolly/comment-some-print_linesRémi Verschelde2016-01-111-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | comment some print_lines
| * | | | | | | comment some print_linesAlexander Holland2016-01-091-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #3309 from MarianoGnu/bug_fixing3Rémi Verschelde2016-01-112-7/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make SpriteRegionEditor remember state when switching scenes (fixes #3245)
| * | | | | | | | Make SpriteRegionEditor remember state beatwhen setions (fixes #3245)MarianoGNU2016-01-102-7/+58
| | | | | | | | |
* | | | | | | | | Merge pull request #3302 from MarianoGnu/bug_fixing2Rémi Verschelde2016-01-111-1/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow to paste resources in inspector when text_hint indicates multip…
| * | | | | | | | | Allow to paste resources in inspector when text_hint indicates multiple typesMarianoGNU2016-01-101-1/+11
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3303 from TheHX/pr-script-editorRémi Verschelde2016-01-111-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix script highlighting for classes that begin with "_"
| * | | | | | | | | Fix script highlighting for classes that begin with "_"Franklin Sobrinho2016-01-101-1/+5
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3304 from eska014/fbsd-alsaRémi Verschelde2016-01-111-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Give FreeBSD a chance to enable ALSA
| * | | | | | | | | Enable ALSA driver in non-linux X11 when availableeska2016-01-101-1/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3300 from MarianoGnu/bug_fixingRémi Verschelde2016-01-111-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix: TouchScreenButton should stop propagating action when button is …
| * | | | | | | | | fix: TouchScreenButton should stop propagating action when button is removed ↵MarianoGNU2016-01-101-0/+4
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | from scene
* | | | | | | | | properly handle typed array constructors in VariantParser, closes #3054Juan Linietsky2016-01-101-2/+5
| | | | | | | | |
* | | | | | | | | -Make Akien happy, fixes #3068Juan Linietsky2016-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (seems I wrote all the code, then forgot to use the enum...)
* | | | | | | | | It seems everyone misses the polygon decomposer output, fixes #3069Juan Linietsky2016-01-101-1/+1
| | | | | | | | |
* | | | | | | | | -Make a rare corner case where disabling/reenabling mipmaps causes invalid ↵Juan Linietsky2016-01-105-2/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture state. Fixes #3102
* | | | | | | | | make msvc 64bits build again, fixes #3098Juan Linietsky2016-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled assembly for msvc 64 bits, as it is not supported